From 0f4d6b791e9f241f8b8ebec7611ea4c27d552415 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 14 May 2012 21:57:18 +0000 Subject: [PATCH 0001/5607] * bzip2 installs a weird libbz2.so.1.0 symlink, which should be libbz2.so.1. And libbz2.so should link to libbz2.so.1.0.6. svn path=/nixpkgs/branches/stdenv-updates/; revision=34095 --- pkgs/tools/compression/bzip2/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index 4610bdd4085..0fa92d3d100 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -10,7 +10,7 @@ if test -n "$sharedLibrary"; then preInstall() { mkdir -p $out/lib mv libbz2.so* $out/lib - ln -s libbz2.so.1.0 $out/lib/libbz2.so + (cd $out/lib && ln -s libbz2.so.1.0.? libbz2.so && mv libbz2.so.1.0 libbz2.so.1) } fi -- GitLab From 76431dad65a64c31cd403a173185723777f39615 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 16:34:07 +0000 Subject: [PATCH 0002/5607] * Make file 5.11 the default. svn path=/nixpkgs/branches/stdenv-updates/; revision=34114 --- pkgs/tools/misc/file/511.nix | 17 ----------------- pkgs/tools/misc/file/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 8 ++++---- 4 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 pkgs/tools/misc/file/511.nix diff --git a/pkgs/tools/misc/file/511.nix b/pkgs/tools/misc/file/511.nix deleted file mode 100644 index 4e62462b8b3..00000000000 --- a/pkgs/tools/misc/file/511.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, zlib}: - -stdenv.mkDerivation rec { - name = "file-5.11"; - - buildInputs = [ zlib ]; - - src = fetchurl { - url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz"; - sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7"; - }; - - meta = { - description = "A program that shows the type of files"; - homepage = "http://darwinsys.com/file"; - }; -} diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 01a674fe227..4e62462b8b3 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, zlib}: -stdenv.mkDerivation { - name = "file-5.04"; +stdenv.mkDerivation rec { + name = "file-5.11"; + + buildInputs = [ zlib ]; src = fetchurl { - url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz; - sha256 = "0316lj3jxmp2g8azv0iykmmwjsnjanq93bklccwb6k77jiwnx7jc"; + url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz"; + sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7"; }; meta = { description = "A program that shows the type of files"; - homepage = ftp://ftp.astron.com/pub/file; + homepage = "http://darwinsys.com/file"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe12783a382..9cee31cdc36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -674,7 +674,6 @@ let figlet = callPackage ../tools/misc/figlet { }; file = callPackage ../tools/misc/file { }; - file511 = callPackage ../tools/misc/file/511.nix { }; fileschanged = callPackage ../tools/misc/fileschanged { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4ffcc8237bb..cff0b8ecca2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -74,7 +74,7 @@ let pythonPackages = python.modules // rec { postInstall = '' wrapProgram $out/bin/alot \ - --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib + --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file}/lib ''; meta = { @@ -846,12 +846,12 @@ let pythonPackages = python.modules // rec { magic = pkgs.stdenv.mkDerivation rec { - name = "python-${pkgs.file511.name}"; + name = "python-${pkgs.file.name}"; - src = pkgs.file511.src; + src = pkgs.file.src; patches = [ ../tools/misc/file/python.patch ]; - buildInputs = [ python pkgs.file511 ]; + buildInputs = [ python pkgs.file ]; configurePhase = "cd python"; -- GitLab From e2edc964fd2631bdc7111af54716db07fbb0216c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 21:13:46 +0000 Subject: [PATCH 0003/5607] * Updated libtiff to 3.9.6 and applied a fix for CVE-2012-1173. svn path=/nixpkgs/branches/x-updates/; revision=34124 --- .../development/libraries/libtiff/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index d170c2fd231..35f77584f0f 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,18 +1,31 @@ { stdenv, fetchurl, zlib, libjpeg }: -stdenv.mkDerivation { - name = "libtiff-3.9.4"; +let version = "3.9.6"; in + +stdenv.mkDerivation rec { + name = "libtiff-${version}"; src = fetchurl { urls = - [ ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz - http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz + [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" + "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" ]; - sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7"; + sha256 = "0cv8ml3fnkjx60163j69a9cklzlh8wxbvbql78s78q13as8i3fhg"; }; + + patchFlags = "-p0"; + + patches = + [ (fetchurl { + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch?revision=1.2"; + sha256 = "07v22lbx9vlqj1f5r2fzcjcr37b97mw5ayjnisgmk4nd1yjxv5qn"; + }) + ]; propagatedBuildInputs = [ zlib libjpeg ]; + enableParallelBuilding = true; + meta = { description = "Library and utilities for working with the TIFF image file format"; homepage = http://www.libtiff.org/; -- GitLab From 868efc48e6bd42f79be9001ad6dbdd968ec80279 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 21:16:09 +0000 Subject: [PATCH 0004/5607] * libjpeg updated to 8d. svn path=/nixpkgs/branches/x-updates/; revision=34125 --- 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 f598482f830..63d698dda18 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 = { -- GitLab From 1a4d1facda6c0686449acb2bc55a3299219aa133 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 21:30:03 +0000 Subject: [PATCH 0005/5607] * xkeyboard-config updated to 2.5.1. svn path=/nixpkgs/branches/x-updates/; revision=34127 --- pkgs/data/misc/xkeyboard-config/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index fbe8e7ce1f5..d4d5437e89f 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }: stdenv.mkDerivation rec { - name = "xkeyboard-config-2.1"; + name = "xkeyboard-config-2.5.1"; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2"; - sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr"; + url = "mirror://xorg/individual/data/${name}.tar.bz2"; + sha256 = "14ncsbzi8l1dw0ypd36az9kxvrsqfspl3w51zj5p52f373ffi07b"; }; buildInputs = [ gettext ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./eo.patch ]; preConfigure = '' - configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86" + configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps" sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh ''; -- GitLab From 8846bef01343963021300d4d4089ab3031197df6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 22:04:47 +0000 Subject: [PATCH 0006/5607] * Fontconfig updated to 2.9.0. svn path=/nixpkgs/branches/x-updates/; revision=34130 --- pkgs/development/libraries/fontconfig/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 8e016401e3d..5ab3bf2e235 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.8.0"; + name = "fontconfig-2.9.0"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.gz"; - sha256 = "0d9370qnn1qzq0jidbycin2frkcr1kqj04jbgb79ykb5x9p1qaps"; + sha256 = "06ml04gyfacasxmrqdjfkckbj5f18d988j3wmz6vsi7h3h3jazna"; }; buildInputs = [ freetype ]; @@ -17,13 +17,14 @@ stdenv.mkDerivation rec { crossArch = if (stdenv ? cross && stdenv.cross != null) then stdenv.cross.arch else null; - preConfigure = '' if test -n "$crossConfig"; then configureFlags="$configureFlags --with-arch=$crossArch"; fi ''; + enableParallelBuilding = true; + # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time. installFlags = "CONFDIR=$(out)/etc/fonts RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy"; -- GitLab From 6e6e5a0dde4e66f63638bb5a557ac9bfa4138a51 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 22:05:13 +0000 Subject: [PATCH 0007/5607] * FreeType updated to 2.4.9. svn path=/nixpkgs/branches/x-updates/; revision=34131 --- .../development/libraries/freetype/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index e53a3c297ff..975366a7961 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -5,12 +5,12 @@ useEncumberedCode ? false }: -stdenv.mkDerivation (rec { - name = "freetype-2.4.4"; +stdenv.mkDerivation rec { + name = "freetype-2.4.9"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb"; + sha256 = "1far9006qbw5gvjn8ph1kyfhly4j7x7vycigb8vx96cfsk0ll864"; }; configureFlags = "--disable-static"; @@ -21,16 +21,14 @@ stdenv.mkDerivation (rec { # The asm for armel is written with the 'asm' keyword. CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99"; + # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. + buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake; + + enableParallelBuilding = true; + meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) }; } - -// - -# FreeType requires GNU Make, which is not part of stdenv on FreeBSD. -(if stdenv.system == "i686-freebsd" - then { buildInputs = [ gnumake ]; } - else {})) -- GitLab From 340afa400891876433cdb25335df5405b7304f77 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 May 2012 22:12:27 +0000 Subject: [PATCH 0008/5607] * libdrm updated to 2.4.34. Drop the Cairo dependency because it's only used for tests (which we don't run anyway), and it will cause a cyclic dependency problem if we enable OpenGL support in Cairo. svn path=/nixpkgs/branches/x-updates/; revision=34132 --- pkgs/development/libraries/libdrm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 7c0127bf710..9a79a6e6ee5 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,20 +1,20 @@ -{stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, cairo, udev}: +{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.29"; + name = "libdrm-2.4.34"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "0bj5ihmnzpbbgdrvp5f8bgsk0k19haixr893449pjd4k7v4jshz2"; + sha256 = "1l7qs2qa0kxpbd28yqc2cjl0v2lgmbmyxb4f5xy7n445gh75fs54"; }; buildNativeInputs = [ pkgconfig ]; - buildInputs = [ libpthreadstubs libpciaccess cairo udev ]; + buildInputs = [ libpthreadstubs libpciaccess udev ]; patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; preConfigure = stdenv.lib.optionalString stdenv.isDarwin - "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; + "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; -- GitLab From 3fb08e0150b3a1c7e75a30b7f3900f3c1b53e9b6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 20:48:30 +0000 Subject: [PATCH 0009/5607] * Remove obsolete flag. svn path=/nixpkgs/branches/x-updates/; revision=34141 --- pkgs/development/libraries/libdrm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 9a79a6e6ee5..96a8198645e 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ] + configureFlags = [ "--enable-udev" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; -- GitLab From 21bf5ef509dcadebab10de0ba142d55776a961f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 20:49:31 +0000 Subject: [PATCH 0010/5607] * Cairo updated to 1.12.2. svn path=/nixpkgs/branches/x-updates/; revision=34142 --- pkgs/development/libraries/cairo/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index fe3fe1e251c..d3b51811a95 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -13,11 +13,11 @@ assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; stdenv.mkDerivation rec { - name = "cairo-1.10.2"; + name = "cairo-1.12.2"; src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e"; + url = "http://cairographics.org/releases/${name}.tar.xz"; + sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9"; }; buildInputs = @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' ''; + enableParallelBuilding = true; + # The default `--disable-gtk-doc' is ignored. postInstall = "rm -rf $out/share/gtk-doc"; -- GitLab From 5755aa2ce9c4c4e0b86d049fd96ed6d2e40a07d1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 21:55:18 +0000 Subject: [PATCH 0011/5607] * Mesa updated to 8.0.2. svn path=/nixpkgs/branches/x-updates/; revision=34143 --- pkgs/development/libraries/mesa/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 219dc161761..1c5285c6f5d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -7,27 +7,24 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else -let version = "7.11.2"; in +let version = "8.0.2"; in stdenv.mkDerivation { name = "mesa-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "0msk1fh4yw4yi7z37v75vhpa23z49lkwgin6drczbihbqsl6lx2p"; + md5 = "a368104e5700707048dc3e8691a9a7a1"; }; - patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional - (stdenv.system == "mips64el-linux") ./mips_wmb.patch; + patches = + stdenv.lib.optional (stdenv.system == "mips64el-linux") ./mips_wmb.patch; prePatch = "patchShebangs ."; -# r300 configureFlags = - " --with-driver=dri --enable-gl-osmesa --enable-gles1" + " --enable-gles1 --enable-gles2 --enable-gallium-egl" + " --with-gallium-drivers=i915,nouveau,r600,svga,swrast" - + " --enable-gles2 --enable-gallium-egl --disable-glx-tls" - + " --enable-xcb --enable-egl --disable-glut" # Texture floats are patented, see docs/patents.txt + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float"; -- GitLab From c5e63c593f640e9eaa689de2e7802b97a37e503c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 21:56:03 +0000 Subject: [PATCH 0012/5607] * Go back to a slightly older libdrm version, otherwise Mesa's Nouveau driver fails to build (because libdrm removed some header files on which it depends). svn path=/nixpkgs/branches/x-updates/; revision=34144 --- pkgs/development/libraries/libdrm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 96a8198645e..4cf4068ed5b 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.34"; + name = "libdrm-2.4.33"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "1l7qs2qa0kxpbd28yqc2cjl0v2lgmbmyxb4f5xy7n445gh75fs54"; + sha256 = "1slgi61n4dlsfli47ql354fd1ppj7n40jd94wvnsdqx0mna9syrd"; }; buildNativeInputs = [ pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ "--enable-udev" ] + configureFlags = [ "--enable-nouveau-experimental-api" "--enable-udev" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; -- GitLab From 277bd69fa9391824482b17fba65eddc9ad7a4b64 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 21:58:57 +0000 Subject: [PATCH 0013/5607] * Glib/ATK/Pango/GTK+ updates. svn path=/nixpkgs/branches/x-updates/; revision=34145 --- .../libraries/atk/{2.2.x.nix => 2.4.x.nix} | 6 +++--- .../libraries/gdk-pixbuf/{2.24.x.nix => 2.26.x.nix} | 11 +++++------ .../libraries/glib/{2.30.x.nix => 2.32.x.nix} | 8 +++++--- .../libraries/pango/{1.29.x.nix => 1.30.x.nix} | 8 +++++--- pkgs/top-level/all-packages.nix | 8 ++++---- 5 files changed, 22 insertions(+), 19 deletions(-) rename pkgs/development/libraries/atk/{2.2.x.nix => 2.4.x.nix} (83%) rename pkgs/development/libraries/gdk-pixbuf/{2.24.x.nix => 2.26.x.nix} (73%) rename pkgs/development/libraries/glib/{2.30.x.nix => 2.32.x.nix} (88%) rename pkgs/development/libraries/pango/{1.29.x.nix => 1.30.x.nix} (83%) diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.4.x.nix similarity index 83% rename from pkgs/development/libraries/atk/2.2.x.nix rename to pkgs/development/libraries/atk/2.4.x.nix index d0f7e109795..94b0b146654 100644 --- a/pkgs/development/libraries/atk/2.2.x.nix +++ b/pkgs/development/libraries/atk/2.4.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { - name = "atk-2.2.0"; + name = "atk-2.4.0"; src = fetchurl { - url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz; - sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; + url = "mirror://gnome/sources/atk/2.4/${name}.tar.xz"; + sha256 = "091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d"; }; buildNativeInputs = [ pkgconfig perl ]; diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix similarity index 73% rename from pkgs/development/libraries/gdk-pixbuf/2.24.x.nix rename to pkgs/development/libraries/gdk-pixbuf/2.26.x.nix index 5c0860196d3..07e66df33b5 100644 --- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix +++ b/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz -, jasper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }: -stdenv.mkDerivation { - name = "gdk-pixbuf-2.24.1"; +stdenv.mkDerivation rec { + name = "gdk-pixbuf-2.26.1"; src = fetchurl { - url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz; - sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns"; + url = "mirror://gnome/sources/gdk-pixbuf/2.26/${name}.tar.xz"; + sha256 = "a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba"; }; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.32.x.nix similarity index 88% rename from pkgs/development/libraries/glib/2.30.x.nix rename to pkgs/development/libraries/glib/2.32.x.nix index 092fa7f27e0..10e675e18af 100644 --- a/pkgs/development/libraries/glib/2.30.x.nix +++ b/pkgs/development/libraries/glib/2.32.x.nix @@ -12,11 +12,11 @@ # $out/bin/gtester-report' to postInstall if this is solved stdenv.mkDerivation rec { - name = "glib-2.30.3"; + name = "glib-2.32.3"; src = fetchurl { - url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz; - sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6"; + url = "mirror://gnome/sources/glib/2.32/${name}.tar.xz"; + sha256 = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d"; }; # configure script looks for d-bus but it is only needed for tests @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { configureFlags = "--with-pcre=system --disable-fam"; + enableParallelBuilding = true; + passthru.gioModuleDir = "lib/gio/modules"; postInstall = ''rm -rvf $out/share/gtk-doc''; diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.30.x.nix similarity index 83% rename from pkgs/development/libraries/pango/1.29.x.nix rename to pkgs/development/libraries/pango/1.30.x.nix index 6c5d0f4cebc..d58efd79f78 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.30.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { - name = "pango-1.29.4"; + name = "pango-1.30.0"; src = fetchurl { - url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz; - sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s"; + url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz"; + sha256 = "7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ x11 glib cairo libpng ]; + enableParallelBuilding = true; + postInstall = "rm -rf $out/share/gtk-doc"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0c8cff481c..c5b8dde2624 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3658,23 +3658,23 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib/2.30.x.nix { }; + glib = callPackage ../development/libraries/glib/2.32.x.nix { }; glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; glib_networking = callPackage ../development/libraries/glib-networking {}; - atk = callPackage ../development/libraries/atk/2.2.x.nix { }; + atk = callPackage ../development/libraries/atk/2.4.x.nix { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; cairo = callPackage ../development/libraries/cairo { }; - pango = callPackage ../development/libraries/pango/1.29.x.nix { }; + pango = callPackage ../development/libraries/pango/1.30.x.nix { }; pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { }; - gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { }; gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { }; -- GitLab From 932d5bee544e39b0e06ba2e850fe2d7fa89b030f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 May 2012 22:06:27 +0000 Subject: [PATCH 0014/5607] * X.org 7.7 RC1. Note that xorg-server doesn't build yet. svn path=/nixpkgs/branches/x-updates/; revision=34147 --- pkgs/servers/x11/xorg/default.nix | 1118 ++++++++----------- pkgs/servers/x11/xorg/extra.list | 2 +- pkgs/servers/x11/xorg/old.list | 12 +- pkgs/servers/x11/xorg/overrides.nix | 8 +- pkgs/servers/x11/xorg/tarballs-7.6.list | 199 ---- pkgs/servers/x11/xorg/tarballs-7.7-rc1.list | 184 +++ pkgs/tools/admin/tigervnc/default.nix | 2 - 7 files changed, 680 insertions(+), 845 deletions(-) delete mode 100644 pkgs/servers/x11/xorg/tarballs-7.6.list create mode 100644 pkgs/servers/x11/xorg/tarballs-7.7-rc1.list diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4fbc6fbdfda..17e2bff8a9f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -8,11 +8,11 @@ let xorg = rec { applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) { - name = "applewmproto-1.4.1"; + name = "applewmproto-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2; - sha256 = "06fyixmx36qac2qqwmra3l9xr570rankm9kzmk0mgqyhgldrw1h8"; + url = mirror://xorg/X11R7.7-RC1/src/everything/applewmproto-1.4.2.tar.bz2; + sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -21,18 +21,18 @@ let name = "bdftopcf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/bdftopcf-1.0.3.tar.bz2; sha256 = "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w"; }; buildInputs = [pkgconfig libXfont ]; })) // {inherit libXfont ;}; bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) { - name = "bigreqsproto-1.1.1"; + name = "bigreqsproto-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2; - sha256 = "16phzxa55lr749rghpaa699h1lcpndmw7izxzgl1bljq5f3qafqw"; + url = mirror://xorg/X11R7.7-RC1/src/everything/bigreqsproto-1.1.2.tar.bz2; + sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -41,7 +41,7 @@ let name = "compositeproto-0.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/compositeproto-0.4.2.tar.bz2; sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; buildInputs = [pkgconfig ]; @@ -51,7 +51,7 @@ let name = "damageproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/damageproto-1.2.1.tar.bz2; sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; buildInputs = [pkgconfig ]; @@ -61,7 +61,7 @@ let name = "dmxproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/dmxproto-2.3.1.tar.bz2; sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; buildInputs = [pkgconfig ]; @@ -71,7 +71,7 @@ let name = "dri2proto-2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/dri2proto-2.6.tar.bz2; sha256 = "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md"; }; buildInputs = [pkgconfig ]; @@ -81,18 +81,18 @@ let name = "encodings-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) { - name = "fixesproto-4.1.2"; + name = "fixesproto-5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2; - sha256 = "0mzq8kh1v1w2mrl4y82qzgv8jzlr3n4jmss56h3r1h9knp6byk6y"; + url = mirror://xorg/X11R7.7-RC1/src/everything/fixesproto-5.0.tar.bz2; + sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; buildInputs = [pkgconfig xextproto ]; })) // {inherit xextproto ;}; @@ -101,7 +101,7 @@ let name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -111,7 +111,7 @@ let name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -121,7 +121,7 @@ let name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -131,7 +131,7 @@ let name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -141,7 +141,7 @@ let name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -151,7 +151,7 @@ let name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; buildInputs = [pkgconfig ]; @@ -161,7 +161,7 @@ let name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -171,7 +171,7 @@ let name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -181,7 +181,7 @@ let name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -191,7 +191,7 @@ let name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -201,7 +201,7 @@ let name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -211,7 +211,7 @@ let name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -221,7 +221,7 @@ let name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -231,7 +231,7 @@ let name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -241,7 +241,7 @@ let name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -251,7 +251,7 @@ let name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -261,7 +261,7 @@ let name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -271,7 +271,7 @@ let name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -281,7 +281,7 @@ let name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -291,7 +291,7 @@ let name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -301,7 +301,7 @@ let name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -311,7 +311,7 @@ let name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -321,7 +321,7 @@ let name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -331,7 +331,7 @@ let name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -341,7 +341,7 @@ let name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -351,7 +351,7 @@ let name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -361,7 +361,7 @@ let name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -371,7 +371,7 @@ let name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -381,7 +381,7 @@ let name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -391,7 +391,7 @@ let name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -401,7 +401,7 @@ let name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -411,18 +411,18 @@ let name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) { - name = "fontsproto-2.1.1"; + name = "fontsproto-2.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2; - sha256 = "1g1rsvj0lb7744x6fj18d989ymf7zgry3v3fzipnnzljwa0vr6lw"; + url = mirror://xorg/X11R7.7-RC1/src/everything/fontsproto-2.1.2.tar.bz2; + sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -431,18 +431,18 @@ let name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; })) // {inherit bdftopcf mkfontdir ;}; fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) { - name = "font-util-1.2.0"; + name = "font-util-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2; - sha256 = "04lp7xlrcqfyrsnvdgyqbanlnzr13lhn28v0kr2nzpvcmqbwdfnv"; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-util-1.3.0.tar.bz2; + sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -451,7 +451,7 @@ let name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -461,7 +461,7 @@ let name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -478,91 +478,91 @@ let })) // {inherit ;}; glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) { - name = "glproto-1.4.12"; + name = "glproto-1.4.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2; - sha256 = "1pjpnj78hski4krvsbf55pkhhsrahvlb825dwl804q0b36fpmgj8"; + url = mirror://xorg/X11R7.7-RC1/src/everything/glproto-1.4.15.tar.bz2; + sha256 = "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) { - name = "iceauth-1.0.4"; + name = "iceauth-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2; - sha256 = "13ck97rz53l490aba3xpgv4psgk4rywh1vi6slg1n4zhai2zvrhf"; + url = mirror://xorg/X11R7.7-RC1/src/everything/iceauth-1.0.5.tar.bz2; + sha256 = "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"; }; buildInputs = [pkgconfig libICE xproto ]; })) // {inherit libICE xproto ;}; imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) { - name = "imake-1.0.4"; + name = "imake-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.4.tar.bz2; - sha256 = "1zj6y59yip40hrdvvljjmnsfqddzxpxmbmd8842010rhkvq7zcmc"; + url = mirror://xorg/individual/util/imake-1.0.5.tar.bz2; + sha256 = "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) { - name = "inputproto-2.0.1"; + name = "inputproto-2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2; - sha256 = "0i2a28bnvv68i6z8qx09iw95c1wchqc2migx1s7764pqipc3srk3"; + url = mirror://xorg/X11R7.7-RC1/src/everything/inputproto-2.2.tar.bz2; + sha256 = "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) { - name = "kbproto-1.0.5"; + name = "kbproto-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2; - sha256 = "17glym611bbkca371ihpcnx9ydp4asay4psqq267j00pbr94zfhf"; + url = mirror://xorg/X11R7.7-RC1/src/everything/kbproto-1.0.6.tar.bz2; + sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) { - name = "libAppleWM-1.4.0"; + name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2; - sha256 = "10hw7rvwc2b0v3v6mc6vaq8xs6vim4bg43rnhspf4p26mlb2dsf8"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libAppleWM-1.4.1.tar.bz2; + sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; })) // {inherit applewmproto libX11 libXext xextproto ;}; libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) { - name = "libFS-1.0.3"; + name = "libFS-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2; - sha256 = "0694iyc1rdz0fqnalgzpgzmxfaklrdk0jz769fsn1bv88mszjymb"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libFS-1.0.4.tar.bz2; + sha256 = "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; })) // {inherit fontsproto xproto xtrans ;}; libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) { - name = "libICE-1.0.7"; + name = "libICE-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2; - sha256 = "00drapw7n793nqy23m76vxj5yzlgx7prmprkhzp3qiqs2lpnkcd8"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libICE-1.0.8.tar.bz2; + sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94"; }; buildInputs = [pkgconfig xproto xtrans ]; })) // {inherit xproto xtrans ;}; libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) { - name = "libSM-1.2.0"; + name = "libSM-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2; - sha256 = "1jspgbd9g1d20kl18nnbzv37f1kpfybjff2xn08dmgv7f0dxzn0c"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libSM-1.2.1.tar.bz2; + sha256 = "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck"; }; buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; })) // {inherit libICE libuuid xproto xtrans ;}; @@ -571,48 +571,48 @@ let name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; })) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { - name = "libX11-1.4.1"; + name = "libX11-1.4.99.901"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2; - sha256 = "1qiwyqaf9vfn52nwp7nxlbixld3r9jyzsarnkwk0ynk4k3vy1x3h"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libX11-1.4.99.901.tar.bz2; + sha256 = "1nr6vgcs9asmxgcml9h79n74f8ik229y0dap4r8rcibyw1lqa8xz"; }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) { - name = "libXScrnSaver-1.2.1"; + name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2; - sha256 = "16i59gac2sixgi692w4lvq5cp8hkl6rc375bh0ib51gsyvi6cfnf"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXScrnSaver-1.2.2.tar.bz2; + sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; })) // {inherit scrnsaverproto libX11 libXext xextproto ;}; libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) { - name = "libXau-1.0.6"; + name = "libXau-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2; - sha256 = "1z3h07wj2kg2hnzj4gd9pc3rkj4n0mfw6f9skg9w1hfwzrgl317f"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXau-1.0.7.tar.bz2; + sha256 = "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) { - name = "libXaw-1.0.9"; + name = "libXaw-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2; - sha256 = "0dxh5ldcmzl6afq0a9172ryah1341g0zysm8vk2lmqkqdda7ffd8"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXaw-1.0.10.tar.bz2; + sha256 = "1p8vxqwk5gs8dl325fmjvqx165bv5vngayfkj5ffrf1q4vwvr5id"; }; buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; @@ -621,18 +621,18 @@ let name = "libXcomposite-0.4.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXcomposite-0.4.3.tar.bz2; sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"; }; buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; })) // {inherit compositeproto libX11 libXfixes xproto ;}; libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) { - name = "libXcursor-1.1.11"; + name = "libXcursor-1.1.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2; - sha256 = "1zpn5dx66l5ql9qv0yz41qlbap4imkkvi0p6j2a6zh72g52zfvm0"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXcursor-1.1.13.tar.bz2; + sha256 = "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"; }; buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -641,88 +641,88 @@ let name = "libXdamage-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXdamage-1.1.3.tar.bz2; sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"; }; buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) { - name = "libXdmcp-1.1.0"; + name = "libXdmcp-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2; - sha256 = "0wh0q4ih9p3nsxsjjj9a3d03nhiyjggpl7gbavdzsfia36iyk85q"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXdmcp-1.1.1.tar.bz2; + sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.2.0"; + name = "libXext-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2; - sha256 = "1xvgvrbg9lc812zi44hsyr461hiiwy05alckq847ki213qhkxvaa"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXext-1.3.1.tar.bz2; + sha256 = "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) { - name = "libXfixes-4.0.5"; + name = "libXfixes-5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2; - sha256 = "0x4drdxrslxf4vgcfyba0f0fbxg98c8x5dfrl7azakhf8qhd0v1f"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXfixes-5.0.tar.bz2; + sha256 = "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; })) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) { - name = "libXfont-1.4.3"; + name = "libXfont-1.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2; - sha256 = "1k79f8vcibd114ydndvna8axx39bsdaj351f16901lh155jlb4pp"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXfont-1.4.5.tar.bz2; + sha256 = "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) { - name = "libXft-2.2.0"; + name = "libXft-2.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2; - sha256 = "1cprbz7xnxkb7axblw8sdaw9ibkngmz60d0ypk1drhd0dpjmls68"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXft-2.3.0.tar.bz2; + sha256 = "0i5hb1c5mq3qam4qzchv2crir8n7jvip9m1ncl04fp1aswx3j9il"; }; - buildInputs = [pkgconfig fontconfig freetype xproto libXrender ]; - })) // {inherit fontconfig freetype xproto libXrender ;}; + buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ]; + })) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { - name = "libXi-1.4.1"; + name = "libXi-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2; - sha256 = "19i92if8anv5pg2mwyy93jcllk1mgxx5gchi8zkjlk7r604ir7sr"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXi-1.6.0.tar.bz2; + sha256 = "1bx7qi1rak3fazkxgf98lxy9iiflgvlm4wg2pg2hb5169ai6bz5j"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ]; })) // {inherit inputproto libX11 libXext xextproto xproto ;}; libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) { - name = "libXinerama-1.1.1"; + name = "libXinerama-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2; - sha256 = "17vpsscracg1hza0avrczm9fc7xx3229qhicy101mw6cx2hb9qmv"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXinerama-1.1.2.tar.bz2; + sha256 = "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"; }; buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; })) // {inherit libX11 libXext xextproto xineramaproto ;}; libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) { - name = "libXmu-1.1.0"; + name = "libXmu-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2; - sha256 = "1b9nkml1mk8yi76bv23cikbfrd7hlp48h710yqgcrpkh7cq1za8g"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXmu-1.1.1.tar.bz2; + sha256 = "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -738,91 +738,91 @@ let })) // {inherit printproto libX11 libXau libXext xextproto ;}; libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) { - name = "libXpm-3.5.9"; + name = "libXpm-3.5.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2; - sha256 = "07k2zpiadck1p986pgksfm5zfdm6h5vjy6p0hv59h1dbkh103pca"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXpm-3.5.10.tar.bz2; + sha256 = "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) { - name = "libXrandr-1.3.1"; + name = "libXrandr-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2; - sha256 = "0qf6aywqk2mgd5hw0nr24xxp5k015aa11sax5yycn14wch4agfv2"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXrandr-1.3.2.tar.bz2; + sha256 = "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) { - name = "libXrender-0.9.6"; + name = "libXrender-0.9.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2; - sha256 = "0s567qgys8m6782lbrpvpscm8fkk2jm2717g7s3hm7hhcgib2n3z"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXrender-0.9.7.tar.bz2; + sha256 = "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; })) // {inherit renderproto libX11 xproto ;}; libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) { - name = "libXres-1.0.5"; + name = "libXres-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2; - sha256 = "0nd032jn3im6ar71xm1wgcmb4pa76c73nl8lavdkih609d30y2x0"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXres-1.0.6.tar.bz2; + sha256 = "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"; }; buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; })) // {inherit resourceproto libX11 libXext xextproto xproto ;}; libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) { - name = "libXt-1.0.9"; + name = "libXt-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2; - sha256 = "00bbms32fkzrxhdm9kybb2404ad6f3d6v4qgl83py7w09dcipfga"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXt-1.1.3.tar.bz2; + sha256 = "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"; }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; })) // {inherit libICE kbproto libSM libX11 xproto ;}; libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) { - name = "libXtst-1.2.0"; + name = "libXtst-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2; - sha256 = "022lx3c57pkkw11j2k5s1f5idf53li5qg291766bvxi1nl90jbks"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXtst-1.2.1.tar.bz2; + sha256 = "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"; }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) { - name = "libXv-1.0.6"; + name = "libXv-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2; - sha256 = "1vpmr9wnbz990ivarsp5rcmdg483fd2nk695plzlzx5h9dcqw3z2"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXv-1.0.7.tar.bz2; + sha256 = "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; })) // {inherit videoproto libX11 libXext xextproto xproto ;}; libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) { - name = "libXvMC-1.0.6"; + name = "libXvMC-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2; - sha256 = "14ik1kgpnds213dsa16i8cf5qg3hc7vccy9jz4a4ml8zqzlq1nix"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXvMC-1.0.7.tar.bz2; + sha256 = "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) { - name = "libXxf86dga-1.1.2"; + name = "libXxf86dga-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2; - sha256 = "01jsc0jg7mjngfbh3j942595pwbyxf2m9kljy3zb6gyfcbsm59hv"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXxf86dga-1.1.3.tar.bz2; + sha256 = "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; @@ -838,41 +838,41 @@ let })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) { - name = "libXxf86vm-1.1.1"; + name = "libXxf86vm-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2; - sha256 = "17i342h7a2nqfz4lpk8cay0vc0h4i7nxdc6xli9r7mggk8iykji1"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libXxf86vm-1.1.2.tar.bz2; + sha256 = "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) { - name = "libdmx-1.1.1"; + name = "libdmx-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2; - sha256 = "066yndshwq2nzkd0z0w96wq37rnhb23s6vq50bg4kiqb8y3nxpm6"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libdmx-1.1.2.tar.bz2; + sha256 = "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7"; }; buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; })) // {inherit dmxproto libX11 libXext xextproto ;}; libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) { - name = "libfontenc-1.1.0"; + name = "libfontenc-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2; - sha256 = "1gww1cbi17q15lh2ws6qzspp807issbyk5wlzjmgw6pn880ip2il"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libfontenc-1.1.1.tar.bz2; + sha256 = "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny"; }; buildInputs = [pkgconfig xproto zlib ]; })) // {inherit xproto zlib ;}; libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) { - name = "libpciaccess-0.12.1"; + name = "libpciaccess-0.13.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2; - sha256 = "0i3kdmvl1mcjrkhklpli45sqsy4pvipm6swifbcyxx4cwkqdfiyc"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libpciaccess-0.13.1.tar.bz2; + sha256 = "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7"; }; buildInputs = [pkgconfig zlib ]; })) // {inherit zlib ;}; @@ -881,91 +881,91 @@ let name = "libpthread-stubs-0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/libpthread-stubs-0.3.tar.bz2; sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { - name = "libxcb-1.7"; + name = "libxcb-1.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2; - sha256 = "1pr40wa3i1f0iwx83c8alcycy9sfzd2y1qlc63kr8q56w8sxqxp7"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libxcb-1.8.1.tar.bz2; + sha256 = "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) { - name = "libxkbfile-1.0.7"; + name = "libxkbfile-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2; - sha256 = "1r9a1xnn57431hfp1am2r5h23pa1zh646482li3vd5ivfc53fzk6"; + url = mirror://xorg/X11R7.7-RC1/src/everything/libxkbfile-1.0.8.tar.bz2; + sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"; }; buildInputs = [pkgconfig kbproto libX11 ]; })) // {inherit kbproto libX11 ;}; lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) { - name = "lndir-1.0.2"; + name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/lndir-1.0.2.tar.bz2; - sha256 = "1d988z0ywy2k53s7i43ff0j5qac1cpy9j0gjwmiprq66w8rh24z5"; + url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; + sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) { - name = "luit-1.1.0"; + name = "luit-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2; - sha256 = "1l83b5yknh4svqzwsppvmm2q9l0mvsfwm16ik7q3yss8m5zgvypi"; + url = mirror://xorg/X11R7.7-RC1/src/everything/luit-1.1.1.tar.bz2; + sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; - buildInputs = [pkgconfig libfontenc zlib ]; - })) // {inherit libfontenc zlib ;}; + buildInputs = [pkgconfig libfontenc ]; + })) // {inherit libfontenc ;}; makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) { - name = "makedepend-1.0.3"; + name = "makedepend-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2; - sha256 = "0dxpz376bvphjg8q0nqrcf4y0dbni0c6jj5y16qymr37wlq1s99s"; + url = mirror://xorg/X11R7.7-RC1/src/everything/makedepend-1.0.4.tar.bz2; + sha256 = "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) { - name = "mkfontdir-1.0.6"; + name = "mkfontdir-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2; - sha256 = "0nf8p0zsndd9qmrw70h2wdq7sz6j066q73lpp262dlpq21inrmam"; + url = mirror://xorg/X11R7.7-RC1/src/everything/mkfontdir-1.0.7.tar.bz2; + sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) { - name = "mkfontscale-1.0.8"; + name = "mkfontscale-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2; - sha256 = "1yah41gr5hlihbjm5l1kykdqj1p5rx6y4vrqraxbzvkrrn37gdbf"; + url = mirror://xorg/X11R7.7-RC1/src/everything/mkfontscale-1.1.0.tar.bz2; + sha256 = "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { - name = "pixman-0.20.2"; + name = "pixman-0.24.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2; - sha256 = "1agl6f63y2wiqr6n9slzhisnilcg8byafp2l8wmw713bk8k6yc9h"; + url = mirror://xorg/individual/lib/pixman-0.24.4.tar.bz2; + sha256 = "1d9vl8kd10nn6bzzgl8xhpdpd0djh4p5x0y8pn1ab0lyld53hjsz"; }; - buildInputs = [pkgconfig perl ]; - })) // {inherit perl ;}; + buildInputs = [pkgconfig libpng perl ]; + })) // {inherit libpng perl ;}; printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) { name = "printproto-1.0.5"; @@ -981,18 +981,18 @@ let name = "randrproto-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/randrproto-1.3.2.tar.bz2; sha256 = "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) { - name = "recordproto-1.14.1"; + name = "recordproto-1.14.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2; - sha256 = "1389fc3r8h8xqix11y9ngw7a13i1mvw68jkhicgvq676sd1v0zmj"; + url = mirror://xorg/X11R7.7-RC1/src/everything/recordproto-1.14.2.tar.bz2; + sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1001,78 +1001,78 @@ let name = "renderproto-0.11.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/renderproto-0.11.1.tar.bz2; sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) { - name = "resourceproto-1.1.1"; + name = "resourceproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2; - sha256 = "1imqlkvn4mfjsflwvqx8dj0n7i7frdpzkdafq001r25ak6782yc5"; + url = mirror://xorg/X11R7.7-RC1/src/everything/resourceproto-1.2.0.tar.bz2; + sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) { - name = "scrnsaverproto-1.2.1"; + name = "scrnsaverproto-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2; - sha256 = "1w94c1an7cy9v68289xbqszaj6g5qx5a29qx67fwsvqkmhygglps"; + url = mirror://xorg/X11R7.7-RC1/src/everything/scrnsaverproto-1.2.2.tar.bz2; + sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) { - name = "sessreg-1.0.6"; + name = "sessreg-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2; - sha256 = "143ivrs2pbkid4wr1hri9221z4gi9dlkq7x60jarcz9bhiq1dwvk"; + url = mirror://xorg/X11R7.7-RC1/src/everything/sessreg-1.0.7.tar.bz2; + sha256 = "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) { - name = "setxkbmap-1.2.0"; + name = "setxkbmap-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2; - sha256 = "0fdfvc0fqdp11ly5iywrsi4w7rln4dq02b0b91yjmjm83fzr35cr"; + url = mirror://xorg/X11R7.7-RC1/src/everything/setxkbmap-1.3.0.tar.bz2; + sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) { - name = "smproxy-1.0.4"; + name = "smproxy-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2; - sha256 = "0wj4z4ars9j4k5pysl42jpx4zclrz3ifwgqxrcdlmb3l5xvyb4ip"; + url = mirror://xorg/X11R7.7-RC1/src/everything/smproxy-1.0.5.tar.bz2; + sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67"; }; - buildInputs = [pkgconfig libSM libXmu libXt ]; - })) // {inherit libSM libXmu libXt ;}; + buildInputs = [pkgconfig libICE libSM libXmu libXt ]; + })) // {inherit libICE libSM libXmu libXt ;}; twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) { - name = "twm-1.0.6"; + name = "twm-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/twm-1.0.6.tar.bz2; - sha256 = "1scly9kv3kx8zh8bfljsdd32dsb4j05xzn8c5x270xcshzbwmp77"; + url = mirror://xorg/individual/app/twm-1.0.7.tar.bz2; + sha256 = "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g"; }; - buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu libXt ]; - })) // {inherit libICE libSM libX11 libXext libXmu libXt ;}; + buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ]; + })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) { - name = "util-macros-1.11.0"; + name = "util-macros-1.17"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2; - sha256 = "1kya7z5rad93zmc0ij7jhl3shh1k37szmjg1rv75lizqlib4slz8"; + url = mirror://xorg/X11R7.7-RC1/src/everything/util-macros-1.17.tar.bz2; + sha256 = "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1081,7 +1081,7 @@ let name = "videoproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/videoproto-2.3.1.tar.bz2; sha256 = "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"; }; buildInputs = [pkgconfig ]; @@ -1091,28 +1091,28 @@ let name = "windowswmproto-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) { - name = "x11perf-1.5.3"; + name = "x11perf-1.5.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2; - sha256 = "1g91ksfrvj59hvxvfj1xb730aqscg5wdnc3grrab1wz7mxap6k9r"; + url = mirror://xorg/X11R7.7-RC1/src/everything/x11perf-1.5.4.tar.bz2; + sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4"; }; buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ]; })) // {inherit libX11 libXext libXft libXmu libXrender ;}; xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) { - name = "xauth-1.0.5"; + name = "xauth-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2; - sha256 = "0v3lmm3qil8shgm7731pl0wd32kpq7w73w5d4mjq1bqxzw09a4vd"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xauth-1.0.7.tar.bz2; + sha256 = "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4"; }; buildInputs = [pkgconfig libX11 libXau libXext libXmu ]; })) // {inherit libX11 libXau libXext libXmu ;}; @@ -1121,7 +1121,7 @@ let name = "xbacklight-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xbacklight-1.1.2.tar.bz2; sha256 = "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg"; }; buildInputs = [pkgconfig libX11 libXrandr ]; @@ -1131,18 +1131,18 @@ let name = "xbitmaps-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) { - name = "xcb-proto-1.6"; + name = "xcb-proto-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2; - sha256 = "18jwkgd2ayvd0zzwawnbh86b4xqjq29mgsq44h06yj8jkcaw2azm"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xcb-proto-1.7.1.tar.bz2; + sha256 = "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"; }; buildInputs = [pkgconfig python ]; })) // {inherit python ;}; @@ -1198,41 +1198,41 @@ let })) // {inherit gperf m4 libxcb xproto ;}; xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) { - name = "xclock-1.0.5"; + name = "xclock-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.5.tar.bz2; - sha256 = "16jcmsmhz503mqv7wz7daqqhm11phsws0g7fryzlz0gk4jg1daak"; + url = mirror://xorg/individual/app/xclock-1.0.6.tar.bz2; + sha256 = "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1"; }; buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu libXrender libXt ]; })) // {inherit libX11 libXaw libXft libxkbfile libXmu libXrender libXt ;}; xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) { - name = "xcmiscproto-1.2.1"; + name = "xcmiscproto-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2; - sha256 = "05acy1axzkrq6z9xlbmz1kg66lbgfqzky8v4qfdl16gv5gi2f3kk"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xcmiscproto-1.2.2.tar.bz2; + sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) { - name = "xcmsdb-1.0.3"; + name = "xcmsdb-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2; - sha256 = "102s9lsghdp5n3bsg4chlkhrk0jh0kxvg2g0pyi1zmzfy5hd0dxj"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xcmsdb-1.0.4.tar.bz2; + sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) { - name = "xcursorgen-1.0.4"; + name = "xcursorgen-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2; - sha256 = "07azdw6w18hdgrd6z3nawrhn1m18nyp24cz54ih91vpz8hpxnany"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xcursorgen-1.0.5.tar.bz2; + sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw"; }; buildInputs = [pkgconfig libpng libX11 libXcursor ]; })) // {inherit libpng libX11 libXcursor ;}; @@ -1241,58 +1241,58 @@ let name = "xcursor-themes-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xcursor-themes-1.0.3.tar.bz2; sha256 = "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"; }; buildInputs = [pkgconfig libXcursor ]; })) // {inherit libXcursor ;}; xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) { - name = "xdm-1.1.10"; + name = "xdm-1.1.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdm-1.1.10.tar.bz2; - sha256 = "0zzrlkmppy6mma49db2x1il47rhjqkg9rs91ryl7xyv5iqbgg1ql"; + url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2; + sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl"; }; buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) { - name = "xdpyinfo-1.2.0"; + name = "xdpyinfo-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2; - sha256 = "1kmmfawcjxgmp06jb3w7d0pxbrcxrrgfx3m1lbwj3gygir4ssnzy"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xdpyinfo-1.3.0.tar.bz2; + sha256 = "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3"; }; - buildInputs = [pkgconfig libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; - })) // {inherit libdmx libX11 libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; + buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) { name = "xdriinfo-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xdriinfo-1.0.4.tar.bz2; sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"; }; buildInputs = [pkgconfig glproto libX11 ]; })) // {inherit glproto libX11 ;}; xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) { - name = "xev-1.1.0"; + name = "xev-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2; - sha256 = "1ih1rxf2b6bpsggvbx4ibyx70bzgcyjl98l1894d0smjxmlc4n9q"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xev-1.2.0.tar.bz2; + sha256 = "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip"; }; - buildInputs = [pkgconfig libX11 ]; - })) // {inherit libX11 ;}; + buildInputs = [pkgconfig libX11 xproto libXrandr ]; + })) // {inherit libX11 xproto libXrandr ;}; xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) { - name = "xextproto-7.1.2"; + name = "xextproto-7.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2; - sha256 = "16ci2mc9g85fsb7lgml349rbgf97v7l9688by71agv682bhjky7n"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xextproto-7.2.1.tar.bz2; + sha256 = "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1311,7 +1311,7 @@ let name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; buildInputs = [pkgconfig ]; @@ -1321,7 +1321,7 @@ let name = "xf86dgaproto-2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; buildInputs = [pkgconfig ]; @@ -1331,98 +1331,78 @@ let name = "xf86driproto-2.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86driproto-2.1.1.tar.bz2; sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; - xf86inputacecad = (stdenv.mkDerivation ((if overrides ? xf86inputacecad then overrides.xf86inputacecad else x: x) { - name = "xf86-input-acecad-1.4.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2; - sha256 = "0mnmvffxwgcvsa208vffsqlai7lldjc46rdk6j0j4q00df5isd28"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - })) // {inherit inputproto randrproto xorgserver xproto ;}; - - xf86inputaiptek = (stdenv.mkDerivation ((if overrides ? xf86inputaiptek then overrides.xf86inputaiptek else x: x) { - name = "xf86-input-aiptek-1.3.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2; - sha256 = "16pby473s65lfd2v60fwayzfhf1n6x696lrx720zwb2p22rlsna3"; - }; - buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; - })) // {inherit inputproto randrproto xorgserver xproto ;}; - xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.6.0"; + name = "xf86-input-evdev-2.7.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2; - sha256 = "1b2kcxm7bc255ym56dpl1fw3km44f5ny3hwn65sa90w13acz7rxh"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-evdev-2.7.0.tar.bz2; + sha256 = "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y"; }; - buildInputs = [pkgconfig inputproto xorgserver xproto ]; - })) // {inherit inputproto xorgserver xproto ;}; + buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; + })) // {inherit inputproto udev xorgserver xproto ;}; xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) { - name = "xf86-input-joystick-1.5.0"; + name = "xf86-input-joystick-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2; - sha256 = "1ac2lap4npylyzg0pi0zy0n48wvicgz9kw0z9ih9ylk9sz2ii0bi"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-joystick-1.6.1.tar.bz2; + sha256 = "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; })) // {inherit inputproto kbproto xorgserver xproto ;}; xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) { - name = "xf86-input-keyboard-1.5.0"; + name = "xf86-input-keyboard-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2; - sha256 = "1c4ww4yj23shqwhc52r512qsy5baf1sxsb7jj7pfnralj07520r3"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-keyboard-1.6.1.tar.bz2; + sha256 = "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) { - name = "xf86-input-mouse-1.6.0"; + name = "xf86-input-mouse-1.7.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2; - sha256 = "1nzvlbhvdyki3h1s4x2i3ps1immf3wfns6az2i3669v8a5g29bn7"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-mouse-1.7.2.tar.bz2; + sha256 = "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.5.0"; + name = "xf86-input-synaptics-1.5.99.902"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2; - sha256 = "0khwda8lrrvrdb37i4i1kdhg8f44kgcjq9y209ds7ja9zjcm7k4m"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-synaptics-1.5.99.902.tar.bz2; + sha256 = "0sz3ipjpm6iwqd2g8kx0nwymxwg2plys7lk38ks5py4cd49gj0vc"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) { - name = "xf86-input-vmmouse-12.6.10"; + name = "xf86-input-vmmouse-12.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2; - sha256 = "0409lkwk1ws8vw4axxilwmcs8qxj8lq5dma2i2iz49q6hrd9sdm6"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2; + sha256 = "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) { - name = "xf86-input-void-1.3.1"; + name = "xf86-input-void-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2; - sha256 = "0x662i756p0nqmfv76ppm28ir2sbvcm32r71ycd9bxc3mj29g9mb"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-void-1.4.0.tar.bz2; + sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"; }; buildInputs = [pkgconfig xorgserver xproto ]; })) // {inherit xorgserver xproto ;}; @@ -1437,72 +1417,52 @@ let buildInputs = [pkgconfig ]; })) // {inherit ;}; - xf86videoapm = (stdenv.mkDerivation ((if overrides ? xf86videoapm then overrides.xf86videoapm else x: x) { - name = "xf86-video-apm-1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2; - sha256 = "1nih9ayiw13aa1s8j6gr99b207215if055c6yvsrssnpvccflij0"; - }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) { - name = "xf86-video-ark-0.7.3"; + name = "xf86-video-ark-0.7.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2; - sha256 = "164gyaaddjjma0xqys0knid2rsd0c7jlab02c8wh3bk4bib9l51r"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ark-0.7.4.tar.bz2; + sha256 = "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) { - name = "xf86-video-ast-0.91.10"; + name = "xf86-video-ast-0.93.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2; - sha256 = "05fcp0svdd4skkfgag1rrram6v3xzgasf582dihpyrwlz28186vy"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ast-0.93.10.tar.bz2; + sha256 = "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-6.14.3"; + name = "xf86-video-ati-6.14.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2; - sha256 = "1d1ph7xvgcr7rdf5sgibhas625aghvm3f61yzwmfk8znxx4jcjl4"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ati-6.14.4.tar.bz2; + sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - xf86videochips = (stdenv.mkDerivation ((if overrides ? xf86videochips then overrides.xf86videochips else x: x) { - name = "xf86-video-chips-1.2.3"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2; - sha256 = "07fb03cxdlis2rjphz2pl59cjhldrhqric8p0gi4wkgq0s72fq85"; - }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) { - name = "xf86-video-cirrus-1.3.2"; + name = "xf86-video-cirrus-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2; - sha256 = "06na525xy5d6xf5g13bjsk9cyxly5arzgrk9j8dmxfll5jj9i6jj"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-cirrus-1.4.0.tar.bz2; + sha256 = "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) { - name = "xf86-video-dummy-0.3.4"; + name = "xf86-video-dummy-0.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2; - sha256 = "1p0vhxvx25d8fp59i72664smhd0z5zw0i2kipk0879xk1vsxz13y"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-dummy-0.3.5.tar.bz2; + sha256 = "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1511,71 +1471,61 @@ let name = "xf86-video-fbdev-0.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-fbdev-0.4.2.tar.bz2; sha256 = "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) { - name = "xf86-video-geode-2.11.10"; + name = "xf86-video-geode-2.11.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2; - sha256 = "1zdb3y5df1dcqlvijg8hxcd6520a5c69jk52yz7ww194ka2c8icf"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-geode-2.11.13.tar.bz2; + sha256 = "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) { - name = "xf86-video-glide-1.1.0"; + name = "xf86-video-glide-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2; - sha256 = "1wf35ai8z3qqk2a97rp72jzvm28ylw2wj2hllrsn29p7jpznh5aw"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glide-1.2.0.tar.bz2; + sha256 = "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"; }; buildInputs = [pkgconfig xextproto xorgserver xproto ]; })) // {inherit xextproto xorgserver xproto ;}; xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) { - name = "xf86-video-glint-1.2.5"; + name = "xf86-video-glint-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2; - sha256 = "0jw1kkyja8hvvhrr3ldl1r5vpqfhn1xmqkpgd2jrkc5p59rz4xan"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glint-1.2.7.tar.bz2; + sha256 = "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xorgserver xproto ;}; + buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; + })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) { - name = "xf86-video-i128-1.3.4"; + name = "xf86-video-i128-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2; - sha256 = "1kwb4ifxwm77s1ks19csmq2ymgs36bxqwvwv24ssvxb9znki76xn"; - }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - - xf86videoi740 = (stdenv.mkDerivation ((if overrides ? xf86videoi740 then overrides.xf86videoi740 else x: x) { - name = "xf86-video-i740-1.3.2"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2; - sha256 = "0hzr5fz6d5jk9jxh9plfgvgias3w7xzyg1n4gx0hs2lc7mm9qm28"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-i128-1.3.5.tar.bz2; + sha256 = "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.15.0"; + name = "xf86-video-intel-2.18.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2; - sha256 = "080pkhjp910wy36crpgi0dmcwpcx8w2r3k4s0dz6v14bmgly2xy3"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-intel-2.18.0.tar.bz2; + sha256 = "1z4z0dq9abrbqk8mdzhdcwjwbm7dv3gnhrqy3vpkknpsrhrkxrnw"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; xf86videointel_2_14_901 = (stdenv.mkDerivation ((if overrides ? xf86videointel_2_14_901 then overrides.xf86videointel_2_14_901 else x: x) { name = "xf86-video-intel-2.14.901"; @@ -1598,31 +1548,31 @@ let })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { - name = "xf86-video-mach64-6.8.2"; + name = "xf86-video-mach64-6.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2; - sha256 = "07b7dkb6xc10pvf483dg52r2klpikmw339i5ln9ig913601r84dr"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mach64-6.9.1.tar.bz2; + sha256 = "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"; }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) { - name = "xf86-video-mga-1.4.13"; + name = "xf86-video-mga-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2; - sha256 = "1xnzxmp9cfpi6q7fx2r74iwyb33wkdrqcf38dhwydbaaxigvsmxn"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mga-1.5.0.tar.bz2; + sha256 = "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) { - name = "xf86-video-neomagic-1.2.5"; + name = "xf86-video-neomagic-1.2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2; - sha256 = "0jshn5k1byq0msl1ymip3m2xycrd8jkk6nzm5dx2av5xlj1rxdn0"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-neomagic-1.2.6.tar.bz2; + sha256 = "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; @@ -1631,7 +1581,7 @@ let name = "xf86-video-newport-0.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-newport-0.2.3.tar.bz2; sha256 = "0w02rz49gipnfl33vak3zgis8bh9i0v5ykyj8qh9vzddjm7ypjp6"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; @@ -1641,127 +1591,67 @@ let name = "xf86-video-nv-2.1.18"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-nv-2.1.18.tar.bz2; sha256 = "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { - name = "xf86-video-openchrome-0.2.904"; + name = "xf86-video-openchrome-0.2.905"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2; - sha256 = "1sksddn0pc3izvab5ppxhprs1xzk5ijwqz5ylivx1cb5hg2gggf7"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-openchrome-0.2.905.tar.bz2; + sha256 = "1llbm020s0fck9chs0906xz7jr4h3whxan4s10ls9046g7xib3qc"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) { - name = "xf86-video-r128-6.8.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2; - sha256 = "1jlybabm3k09hhlzx1xilndqngk3xgdck66n94sr02w5hg622zji"; - }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; - - xf86videorendition = (stdenv.mkDerivation ((if overrides ? xf86videorendition then overrides.xf86videorendition else x: x) { - name = "xf86-video-rendition-4.2.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2; - sha256 = "1a9anxgqs7wc8d7jb5nw6dgmynw0sxiwp9p90h4w19y315kqx6rv"; - }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; - - xf86videos3 = (stdenv.mkDerivation ((if overrides ? xf86videos3 then overrides.xf86videos3 else x: x) { - name = "xf86-video-s3-0.6.3"; + name = "xf86-video-r128-6.8.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2; - sha256 = "0i2i1080cw3pxy1pm43bskb80n7wql0cxpyd2s61v0didsm6b7zd"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-r128-6.8.2.tar.bz2; + sha256 = "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - - xf86videos3virge = (stdenv.mkDerivation ((if overrides ? xf86videos3virge then overrides.xf86videos3virge else x: x) { - name = "xf86-video-s3virge-1.10.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2; - sha256 = "1f3zjs6a3j2a8lfdilijggpwbg9cs88qksrvzvd71ggxf5p0vl0w"; - }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;}; xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) { - name = "xf86-video-savage-2.3.1"; + name = "xf86-video-savage-2.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2; - sha256 = "1ays1l4phyjcdikc9d1zwgswivcrb1grkh7klv5klvqahbfxqjib"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-savage-2.3.4.tar.bz2; + sha256 = "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) { - name = "xf86-video-siliconmotion-1.7.4"; + name = "xf86-video-siliconmotion-1.7.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2; - sha256 = "1mq4dsg2f77wxl0n4fnm6a5p3lajyhra6rxx29z52p5b1x412xdl"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2; + sha256 = "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; + })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) { - name = "xf86-video-sis-0.10.3"; + name = "xf86-video-sis-0.10.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2; - sha256 = "0dy7a7iil35nz1xlazrcq0sp474p6wy0f1pa5y0spbfj5zib6fcv"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sis-0.10.4.tar.bz2; + sha256 = "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; - xf86videosisusb = (stdenv.mkDerivation ((if overrides ? xf86videosisusb then overrides.xf86videosisusb else x: x) { - name = "xf86-video-sisusb-0.9.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2; - sha256 = "0b5afc1dqj8h34fldl35hzf7wphj1x76czkd461bfarnvyljgfrb"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; - - xf86videosuncg14 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg14 then overrides.xf86videosuncg14 else x: x) { - name = "xf86-video-suncg14-1.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2; - sha256 = "1n108xbwg803v2sk51galx66ph8wdb0ym84fx45h0jrr41wh0hyb"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; - })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; - - xf86videosuncg3 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg3 then overrides.xf86videosuncg3 else x: x) { - name = "xf86-video-suncg3-1.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2; - sha256 = "06c4hzmd5cfzbw79yrv3knss80hllciamz734ij1pbzj6j6fjvym"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; - })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; - xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) { name = "xf86-video-suncg6-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -1771,38 +1661,18 @@ let name = "xf86-video-sunffb-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; - xf86videosunleo = (stdenv.mkDerivation ((if overrides ? xf86videosunleo then overrides.xf86videosunleo else x: x) { - name = "xf86-video-sunleo-1.2.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2; - sha256 = "01kffjbshmwix2cdb95j0cx2qmrss6yfjj7y5qssw83h36bvw5dk"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; - })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; - - xf86videosuntcx = (stdenv.mkDerivation ((if overrides ? xf86videosuntcx then overrides.xf86videosuntcx else x: x) { - name = "xf86-video-suntcx-1.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2; - sha256 = "07lqah5sizhwjpzr4vcpwgvbl86fwz4k0c3skp63sq58ng21acal"; - }; - buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; - })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; - xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) { - name = "xf86-video-tdfx-1.4.3"; + name = "xf86-video-tdfx-1.4.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2; - sha256 = "0cxz1rsc87cnf0ba1zfwhk0lhfas92ysc9b13q6x21m31b53bn9s"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tdfx-1.4.4.tar.bz2; + sha256 = "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; @@ -1811,58 +1681,48 @@ let name = "xf86-video-tga-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tga-1.2.1.tar.bz2; sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) { - name = "xf86-video-trident-1.3.4"; + name = "xf86-video-trident-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2; - sha256 = "1a4wybqwd617mg8lzn1xvi5m0iibimxpvyqsr31mhb7gw0qidrjq"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-trident-1.3.5.tar.bz2; + sha256 = "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; - xf86videotseng = (stdenv.mkDerivation ((if overrides ? xf86videotseng then overrides.xf86videotseng else x: x) { - name = "xf86-video-tseng-1.2.4"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2; - sha256 = "0gfiwx2p51k3k78qic8y9y0d3d6nhhbmzfvzmw5hx3ba9kxmvpfh"; - }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; - xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) { name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; })) // {inherit randrproto videoproto xorgserver xproto ;}; xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) { - name = "xf86-video-vesa-2.3.0"; + name = "xf86-video-vesa-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2; - sha256 = "0yhdj39d8rfv2n4i52dg7cg1rsrclagn7rjs3pc3jdajjh75mn4f"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vesa-2.3.1.tar.bz2; + sha256 = "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) { - name = "xf86-video-vmware-11.0.3"; + name = "xf86-video-vmware-12.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2; - sha256 = "18rqkzr1dvzgdr2khlhhpai69z28rnrfl8jiw9hnahbyv2r7qjmj"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vmware-12.0.2.tar.bz2; + sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; @@ -1871,78 +1731,58 @@ let name = "xf86-video-voodoo-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-voodoo-1.2.4.tar.bz2; sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) { - name = "xf86-video-wsfb-0.3.0"; + name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2; - sha256 = "17lqhir0adcccfkrzz2sr8cpv5vkakk0w7xfc22vv7c6jz9vdgbq"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; + sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; buildInputs = [pkgconfig xorgserver xproto ]; })) // {inherit xorgserver xproto ;}; - xf86videoxgi = (stdenv.mkDerivation ((if overrides ? xf86videoxgi then overrides.xf86videoxgi else x: x) { - name = "xf86-video-xgi-1.6.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2; - sha256 = "05wl9a51pik5swkzpyhh4y2gf6m3hd458r4142p5w39bbkmhcd78"; - }; - buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;}; - - xf86videoxgixp = (stdenv.mkDerivation ((if overrides ? xf86videoxgixp then overrides.xf86videoxgixp else x: x) { - name = "xf86-video-xgixp-1.8.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2; - sha256 = "06np5s3f3451vmjwpxbn8hb7d4dhsxff2af8qy8jlc24rinnv9is"; - }; - buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; - xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) { name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) { - name = "xfs-1.1.1"; + name = "xfs-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.1.1.tar.bz2; - sha256 = "1yxm87az3xghngcsd50zz6mdgi9j6vm8pw90sjqzshwq7hx7d0qc"; + url = mirror://xorg/individual/app/xfs-1.1.2.tar.bz2; + sha256 = "17g34yq789grnic83cqj5khq0knda1w2rgabhjflsyw9wg663shd"; }; - buildInputs = [pkgconfig libFS libXfont xtrans ]; - })) // {inherit libFS libXfont xtrans ;}; + buildInputs = [pkgconfig libXfont xproto xtrans ]; + })) // {inherit libXfont xproto xtrans ;}; xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) { - name = "xgamma-1.0.4"; + name = "xgamma-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2; - sha256 = "05lfx9517why64b3n14drid7vn1d2g2ymg22034vqq50h9437j3x"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xgamma-1.0.5.tar.bz2; + sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3"; }; buildInputs = [pkgconfig libX11 libXxf86vm ]; })) // {inherit libX11 libXxf86vm ;}; xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) { - name = "xhost-1.0.4"; + name = "xhost-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2; - sha256 = "15558q9hgmw6vbwc2sgjkfpzw342lxci9w8vcbrmi8mpmrnc00jy"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xhost-1.0.5.tar.bz2; + sha256 = "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18"; }; buildInputs = [pkgconfig libX11 libXau libXmu ]; })) // {inherit libX11 libXau libXmu ;}; @@ -1951,7 +1791,7 @@ let name = "xineramaproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xineramaproto-1.2.1.tar.bz2; sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; buildInputs = [pkgconfig ]; @@ -1968,31 +1808,31 @@ let })) // {inherit libX11 ;}; xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) { - name = "xinput-1.5.3"; + name = "xinput-1.5.99.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2; - sha256 = "0xjwi1sjmvmmzgcvzvz4q8wn0gs7x3aivknx77yfxnndrqqy3bba"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xinput-1.5.99.1.tar.bz2; + sha256 = "0ldrhzrmphygsrdngv6ibxykvg85c55shyg7kywg86a1l0s5cijf"; }; - buildInputs = [pkgconfig inputproto libX11 libXext libXi ]; - })) // {inherit inputproto libX11 libXext libXi ;}; + buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ]; + })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) { - name = "xkbcomp-1.2.1"; + name = "xkbcomp-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2; - sha256 = "1sv51rliqs6wygrp2hc79a5pgn6ly0bbr4sa8a8x00j4j4kjaqdp"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xkbcomp-1.2.4.tar.bz2; + sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; - })) // {inherit libX11 libxkbfile ;}; + buildInputs = [pkgconfig libX11 libxkbfile xproto ]; + })) // {inherit libX11 libxkbfile xproto ;}; xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) { - name = "xkbevd-1.1.2"; + name = "xkbevd-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2; - sha256 = "0qzbh1wb2fg0wsyfqr4j15443caa1xfcxwdf1gzb4gpbkxn98qnd"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xkbevd-1.1.3.tar.bz2; + sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; })) // {inherit libX11 libxkbfile ;}; @@ -2001,28 +1841,38 @@ let name = "xkbutils-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xkbutils-1.0.3.tar.bz2; sha256 = "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4"; }; buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; })) // {inherit inputproto libX11 libXaw xproto libXt ;}; + xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) { + name = "xkeyboard-config-2.5.1"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/X11R7.7-RC1/src/everything/xkeyboard-config-2.5.1.tar.bz2; + sha256 = "14ncsbzi8l1dw0ypd36az9kxvrsqfspl3w51zj5p52f373ffi07b"; + }; + buildInputs = [pkgconfig ]; + })) // {inherit ;}; + xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) { name = "xkill-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xkill-1.0.3.tar.bz2; sha256 = "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) { - name = "xlsatoms-1.1.0"; + name = "xlsatoms-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2; - sha256 = "03fbknvq7rixfgpv5945s7r82jz2xc06a0n09w1p22hl4pd7l0aa"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xlsatoms-1.1.1.tar.bz2; + sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv"; }; buildInputs = [pkgconfig libxcb ]; })) // {inherit libxcb ;}; @@ -2031,7 +1881,7 @@ let name = "xlsclients-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xlsclients-1.1.2.tar.bz2; sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"; }; buildInputs = [pkgconfig libxcb ]; @@ -2048,14 +1898,14 @@ let })) // {inherit libXaw libXt ;}; xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) { - name = "xmodmap-1.0.5"; + name = "xmodmap-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2; - sha256 = "00il5y6q2m90f62cqzgc0ni5qg3y946gf98jj325kx8cgfhyf7j2"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xmodmap-1.0.6.tar.bz2; + sha256 = "0p9skymavb0pi8jiylwwkdvp9r8say1hl903kcwpr1qiifagr2y5"; }; - buildInputs = [pkgconfig libX11 ]; - })) // {inherit libX11 ;}; + buildInputs = [pkgconfig libX11 xproto ]; + })) // {inherit libX11 xproto ;}; xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) { name = "xorg-cf-files-1.0.4"; @@ -2068,81 +1918,81 @@ let })) // {inherit ;}; xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) { - name = "xorg-docs-1.6"; + name = "xorg-docs-1.6.99.901"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2; - sha256 = "0clxy41642jx77mmw5j2fnwa88ms1a7z1z8xpzrgs45bhv21pcpn"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-docs-1.6.99.901.tar.bz2; + sha256 = "0f0kk6za1k4nn1xycmd6hx85rf8mgzdk098f6phl3x2xfax6r43b"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.9.5"; + name = "xorg-server-1.12.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2; - sha256 = "1p19w1s840jb1ah6na0c9k23gbh9wwz1il272irqy3jggh4pbirz"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-server-1.12.1.tar.bz2; + sha256 = "0nml86yvvik7a90wpyr08jkjiydzs26wg119hzwmr5v7qzdc27fj"; }; - buildInputs = [pkgconfig bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ]; - })) // {inherit bigreqsproto damageproto fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;}; + buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; + })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { - name = "xorg-sgml-doctools-1.6"; + name = "xorg-sgml-doctools-1.10.99.901"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2; - sha256 = "0smfsman09dqqw6h638w44lgp2kng2jwk53sb74i7r53x1v09llq"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-sgml-doctools-1.10.99.901.tar.bz2; + sha256 = "014ny4z5i69ang0yygvk7yiqb3m4bhmr05qvh2xmi0y0y61nlrjp"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) { - name = "xpr-1.0.3"; + name = "xpr-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2; - sha256 = "0zckkd45lzbikmdn29r12faby8g5prjkacc1z8aw87pq9sqdcy18"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xpr-1.0.4.tar.bz2; + sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; - buildInputs = [pkgconfig libX11 libXmu ]; - })) // {inherit libX11 libXmu ;}; + buildInputs = [pkgconfig libX11 libXmu xproto ]; + })) // {inherit libX11 libXmu xproto ;}; xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) { - name = "xprop-1.2.0"; + name = "xprop-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2; - sha256 = "173bpq7x2amr77xy28f9m4nfdwr340wj3jw9hkbbznq35c48ql2k"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xprop-1.2.1.tar.bz2; + sha256 = "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407"; }; - buildInputs = [pkgconfig libX11 ]; - })) // {inherit libX11 ;}; + buildInputs = [pkgconfig libX11 xproto ]; + })) // {inherit libX11 xproto ;}; xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) { - name = "xproto-7.0.20"; + name = "xproto-7.0.23"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2; - sha256 = "0alyxrd8wmdvdqm1v3q4x5brv4prj0gxf59pp9h5wycvgpj7zs1z"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xproto-7.0.23.tar.bz2; + sha256 = "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) { - name = "xrandr-1.3.4"; + name = "xrandr-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2; - sha256 = "1nsadgvn57b9way7v0s4yk2729rwqj1m5fbilmd38lfcws928jjy"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xrandr-1.3.5.tar.bz2; + sha256 = "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h"; }; - buildInputs = [pkgconfig libX11 libXrandr libXrender ]; - })) // {inherit libX11 libXrandr libXrender ;}; + buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; + })) // {inherit libX11 xproto libXrandr libXrender ;}; xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) { - name = "xrdb-1.0.8"; + name = "xrdb-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2; - sha256 = "1r2k50qnflj40iandhxhvnrvnhy4qliz5kymlh682455gjmlgn7z"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xrdb-1.0.9.tar.bz2; + sha256 = "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934"; }; buildInputs = [pkgconfig libX11 libXmu ]; })) // {inherit libX11 libXmu ;}; @@ -2151,38 +2001,38 @@ let name = "xrefresh-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xrefresh-1.0.4.tar.bz2; sha256 = "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) { - name = "xset-1.2.1"; + name = "xset-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2; - sha256 = "18cja8b9xrilpshz0z8bkmpjm6pjb20w71xf41jgm70h4dymz6gc"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xset-1.2.2.tar.bz2; + sha256 = "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"; }; - buildInputs = [pkgconfig libX11 libXext libXmu libXxf86misc ]; - })) // {inherit libX11 libXext libXmu libXxf86misc ;}; + buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ]; + })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) { name = "xsetroot-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ]; })) // {inherit libX11 xbitmaps libXcursor libXmu ;}; xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) { - name = "xtrans-1.2.6"; + name = "xtrans-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2; - sha256 = "1im5kj6y8j8m9i5lf1c33dkag6sb7g1zmi0niydqrfyx0lvsgyf5"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xtrans-1.2.7.tar.bz2; + sha256 = "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -2191,40 +2041,40 @@ let name = "xvinfo-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7-RC1/src/everything/xvinfo-1.1.1.tar.bz2; sha256 = "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0"; }; buildInputs = [pkgconfig libX11 libXv ]; })) // {inherit libX11 libXv ;}; xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) { - name = "xwd-1.0.4"; + name = "xwd-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2; - sha256 = "07mh72j794hwq5rnqkmdd4wj27mqmdc3da4jkwpva2hsj64wi9mp"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xwd-1.0.5.tar.bz2; + sha256 = "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82"; }; - buildInputs = [pkgconfig libX11 ]; - })) // {inherit libX11 ;}; + buildInputs = [pkgconfig libX11 xproto ]; + })) // {inherit libX11 xproto ;}; xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) { - name = "xwininfo-1.1.1"; + name = "xwininfo-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2; - sha256 = "0g9ll8hv0k5cjz4l5kdv64xzmalf9mpwjzcy8nx6myvh92z5fnk4"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xwininfo-1.1.2.tar.bz2; + sha256 = "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg"; }; buildInputs = [pkgconfig libX11 libxcb xproto ]; })) // {inherit libX11 libxcb xproto ;}; xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) { - name = "xwud-1.0.3"; + name = "xwud-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2; - sha256 = "0hrc6gbipg7cximgkaxixlha9m2fph31dpzhzdfw7g63bkhfmzc8"; + url = mirror://xorg/X11R7.7-RC1/src/everything/xwud-1.0.4.tar.bz2; + sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; - buildInputs = [pkgconfig libX11 ]; - })) // {inherit libX11 ;}; + buildInputs = [pkgconfig libX11 xproto ]; + })) // {inherit libX11 xproto ;}; }; in xorg diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 744eb66d84c..2763291d92f 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,6 +1,6 @@ mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 -mirror://xorg/individual/lib/pixman-0.20.2.tar.bz2 +mirror://xorg/individual/lib/pixman-0.24.4.tar.bz2 mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2 diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 5eacf46d1c3..67a1e710a1b 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -1,8 +1,8 @@ -mirror://xorg/individual/app/twm-1.0.6.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.5.tar.bz2 -mirror://xorg/individual/app/xdm-1.1.10.tar.bz2 +mirror://xorg/individual/app/twm-1.0.7.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.6.tar.bz2 +mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 -mirror://xorg/individual/app/xfs-1.1.1.tar.bz2 +mirror://xorg/individual/app/xfs-1.1.2.tar.bz2 mirror://xorg/individual/app/xinit-1.3.0.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2 @@ -10,6 +10,6 @@ mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2 -mirror://xorg/individual/util/imake-1.0.4.tar.bz2 -mirror://xorg/individual/util/lndir-1.0.2.tar.bz2 +mirror://xorg/individual/util/imake-1.0.5.tar.bz2 +mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 46903124568..c46c7c830ac 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -188,9 +188,11 @@ in ''; }; - libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") { - configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''"; - }; + libSM = attrs: attrs + // { propagatedBuildInputs = [ xorg.libICE ]; } + // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") { + configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''"; + }; lndir = attrs: attrs // { preConfigure = '' diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list deleted file mode 100644 index 613c3107c86..00000000000 --- a/pkgs/servers/x11/xorg/tarballs-7.6.list +++ /dev/null @@ -1,199 +0,0 @@ -mirror://xorg/X11R7.6/src/everything/applewmproto-1.4.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/bdftopcf-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/bigreqsproto-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/compositeproto-0.4.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/damageproto-1.2.1.tar.bz2 -mirror://xorg/individual/proto/dri2proto-2.6.tar.bz2 -mirror://xorg/individual/proto/dmxproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/encodings-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/fixesproto-4.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-adobe-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-alias-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-arabic-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bh-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bh-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bh-ttf-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bh-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-bitstream-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-cursor-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-daewoo-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-dec-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-ibm-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-isas-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-jis-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-micro-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-misc-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-misc-ethiopic-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-misc-meltho-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-misc-misc-1.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-mutt-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-schumacher-misc-1.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/fontsproto-2.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-sun-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-util-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/font-xfree86-type1-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/glproto-1.4.12.tar.bz2 -mirror://xorg/X11R7.6/src/everything/iceauth-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/inputproto-2.0.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/kbproto-1.0.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libAppleWM-1.4.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libdmx-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libfontenc-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libFS-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libICE-1.0.7.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.12.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libpthread-stubs-0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libSM-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2 -mirror://xorg/individual/lib/libXaw-1.0.9.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXcursor-1.1.11.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXdamage-1.1.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXfont-1.4.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2 -mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libxkbfile-1.0.7.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXmu-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXpm-3.5.9.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXres-1.0.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXScrnSaver-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXt-1.0.9.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXtst-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXv-1.0.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXvMC-1.0.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXxf86dga-1.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/libXxf86vm-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/luit-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/makedepend-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/mkfontdir-1.0.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/mkfontscale-1.0.8.tar.bz2 -mirror://xorg/X11R7.6/src/everything/randrproto-1.3.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/recordproto-1.14.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/renderproto-0.11.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/resourceproto-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/scrnsaverproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/sessreg-1.0.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/setxkbmap-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/smproxy-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/util-macros-1.11.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/videoproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/windowswmproto-1.0.4.tar.bz2 -mirror://xorg/individual/app/x11perf-1.5.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xauth-1.0.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xbacklight-1.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xbitmaps-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xcb-proto-1.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xcmiscproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xcmsdb-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xcursorgen-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xcursor-themes-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xdpyinfo-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xdriinfo-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xev-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xextproto-7.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86bigfontproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86dgaproto-2.1.tar.bz2 -mirror://xorg/individual/proto/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-acecad-1.4.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-aiptek-1.3.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-ark-0.7.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-ast-0.91.10.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.14.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-chips-1.2.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-cirrus-1.3.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-dummy-0.3.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-fbdev-0.4.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-geode-2.11.10.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-glide-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-glint-1.2.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-i128-1.3.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-i740-1.3.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.15.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-mach64-6.8.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-mga-1.4.13.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-neomagic-1.2.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-newport-0.2.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-nv-2.1.18.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-openchrome-0.2.904.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-r128-6.8.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-rendition-4.2.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-s3-0.6.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-s3virge-1.10.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-savage-2.3.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-siliconmotion-1.7.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-sis-0.10.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-sisusb-0.9.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-suncg14-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-suncg3-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-sunleo-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-suntcx-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-tdfx-1.4.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-tga-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-trident-1.3.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-tseng-1.2.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-vesa-2.3.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-vmware-11.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-wsfb-0.3.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-xgi-1.6.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xf86-video-xgixp-1.8.0.tar.bz2 -mirror://xorg/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xgamma-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xhost-1.0.4.tar.bz2 -mirror://xorg/individual/proto/xineramaproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xinput-1.5.3.tar.bz2 -mirror://xorg/individual/app/xkbcomp-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xkbevd-1.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xkbutils-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xkill-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xlsatoms-1.1.0.tar.bz2 -mirror://xorg/individual/app/xlsclients-1.1.2.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xmodmap-1.0.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xorg-docs-1.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.9.5.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xorg-sgml-doctools-1.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xpr-1.0.3.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xprop-1.2.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xproto-7.0.20.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xrandr-1.3.4.tar.bz2 -mirror://xorg/individual/app/xrdb-1.0.8.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xrefresh-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xset-1.2.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xsetroot-1.1.0.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xtrans-1.2.6.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xvinfo-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xwd-1.0.4.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xwininfo-1.1.1.tar.bz2 -mirror://xorg/X11R7.6/src/everything/xwud-1.0.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list b/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list new file mode 100644 index 00000000000..e7ad33b2971 --- /dev/null +++ b/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list @@ -0,0 +1,184 @@ +mirror://xorg/X11R7.7-RC1/src/everything/applewmproto-1.4.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/bdftopcf-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/bigreqsproto-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/compositeproto-0.4.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/damageproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/dmxproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/dri2proto-2.6.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/encodings-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/fixesproto-5.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-alias-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-arabic-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bh-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bh-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bh-ttf-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bh-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-cursor-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-daewoo-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-dec-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-ibm-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-isas-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-jis-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-micro-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-misc-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-misc-ethiopic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-misc-meltho-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-misc-misc-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-mutt-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-schumacher-misc-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-sony-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/fontsproto-2.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-sun-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-util-1.3.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/font-xfree86-type1-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/glproto-1.4.15.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/iceauth-1.0.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/inputproto-2.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/kbproto-1.0.6.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libAppleWM-1.4.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libdmx-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libfontenc-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libFS-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libICE-1.0.8.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libpciaccess-0.13.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libpthread-stubs-0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libSM-1.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libWindowsWM-1.0.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libX11-1.4.99.901.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXau-1.0.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXaw-1.0.10.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libxcb-1.8.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXcomposite-0.4.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXcursor-1.1.13.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXdamage-1.1.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXdmcp-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXext-1.3.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXfixes-5.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXfont-1.4.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXft-2.3.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXi-1.6.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXinerama-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libxkbfile-1.0.8.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXmu-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXpm-3.5.10.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXrandr-1.3.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXrender-0.9.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXres-1.0.6.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXScrnSaver-1.2.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXt-1.1.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXtst-1.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXv-1.0.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXvMC-1.0.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXxf86dga-1.1.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/libXxf86vm-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/luit-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/makedepend-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/mkfontdir-1.0.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/mkfontscale-1.1.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/randrproto-1.3.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/recordproto-1.14.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/renderproto-0.11.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/resourceproto-1.2.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/scrnsaverproto-1.2.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/sessreg-1.0.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/setxkbmap-1.3.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/smproxy-1.0.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/util-macros-1.17.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/videoproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/windowswmproto-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/x11perf-1.5.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xauth-1.0.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xbacklight-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xbitmaps-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xcb-proto-1.7.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xcmiscproto-1.2.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xcmsdb-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xcursorgen-1.0.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xcursor-themes-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xdpyinfo-1.3.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xdriinfo-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xev-1.2.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xextproto-7.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86bigfontproto-1.2.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86dgaproto-2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86driproto-2.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-evdev-2.7.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-joystick-1.6.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-mouse-1.7.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-synaptics-1.5.99.902.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-void-1.4.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ark-0.7.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ast-0.93.10.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ati-6.14.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-cirrus-1.4.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-dummy-0.3.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-fbdev-0.4.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-geode-2.11.13.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glide-1.2.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glint-1.2.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-i128-1.3.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-intel-2.18.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mach64-6.9.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mga-1.5.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-neomagic-1.2.6.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-newport-0.2.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-nv-2.1.18.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-openchrome-0.2.905.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-r128-6.8.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-savage-2.3.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sis-0.10.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tdfx-1.4.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tga-1.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-trident-1.3.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-v4l-0.2.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vesa-2.3.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vmware-12.0.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xgamma-1.0.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xhost-1.0.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xineramaproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xinput-1.5.99.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xkbcomp-1.2.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xkbevd-1.1.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xkbutils-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xkeyboard-config-2.5.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xkill-1.0.3.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xlsatoms-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xlsclients-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xmodmap-1.0.6.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xorg-docs-1.6.99.901.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xorg-server-1.12.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xorg-sgml-doctools-1.10.99.901.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xpr-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xprop-1.2.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xproto-7.0.23.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xrandr-1.3.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xrdb-1.0.9.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xrefresh-1.0.4.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xset-1.2.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xsetroot-1.1.0.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xtrans-1.2.7.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xvinfo-1.1.1.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xwd-1.0.5.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xwininfo-1.1.2.tar.bz2 +mirror://xorg/X11R7.7-RC1/src/everything/xwud-1.0.4.tar.bz2 diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 36aae068438..de61d1e556b 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -6,8 +6,6 @@ , libxkbfile, libXfont, libpciaccess }: - - with stdenv.lib; stdenv.mkDerivation rec { -- GitLab From ca74fa40db9ad29cfdb219ec9ae0edacd10f5a48 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 19 May 2012 00:14:33 +0000 Subject: [PATCH 0015/5607] * Updated the USB IDs. svn path=/nixpkgs/branches/x-updates/; revision=34179 --- pkgs/os-specific/linux/usbutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 96ae5b93aa8..8dc7325a623 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -4,8 +4,8 @@ let # Obtained from http://www.linux-usb.org/usb.ids.bz2. usbids = fetchurl { - url = http://nixos.org/tarballs/usb.ids.20100720.bz2; - sha256 = "0krncssk0b10z6grw305824zma953l3g2rb7jkk25mb78pw5fd5d"; + url = http://nixos.org/tarballs/usb.ids.20120411.bz2; + sha256 = "0rgxancjd1krv9g817w1wlbg7k19i8mwx37qs1vw1f21xz49yvja"; }; in -- GitLab From 76c0be09f8aa397231f81c998c9b4d850e4a50df Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 19 May 2012 00:44:30 +0000 Subject: [PATCH 0016/5607] * Updated usbutils to 005. (Upstream decided to restart numbering versions from 001. Urgh.) svn path=/nixpkgs/branches/x-updates/; revision=34180 --- pkgs/os-specific/linux/usbutils/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 8dc7325a623..ed8cc56d267 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb }: +{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoconf, automake, libtool }: let @@ -11,14 +11,16 @@ let in stdenv.mkDerivation rec { - name = "usbutils-0.86"; + name = "usbutils-005"; src = fetchurl { - url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.gz"; - sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk"; + url = mirror://debian/pool/main/u/usbutils/usbutils_005.orig.tar.gz; + sha256 = "05sxkm7b7lj8p8kr8kw68m49h66351s803z42233b8lssmc3wlra"; }; - buildInputs = [ pkgconfig libusb ]; + buildInputs = [ pkgconfig libusb1 autoconf automake libtool zlib ]; + + preConfigure = "autoreconf -i"; preBuild = "bunzip2 < ${usbids} > usb.ids"; -- GitLab From 41840af6894bf718a1038ba1045adef26a687919 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 19 May 2012 02:52:36 +0000 Subject: [PATCH 0017/5607] =?UTF-8?q?*=20Add=20a=20setup=20hook=20?= =?UTF-8?q?=E2=80=98autoreconfHook=E2=80=99=20to=20simplify=20packages=20t?= =?UTF-8?q?hat=20need=20to=20=20=20run=20autoreconf:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit buildInputs = [ autoreconfHook ]; is essentially equivalent to buildInputs = [ autoconf automake libtool ]; preConfigure = "autoreconf -i"; svn path=/nixpkgs/branches/x-updates/; revision=34181 --- pkgs/build-support/setup-hooks/autoreconf.sh | 11 +++++++++++ .../{make-wrapper => setup-hooks}/make-wrapper.sh | 0 pkgs/os-specific/linux/mountall/default.nix | 6 ++---- pkgs/os-specific/linux/usbutils/default.nix | 4 ++-- pkgs/tools/networking/sitecopy/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 10 ++++++---- 6 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 pkgs/build-support/setup-hooks/autoreconf.sh rename pkgs/build-support/{make-wrapper => setup-hooks}/make-wrapper.sh (100%) diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh new file mode 100644 index 00000000000..027c8322163 --- /dev/null +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -0,0 +1,11 @@ +preConfigurePhases+=" autoreconfPhase" + +for i in @autoconf@ @automake@ @libtool@; do + findInputs $i nativePkgs propagated-build-native-inputs +done + +autoreconfPhase() { + runHook preAutoreconf + autoreconf ${autoreconfFlags:---install --force} + runHook postAutoreconf +} diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh similarity index 100% rename from pkgs/build-support/make-wrapper/make-wrapper.sh rename to pkgs/build-support/setup-hooks/make-wrapper.sh diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix index b563b80f9a9..3d72b0a258e 100644 --- a/pkgs/os-specific/linux/mountall/default.nix +++ b/pkgs/os-specific/linux/mountall/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }: +{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }: stdenv.mkDerivation { name = "mountall-2.35"; @@ -10,9 +10,7 @@ stdenv.mkDerivation { patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ]; - preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi"; - - buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ]; + buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ]; makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs"; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index ed8cc56d267..5614f55a622 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoconf, automake, libtool }: +{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoreconfHook }: let @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "05sxkm7b7lj8p8kr8kw68m49h66351s803z42233b8lssmc3wlra"; }; - buildInputs = [ pkgconfig libusb1 autoconf automake libtool zlib ]; + buildInputs = [ pkgconfig libusb1 autoreconfHook ]; preConfigure = "autoreconf -i"; diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix index 6beaff56aea..5667744ef22 100644 --- a/pkgs/tools/networking/sitecopy/default.nix +++ b/pkgs/tools/networking/sitecopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }: +{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }: stdenv.mkDerivation rec { name = "sitecopy-0.16.6"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./neon-29.patch ]; - preConfigure = "autoreconf"; - - buildInputs = [ openssl neon zlib autoconf automake libtool ]; + buildInputs = [ openssl neon zlib autoreconfHook ]; configureFlags= "--with-ssl=openssl"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5b8dde2624..4ec940b6393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -245,6 +245,10 @@ let theAttrSet = arg; }; + autoreconfHook = makeSetupHook + { substitutions = { inherit autoconf automake libtool; }; } + ../build-support/setup-hooks/autoreconf.sh; + buildEnv = import ../build-support/buildenv { inherit (pkgs) runCommand perl; }; @@ -327,7 +331,7 @@ let inherit stdenv perl cpio contents ubootChooser; }; - makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh; + makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh; makeModulesClosure = {kernel, rootModules, allowMissing ? false}: import ../build-support/kernel/modules-closure.nix { @@ -5824,9 +5828,7 @@ let module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; - mountall = callPackage ../os-specific/linux/mountall { - automake = automake111x; - }; + mountall = callPackage ../os-specific/linux/mountall { }; aggregateModules = modules: import ../os-specific/linux/module-init-tools/aggregator.nix { -- GitLab From ad943dbbe3a34d7e7e026ecc769064f8f9b51c26 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 May 2012 23:31:28 +0000 Subject: [PATCH 0018/5607] * OpenSSL 1.0.0j (CVE-2012-2333). svn path=/nixpkgs/branches/stdenv-updates/; revision=34205 --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index cd164b13f8e..f8d2b32542c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: let - name = "openssl-1.0.0i"; + name = "openssl-1.0.0j"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -35,7 +35,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "b7aa11cbd7d264c2b1f44e3d55b334fb33f7b674"; + sha1 = "31e6e8bbf1de2f59fbd53382c34214887ccc1318"; }; patches = patchesCross false; -- GitLab From fd0a9f6bae6a34607092fd63e316168a21bc1061 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 May 2012 17:11:55 +0000 Subject: [PATCH 0019/5607] * util-linux updated to 2.21.2. svn path=/nixpkgs/branches/stdenv-updates/; revision=34280 --- pkgs/os-specific/linux/util-linux/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ae5727568f2..4433d2500ec 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null }: stdenv.mkDerivation rec { - name = "util-linux-2.20.1"; + name = "util-linux-2.21.2"; src = fetchurl { - # This used to be mirror://kernel/linux/utils/util-linux, but it - # disappeared in the kernel.org meltdown. - url = "mirror://gentoo/distfiles/${name}.tar.bz2"; - sha256 = "1q5vjcvw4f067c63vj2n3xggvk5prm11571x6vnqiav47vdbqvni"; + url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.21/${name}.tar.bz2"; + sha256 = "0c1xp9pzwizxfk09anvjaz5cv8gvxracvvb6s84xiaxza679svq6"; }; patches = [ ./linux-specific-header.patch ]; -- GitLab From 94fe7bed1dc5f5a2084b9c8ccdc0bc1ecd102317 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 2 Jul 2012 17:04:56 +0200 Subject: [PATCH 0020/5607] Extend compiler wrapper scripts to allow compilation of "/dev/null" input. This feature sounds crazy, but it is used in some configure scripts (e.g. xbmc). This patch causes an almost complete rebuild of Nixpkgs. Patch submitted by Jan Malakhovski . --- pkgs/build-support/clang-wrapper/utils.sh | 1 + pkgs/build-support/gcc-cross-wrapper/utils.sh | 1 + pkgs/build-support/gcc-upc-wrapper/utils.sh | 1 + pkgs/build-support/gcc-wrapper/utils.sh | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/build-support/clang-wrapper/utils.sh b/pkgs/build-support/clang-wrapper/utils.sh index 9a664e1d1e6..753b3772e95 100644 --- a/pkgs/build-support/clang-wrapper/utils.sh +++ b/pkgs/build-support/clang-wrapper/utils.sh @@ -17,6 +17,7 @@ badPath() { # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ + "$p" != "/dev/null" -a \ "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ "${p:0:4}" != "/tmp" -a \ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" diff --git a/pkgs/build-support/gcc-cross-wrapper/utils.sh b/pkgs/build-support/gcc-cross-wrapper/utils.sh index 9a664e1d1e6..753b3772e95 100644 --- a/pkgs/build-support/gcc-cross-wrapper/utils.sh +++ b/pkgs/build-support/gcc-cross-wrapper/utils.sh @@ -17,6 +17,7 @@ badPath() { # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ + "$p" != "/dev/null" -a \ "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ "${p:0:4}" != "/tmp" -a \ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" diff --git a/pkgs/build-support/gcc-upc-wrapper/utils.sh b/pkgs/build-support/gcc-upc-wrapper/utils.sh index 9a664e1d1e6..753b3772e95 100644 --- a/pkgs/build-support/gcc-upc-wrapper/utils.sh +++ b/pkgs/build-support/gcc-upc-wrapper/utils.sh @@ -17,6 +17,7 @@ badPath() { # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ + "$p" != "/dev/null" -a \ "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ "${p:0:4}" != "/tmp" -a \ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" diff --git a/pkgs/build-support/gcc-wrapper/utils.sh b/pkgs/build-support/gcc-wrapper/utils.sh index 9a664e1d1e6..753b3772e95 100644 --- a/pkgs/build-support/gcc-wrapper/utils.sh +++ b/pkgs/build-support/gcc-wrapper/utils.sh @@ -17,6 +17,7 @@ badPath() { # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ + "$p" != "/dev/null" -a \ "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ "${p:0:4}" != "/tmp" -a \ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" -- GitLab From 78310258e332209d7b4d86b353c7dfab3d31a75a Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Tue, 10 Jul 2012 19:03:13 +0300 Subject: [PATCH 0021/5607] Attempt to define isolated attrset for gnome-3 --- .../gnome-3/core/at-spi2-atk/default.nix | 14 +++++ .../gnome-3/core/at-spi2-core/default.nix | 14 +++++ pkgs/desktops/gnome-3/core/atk/default.nix | 38 +++++++++++ pkgs/desktops/gnome-3/core/gconf/default.nix | 22 +++++++ .../gnome-3/core/gdk-pixbuf/default.nix | 33 ++++++++++ pkgs/desktops/gnome-3/core/glib/default.nix | 44 +++++++++++++ .../gnome-3/core/gnome-terminal/default.nix | 20 ++++++ .../core/gobject-introspection/default.nix | 28 +++++++++ .../gsettings-desktop-schemas/default.nix | 21 +++++++ pkgs/desktops/gnome-3/core/gtk/default.nix | 63 +++++++++++++++++++ pkgs/desktops/gnome-3/core/pango/default.nix | 41 ++++++++++++ pkgs/desktops/gnome-3/core/vte/default.nix | 46 ++++++++++++++ pkgs/desktops/gnome-3/core/zenity/default.nix | 20 ++++++ pkgs/desktops/gnome-3/default.nix | 49 +++++++++++++++ .../gnome-3/desktop/gnome-desktop/default.nix | 18 ++++++ .../desktop/gnome-dictionary/default.nix | 15 +++++ .../gnome-3/desktop/rarian/default.nix | 11 ++++ .../gnome-3/desktop/scrollkeeper/default.nix | 18 ++++++ pkgs/top-level/all-packages.nix | 5 ++ 19 files changed, 520 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix create mode 100644 pkgs/desktops/gnome-3/core/at-spi2-core/default.nix create mode 100644 pkgs/desktops/gnome-3/core/atk/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gconf/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix create mode 100644 pkgs/desktops/gnome-3/core/glib/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gobject-introspection/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix create mode 100644 pkgs/desktops/gnome-3/core/gtk/default.nix create mode 100644 pkgs/desktops/gnome-3/core/pango/default.nix create mode 100644 pkgs/desktops/gnome-3/core/vte/default.nix create mode 100644 pkgs/desktops/gnome-3/core/zenity/default.nix create mode 100644 pkgs/desktops/gnome-3/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/rarian/default.nix create mode 100644 pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix new file mode 100644 index 00000000000..a26928fadf7 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi +, intltool, dbus_glib }: + +stdenv.mkDerivation { + name = "at-spi2-atk-2.5.3"; + + src = fetchurl { + url = mirror://gnome/sources/at-spi2-atk/2.5/at-spi2-atk-2.5.3.tar.xz; + sha256 = "16y6q0v3va7r77ns1r6w4mg3rvyxmnyzx1b3n0wqjzmqkd8avgmx"; + }; + + buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi + intltool dbus_glib ]; +} diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix new file mode 100644 index 00000000000..5d7170f4450 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, python, pkgconfig, popt, libX11, libICE, xlibs, libXi +, intltool, dbus_glib }: + +stdenv.mkDerivation { + name = "at-spi2-core-2.5.3"; + + src = fetchurl { + url = mirror://gnome/sources/at-spi2-core/2.5/at-spi2-core-2.5.3.tar.xz; + sha256 = "0g1w8k13xjz6jcbkdy3h8w4x8g5g1f0nwykidairvfyi6yi9xdpm"; + }; + + buildInputs = [ python pkgconfig popt libX11 libICE xlibs.libXtst libXi + intltool dbus_glib ]; +} diff --git a/pkgs/desktops/gnome-3/core/atk/default.nix b/pkgs/desktops/gnome-3/core/atk/default.nix new file mode 100644 index 00000000000..98ff11cd12e --- /dev/null +++ b/pkgs/desktops/gnome-3/core/atk/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, perl, gnome3 }: + +stdenv.mkDerivation rec { + versionMajor = "2.5"; + versionMinor = "3"; + name = "atk-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/atk/${versionMajor}/atk-${versionMajor}.${versionMinor}.tar.xz"; + sha256 = "04v3hzdgp2cajpgkbgr36wlxcdbpzzywyl6g2fhhyjgm9vrqw4dc"; + }; + + buildNativeInputs = [ pkgconfig perl ]; + + propagatedBuildInputs = [ gnome3.glib ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "ATK, the accessibility toolkit"; + + longDescription = '' + ATK is the Accessibility Toolkit. It provides a set of generic + interfaces allowing accessibility technologies such as screen + readers to interact with a graphical user interface. Using the + ATK interfaces, accessibility tools have full access to view and + control running applications. + ''; + + homepage = http://library.gnome.org/devel/atk/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ raskin urkud antono ]; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/pkgs/desktops/gnome-3/core/gconf/default.nix b/pkgs/desktops/gnome-3/core/gconf/default.nix new file mode 100644 index 00000000000..cfe2b2e4465 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gconf/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, libxml2 +, intltool, dbus_libs, polkit }: + +stdenv.mkDerivation rec { + + versionMajor = "3.2"; + versionMinor = "5"; + moduleName = "GConf"; + + origName = "${moduleName}-${versionMajor}.${versionMinor}"; + + name = "gconf-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; + sha256 = "1ijqks0jxc4dyfxg4vnbqds4aj6miyahlsmlqlkf2bi1798akpjd"; + }; + + buildInputs = [ dbus_libs dbus_glib libxml2 polkit gnome3.gtk ]; + propagatedBuildInputs = [ gnome3.glib ]; + buildNativeInputs = [ pkgconfig intltool ]; +} diff --git a/pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix b/pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix new file mode 100644 index 00000000000..6daea5abf02 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gdk-pixbuf/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, libtiff, libjpeg, libpng, libX11, xz, jasper }: + +stdenv.mkDerivation rec { + versionMajor = "2.26"; + versionMinor = "1"; + + name = "gdk-pixbuf-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/gdk-pixbuf/${versionMajor}/gdk-pixbuf-${versionMajor}.${versionMinor}.tar.xz"; + sha256 = "1fn79r5vk1ck6xd5f7dgckbfhf2xrqq6f3389jx1bk6rb0mz22m6"; + }; + + # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. + buildInputs = [ libX11 ]; + + buildNativeInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ gnome3.glib libtiff libjpeg libpng jasper ]; + + configureFlags = "--with-libjasper --with-x11"; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A library for image loading and manipulation"; + + homepage = http://library.gnome.org/devel/gdk-pixbuf/; + + maintainers = [ stdenv.lib.maintainers.antono ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/glib/default.nix b/pkgs/desktops/gnome-3/core/glib/default.nix new file mode 100644 index 00000000000..8d60e48ffee --- /dev/null +++ b/pkgs/desktops/gnome-3/core/glib/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi, python, pcre }: + +stdenv.mkDerivation rec { + versionMajor = "2.33"; + versionMinor = "3"; + moduleName = "glib"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "1409vc8ac296x341s80q36qvgbzpwpcvxg2xdis5w1vzzxfnkqja"; + }; + + # configure script looks for d-bus but it is only needed for tests + buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildNativeInputs = [ perl pkgconfig gettext python ]; + + propagatedBuildInputs = [ zlib libffi ]; + + configureFlags = "--disable-fam"; + + passthru.gioModuleDir = "lib/gio/modules"; + + postInstall = "rm -rvf $out/share/gtk-doc"; + + meta = { + description = "GLib, a C library of programming buildings blocks"; + + longDescription = '' + GLib provides the core application building blocks for libraries + and applications written in C. It provides the core object + system used in GNOME, the main loop implementation, and a large + set of utility functions for strings and common data structures. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ raskin urkud antono ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix new file mode 100644 index 00000000000..ccd827b8d5d --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which, GConf3 }: + +stdenv.mkDerivation rec { + + versionMajor = "3.4"; + versionMinor = "1.1"; + + name = "gnome-terminal-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; + sha256 = "1p9zqjmkxryf2kyghhhwwpsh4kd8y1jzzwc9zxghmpxszi9a5m0l"; + }; + + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte GConf3 ]; + + buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ]; +} diff --git a/pkgs/desktops/gnome-3/core/gobject-introspection/default.nix b/pkgs/desktops/gnome-3/core/gobject-introspection/default.nix new file mode 100644 index 00000000000..b630e210762 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gobject-introspection/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, cairo }: + +stdenv.mkDerivation rec { + + versionMajor = "1.33"; + versionMinor = "3"; + moduleName = "gobject-introspection"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "1dziqpas9hg2nkyzy6l53mrjnp2argfszj4cqzdw7ia0zfccmc4q"; + }; + + buildInputs = [ flex bison glib pkgconfig python ]; + propagatedBuildInputs = [ libffi ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = with stdenv.lib; { + maintainers = [ maintainers.antono ]; + platforms = platforms.linux; + homepage = http://live.gnome.org/GObjectIntrospection; + }; + + configureFlags = [ "--disable-tests" ]; +} diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix new file mode 100644 index 00000000000..4de69511fd1 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which }: + +stdenv.mkDerivation rec { + + versionMajor = "3.5"; + versionMinor = "3"; + moduleName = "gsettings-desktop-schemas"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "0vxbpwqvm55a4ssaddfsw2jy0q8bvsv8wbjps4yyyi9iykfylwli"; + }; + + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ gnome3.glib libxml2 libxslt libX11 ]; + + buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ]; +} diff --git a/pkgs/desktops/gnome-3/core/gtk/default.nix b/pkgs/desktops/gnome-3/core/gtk/default.nix new file mode 100644 index 00000000000..6fb9d05ece8 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gtk/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, cairo, perl, xlibs +, xz +, xineramaSupport ? true +, cupsSupport ? true, cups ? null +}: + +assert xineramaSupport -> xlibs.libXinerama != null; +assert cupsSupport -> cups != null; + +stdenv.mkDerivation rec { + versionMajor = "3.5"; + versionMinor = "6"; + moduleName = "gtk+"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "1088d5n3yzzjxm13c29sys83m28dmd5b95i1wxc6459vq2d4l14g"; + }; + + enableParallelBuilding = true; + + configureFlags = + [ "--without-atk-bridge" + "--enable-gtk-doc-html=no" + "--enable-x11-backend" + "--disable-tests" + ]; + + buildNativeInputs = [ perl pkgconfig ]; + + propagatedBuildInputs = + [ xlibs.xlibs gnome3.glib gnome3.atk gnome3.gdk_pixbuf gnome3.pango cairo + xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi + ] + ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama + ++ stdenv.lib.optionals cupsSupport [ cups ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A multi-platform toolkit for creating graphical user interfaces"; + + longDescription = '' + GTK+ is a highly usable, feature rich toolkit for creating + graphical user interfaces which boasts cross platform + compatibility and an easy to use API. GTK+ it is written in C, + but has bindings to many other popular programming languages + such as C++, Python and C# among others. GTK+ is licensed + under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK+ without any license fees or + royalties. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ urkud raskin antono ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/pango/default.nix b/pkgs/desktops/gnome-3/core/pango/default.nix new file mode 100644 index 00000000000..86ec72fec2f --- /dev/null +++ b/pkgs/desktops/gnome-3/core/pango/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: + +stdenv.mkDerivation rec { + + versionMajor = "1.30"; + versionMinor = "1"; + moduleName = "pango"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "1ghc49b5ahv2is7hlq6is5jbpkvhx5kkays6spf2s9rw2hg0d31s"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; + + buildNativeInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ x11 glib cairo libpng ]; + + postInstall = "rm -rf $out/share/gtk-doc"; + + meta = { + description = "A library for laying out and rendering of text, with an emphasis on internationalization"; + + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK+ widget toolkit. + Pango forms the core of text and font handling for GTK+-2.x. + ''; + + homepage = http://www.pango.org/; + license = "LGPLv2+"; + + maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix new file mode 100644 index 00000000000..ffc3aab8706 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/vte/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses +, pythonSupport ? false, python, pygtk}: + +stdenv.mkDerivation rec { + + versionMajor = "0.32"; + versionMinor = "2"; + moduleName = "vte"; + + name = "${moduleName}-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "0sj837b9ib36gx00hzdinv23f7w91fd5mcw1p6wdi053yxqw17nn"; + }; + + buildInputs = [ intltool pkgconfig gnome3.glib gnome3.gtk ncurses ] ++ + stdenv.lib.optionals pythonSupport [python pygtk]; + + configureFlags = '' + ${if pythonSupport then "--enable-python" else "--disable-python"} + ''; + + postInstall = stdenv.lib.optionalString pythonSupport '' + cd $(toPythonPath $out)/gtk-2.0 + for n in *; do + ln -s "gtk-2.0/$n" "../$n" + done + ''; + + meta = { + homepage = http://www.gnome.org/; + description = "A library implementing a terminal emulator widget for GTK+"; + longDescription = '' + VTE is a library (libvte) implementing a terminal emulator widget for + GTK+, and a minimal sample application (vte) using that. Vte is + mainly used in gnome-terminal, but can also be used to embed a + console/terminal in games, editors, IDEs, etc. VTE supports Unicode and + character set conversion, as well as emulating any terminal known to + the system's terminfo database. + ''; + license = "LGPLv2"; + maintainers = with stdenv.lib.maintainers; [ astsmtl antono ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix new file mode 100644 index 00000000000..3a7aac08da6 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango +, gnome_doc_utils, intltool, libX11, which }: + +stdenv.mkDerivation rec { + + versionMajor = "3.4"; + versionMinor = "0"; + + name = "zenity-${versionMajor}.${versionMinor}"; + + src = fetchurl { + url = "mirror://gnome/sources/zenity/${versionMajor}/zenity-${versionMajor}.${versionMinor}.tar.xz"; + sha256 = "1bqbfcvd3kj2xk15fvbcdaqvyg9qvymlhn8cwvg5m6v4gicniw2w"; + }; + + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ gnome3.gtk libxml2 libxslt libX11 ]; + + buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which ]; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix new file mode 100644 index 00000000000..b9558fa7ec6 --- /dev/null +++ b/pkgs/desktops/gnome-3/default.nix @@ -0,0 +1,49 @@ +{ callPackage, lib, self, stdenv, gettext, overrides ? {} }: + +{ + + inherit (lib) lowPrio hiPrio appendToName makeOverridable; + + __overrides = overrides; + +#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) + + at_spi2_atk = callPackage ./core/at-spi2-atk { }; + + at_spi2_core = callPackage ./core/at-spi2-core { }; + + atk = callPackage ./core/atk { }; + + gconf = callPackage ./core/gconf { }; + + gdk_pixbuf = callPackage ./core/gdk-pixbuf { }; + + glib = callPackage ./core/glib { }; + + gobject_introspection = callPackage ./core/gobject-introspection { }; + + gtk = callPackage ./core/gtk { }; + + gnome_terminal = callPackage ./core/gnome-terminal { }; + + gsettings_desktop_schemas = lib.lowPrio (callPackage ./core/gsettings-desktop-schemas { }); + + pango = callPackage ./core/pango { }; + + vte = callPackage ./core/vte { }; + + zenity = callPackage ./core/zenity { }; + +#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) + + gnome_dictionary = callPackage ./desktop/gnome-dictionary { }; + + gnome_desktop = callPackage ./desktop/gnome-desktop { }; + + # Removed from recent GNOME releases, but still required + scrollkeeper = callPackage ./desktop/scrollkeeper { }; + + # scrollkeeper replacement + rarian = callPackage ./desktop/rarian { }; + +} diff --git a/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix new file mode 100644 index 00000000000..4d22f6ad746 --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/gnome-desktop/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3 +, intltool, gnome_doc_utils}: + +stdenv.mkDerivation rec { + + majorVersion = "3.5"; + minorVersion = "3"; + name = "gnome-desktop-${majorVersion}.${minorVersion}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz"; + sha256 = "1nrqcp1p5cxhfjjy5hjpvkqmzsgl2353a08fg0b11c932v95bsba"; + }; + + configureFlags = "--disable-scrollkeeper"; + buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 + gnome3.gtk gnome3.glib intltool gnome_doc_utils ]; +} diff --git a/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix new file mode 100644 index 00000000000..2c3efcf3a07 --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/gnome-dictionary/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, gnome_doc_utils, intltool, which +, libxml2, libxslt }: + +stdenv.mkDerivation rec { + version = "3.5.2"; + name = "gnome-dictionary-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-dictionary/3.5/${name}.tar.xz"; + sha256 = "1cq32csxn27vir5nlixx337ym2nal9ykq3s1j7yynh2adh4m0jil"; + }; + + buildInputs = [ gnome3.gtk ]; + buildNativeInputs = [ pkgconfig intltool gnome_doc_utils which libxml2 libxslt gnome3.scrollkeeper ]; +} diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/desktop/rarian/default.nix new file mode 100644 index 00000000000..77a2b710f44 --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/rarian/default.nix @@ -0,0 +1,11 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: + +stdenv.mkDerivation rec { + name = "rarian-0.8.1"; + src = fetchurl { + url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; + sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; + }; + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; +} diff --git a/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix new file mode 100644 index 00000000000..97dcbf4e004 --- /dev/null +++ b/pkgs/desktops/gnome-3/desktop/scrollkeeper/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42, automake}: + +stdenv.mkDerivation { + name = "scrollkeeper-0.3.14"; + src = fetchurl { + url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2; + sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; + }; + + # The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess + preConfigure = " + substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog + cp ${automake}/share/automake*/config.{sub,guess} . + "; + + buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; + configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2acb2bb9ed6..bf5b5fe0ace 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8055,6 +8055,11 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; + gnome3 = callPackage ../desktops/gnome-3 { + callPackage = pkgs.newScope pkgs.gnome3; + self = pkgs.gnome3; + }; + gnome = recurseIntoAttrs gnome2; kde3 = recurseIntoAttrs { -- GitLab From 8480a90d1e45e841e9222144ae8852cf728ec66f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 12 Jul 2012 14:28:19 -0400 Subject: [PATCH 0022/5607] bzip2: Keep libbz2.so.1.0 around. Some packages (e.g. libarchive) try to link there. Reported by jack_c in IRC. --- pkgs/tools/compression/bzip2/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index 0fa92d3d100..a598dfcf808 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -10,7 +10,7 @@ if test -n "$sharedLibrary"; then preInstall() { mkdir -p $out/lib mv libbz2.so* $out/lib - (cd $out/lib && ln -s libbz2.so.1.0.? libbz2.so && mv libbz2.so.1.0 libbz2.so.1) + (cd $out/lib && ln -s libbz2.so.1.0.? libbz2.so && ln -s libbz2.so.1.0.? libbz2.so.1); } fi -- GitLab From 71e0a3fb935319da92ceba67099507ecae6925a7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 14:33:58 -0400 Subject: [PATCH 0023/5607] x.org: Update to 7.7 --- pkgs/servers/x11/xorg/default.nix | 460 ++++++++++---------- pkgs/servers/x11/xorg/extra.list | 10 +- pkgs/servers/x11/xorg/old.list | 2 +- pkgs/servers/x11/xorg/tarballs-7.7-rc1.list | 184 -------- pkgs/servers/x11/xorg/tarballs-7.7.list | 184 ++++++++ 5 files changed, 420 insertions(+), 420 deletions(-) delete mode 100644 pkgs/servers/x11/xorg/tarballs-7.7-rc1.list create mode 100644 pkgs/servers/x11/xorg/tarballs-7.7.list diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 17e2bff8a9f..3567f1ad0d9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -11,7 +11,7 @@ let name = "applewmproto-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/applewmproto-1.4.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2; sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw"; }; buildInputs = [pkgconfig ]; @@ -21,7 +21,7 @@ let name = "bdftopcf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/bdftopcf-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2; sha256 = "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w"; }; buildInputs = [pkgconfig libXfont ]; @@ -31,7 +31,7 @@ let name = "bigreqsproto-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/bigreqsproto-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2; sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6"; }; buildInputs = [pkgconfig ]; @@ -41,7 +41,7 @@ let name = "compositeproto-0.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/compositeproto-0.4.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2; sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4"; }; buildInputs = [pkgconfig ]; @@ -51,7 +51,7 @@ let name = "damageproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/damageproto-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2; sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w"; }; buildInputs = [pkgconfig ]; @@ -61,7 +61,7 @@ let name = "dmxproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/dmxproto-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2; sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877"; }; buildInputs = [pkgconfig ]; @@ -71,7 +71,7 @@ let name = "dri2proto-2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/dri2proto-2.6.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/dri2proto-2.6.tar.bz2; sha256 = "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md"; }; buildInputs = [pkgconfig ]; @@ -81,7 +81,7 @@ let name = "encodings-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/encodings-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2; sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf"; }; buildInputs = [pkgconfig ]; @@ -91,7 +91,7 @@ let name = "fixesproto-5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/fixesproto-5.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2; sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs"; }; buildInputs = [pkgconfig xextproto ]; @@ -101,7 +101,7 @@ let name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -111,7 +111,7 @@ let name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -121,7 +121,7 @@ let name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -131,7 +131,7 @@ let name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -141,7 +141,7 @@ let name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -151,7 +151,7 @@ let name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-alias-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; buildInputs = [pkgconfig ]; @@ -161,7 +161,7 @@ let name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-arabic-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -171,7 +171,7 @@ let name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -181,7 +181,7 @@ let name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -191,7 +191,7 @@ let name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -201,7 +201,7 @@ let name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -211,7 +211,7 @@ let name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-ttf-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -221,7 +221,7 @@ let name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bh-type1-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -231,7 +231,7 @@ let name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -241,7 +241,7 @@ let name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -251,7 +251,7 @@ let name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-type1-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -261,7 +261,7 @@ let name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -271,7 +271,7 @@ let name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-cursor-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -281,7 +281,7 @@ let name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-daewoo-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -291,7 +291,7 @@ let name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-dec-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -301,7 +301,7 @@ let name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-ibm-type1-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -311,7 +311,7 @@ let name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-isas-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -321,7 +321,7 @@ let name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-jis-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -331,7 +331,7 @@ let name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-micro-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -341,7 +341,7 @@ let name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -351,7 +351,7 @@ let name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -361,7 +361,7 @@ let name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-meltho-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -371,7 +371,7 @@ let name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-misc-misc-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -381,7 +381,7 @@ let name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-mutt-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -391,7 +391,7 @@ let name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-schumacher-misc-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -401,7 +401,7 @@ let name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -411,7 +411,7 @@ let name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-sony-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -421,7 +421,7 @@ let name = "fontsproto-2.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/fontsproto-2.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2; sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746"; }; buildInputs = [pkgconfig ]; @@ -431,7 +431,7 @@ let name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-sun-misc-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -441,7 +441,7 @@ let name = "font-util-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-util-1.3.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2; sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz"; }; buildInputs = [pkgconfig ]; @@ -451,7 +451,7 @@ let name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -461,7 +461,7 @@ let name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/font-xfree86-type1-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; @@ -481,7 +481,7 @@ let name = "glproto-1.4.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/glproto-1.4.15.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/glproto-1.4.15.tar.bz2; sha256 = "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr"; }; buildInputs = [pkgconfig ]; @@ -491,7 +491,7 @@ let name = "iceauth-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/iceauth-1.0.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2; sha256 = "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"; }; buildInputs = [pkgconfig libICE xproto ]; @@ -511,7 +511,7 @@ let name = "inputproto-2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/inputproto-2.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2; sha256 = "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"; }; buildInputs = [pkgconfig ]; @@ -521,7 +521,7 @@ let name = "kbproto-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/kbproto-1.0.6.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2; sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03"; }; buildInputs = [pkgconfig ]; @@ -531,7 +531,7 @@ let name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libAppleWM-1.4.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ]; @@ -541,7 +541,7 @@ let name = "libFS-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libFS-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2; sha256 = "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; @@ -551,7 +551,7 @@ let name = "libICE-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libICE-1.0.8.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2; sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94"; }; buildInputs = [pkgconfig xproto xtrans ]; @@ -561,7 +561,7 @@ let name = "libSM-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libSM-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2; sha256 = "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck"; }; buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; @@ -571,18 +571,18 @@ let name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libWindowsWM-1.0.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ]; })) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { - name = "libX11-1.4.99.901"; + name = "libX11-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libX11-1.4.99.901.tar.bz2; - sha256 = "1nr6vgcs9asmxgcml9h79n74f8ik229y0dap4r8rcibyw1lqa8xz"; + url = mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2; + sha256 = "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3"; }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -591,7 +591,7 @@ let name = "libXScrnSaver-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXScrnSaver-1.2.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2; sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg"; }; buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ]; @@ -601,18 +601,18 @@ let name = "libXau-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXau-1.0.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2; sha256 = "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) { - name = "libXaw-1.0.10"; + name = "libXaw-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXaw-1.0.10.tar.bz2; - sha256 = "1p8vxqwk5gs8dl325fmjvqx165bv5vngayfkj5ffrf1q4vwvr5id"; + url = mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2; + sha256 = "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"; }; buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; @@ -621,7 +621,7 @@ let name = "libXcomposite-0.4.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXcomposite-0.4.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2; sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"; }; buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; @@ -631,7 +631,7 @@ let name = "libXcursor-1.1.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXcursor-1.1.13.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2; sha256 = "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"; }; buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; @@ -641,7 +641,7 @@ let name = "libXdamage-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXdamage-1.1.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2; sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"; }; buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; @@ -651,7 +651,7 @@ let name = "libXdmcp-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXdmcp-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2; sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls"; }; buildInputs = [pkgconfig xproto ]; @@ -661,7 +661,7 @@ let name = "libXext-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXext-1.3.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2; sha256 = "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; @@ -671,7 +671,7 @@ let name = "libXfixes-5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXfixes-5.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2; sha256 = "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; @@ -681,28 +681,28 @@ let name = "libXfont-1.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXfont-1.4.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2; sha256 = "0w3irg00k6b6mziddnacln9q2rkf5848b04nvjqwv5bb1fw6zydv"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) { - name = "libXft-2.3.0"; + name = "libXft-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXft-2.3.0.tar.bz2; - sha256 = "0i5hb1c5mq3qam4qzchv2crir8n7jvip9m1ncl04fp1aswx3j9il"; + url = mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2; + sha256 = "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"; }; buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ]; })) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { - name = "libXi-1.6.0"; + name = "libXi-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXi-1.6.0.tar.bz2; - sha256 = "1bx7qi1rak3fazkxgf98lxy9iiflgvlm4wg2pg2hb5169ai6bz5j"; + url = mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2; + sha256 = "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ]; })) // {inherit inputproto libX11 libXext xextproto xproto ;}; @@ -711,7 +711,7 @@ let name = "libXinerama-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXinerama-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2; sha256 = "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"; }; buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; @@ -721,7 +721,7 @@ let name = "libXmu-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXmu-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2; sha256 = "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; @@ -741,7 +741,7 @@ let name = "libXpm-3.5.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXpm-3.5.10.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2; sha256 = "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; @@ -751,7 +751,7 @@ let name = "libXrandr-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXrandr-1.3.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXrandr-1.3.2.tar.bz2; sha256 = "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; @@ -761,7 +761,7 @@ let name = "libXrender-0.9.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXrender-0.9.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2; sha256 = "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; @@ -771,7 +771,7 @@ let name = "libXres-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXres-1.0.6.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2; sha256 = "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"; }; buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; @@ -781,7 +781,7 @@ let name = "libXt-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXt-1.1.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2; sha256 = "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"; }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; @@ -791,7 +791,7 @@ let name = "libXtst-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXtst-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2; sha256 = "1q750hjplq1rfyxkr4545z1y2a1wfnc828ynvbws7b4jwdk3xsky"; }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; @@ -801,7 +801,7 @@ let name = "libXv-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXv-1.0.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2; sha256 = "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; @@ -811,7 +811,7 @@ let name = "libXvMC-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXvMC-1.0.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2; sha256 = "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; @@ -821,7 +821,7 @@ let name = "libXxf86dga-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXxf86dga-1.1.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2; sha256 = "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; @@ -841,7 +841,7 @@ let name = "libXxf86vm-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libXxf86vm-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2; sha256 = "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; @@ -851,7 +851,7 @@ let name = "libdmx-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libdmx-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2; sha256 = "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7"; }; buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; @@ -861,7 +861,7 @@ let name = "libfontenc-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libfontenc-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2; sha256 = "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny"; }; buildInputs = [pkgconfig xproto zlib ]; @@ -871,7 +871,7 @@ let name = "libpciaccess-0.13.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libpciaccess-0.13.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2; sha256 = "11509lkgd5j4g5wy0g13z4sf31h50hqx3jfwb2i4q6k98pv6iar7"; }; buildInputs = [pkgconfig zlib ]; @@ -881,7 +881,7 @@ let name = "libpthread-stubs-0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libpthread-stubs-0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2; sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim"; }; buildInputs = [pkgconfig ]; @@ -891,7 +891,7 @@ let name = "libxcb-1.8.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libxcb-1.8.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libxcb-1.8.1.tar.bz2; sha256 = "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; @@ -901,7 +901,7 @@ let name = "libxkbfile-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/libxkbfile-1.0.8.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2; sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca"; }; buildInputs = [pkgconfig kbproto libX11 ]; @@ -921,7 +921,7 @@ let name = "luit-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/luit-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2; sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h"; }; buildInputs = [pkgconfig libfontenc ]; @@ -931,7 +931,7 @@ let name = "makedepend-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/makedepend-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2; sha256 = "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"; }; buildInputs = [pkgconfig xproto ]; @@ -941,7 +941,7 @@ let name = "mkfontdir-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/mkfontdir-1.0.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2; sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"; }; buildInputs = [pkgconfig ]; @@ -951,18 +951,18 @@ let name = "mkfontscale-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/mkfontscale-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2; sha256 = "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { - name = "pixman-0.24.4"; + name = "pixman-0.26.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/pixman-0.24.4.tar.bz2; - sha256 = "1d9vl8kd10nn6bzzgl8xhpdpd0djh4p5x0y8pn1ab0lyld53hjsz"; + url = mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2; + sha256 = "0z34jb75wpbyj3gxn34icd8j81fk5d6s6qnwp2ncz7m8icf6afqr"; }; buildInputs = [pkgconfig libpng perl ]; })) // {inherit libpng perl ;}; @@ -981,7 +981,7 @@ let name = "randrproto-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/randrproto-1.3.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2; sha256 = "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"; }; buildInputs = [pkgconfig ]; @@ -991,7 +991,7 @@ let name = "recordproto-1.14.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/recordproto-1.14.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2; sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7"; }; buildInputs = [pkgconfig ]; @@ -1001,7 +1001,7 @@ let name = "renderproto-0.11.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/renderproto-0.11.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2; sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6"; }; buildInputs = [pkgconfig ]; @@ -1011,7 +1011,7 @@ let name = "resourceproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/resourceproto-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2; sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw"; }; buildInputs = [pkgconfig ]; @@ -1021,7 +1021,7 @@ let name = "scrnsaverproto-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/scrnsaverproto-1.2.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2; sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb"; }; buildInputs = [pkgconfig ]; @@ -1031,7 +1031,7 @@ let name = "sessreg-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/sessreg-1.0.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2; sha256 = "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"; }; buildInputs = [pkgconfig xproto ]; @@ -1041,7 +1041,7 @@ let name = "setxkbmap-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/setxkbmap-1.3.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2; sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; @@ -1051,7 +1051,7 @@ let name = "smproxy-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/smproxy-1.0.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2; sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67"; }; buildInputs = [pkgconfig libICE libSM libXmu libXt ]; @@ -1071,7 +1071,7 @@ let name = "util-macros-1.17"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/util-macros-1.17.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2; sha256 = "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"; }; buildInputs = [pkgconfig ]; @@ -1081,7 +1081,7 @@ let name = "videoproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/videoproto-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2; sha256 = "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"; }; buildInputs = [pkgconfig ]; @@ -1091,7 +1091,7 @@ let name = "windowswmproto-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/windowswmproto-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2; sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0"; }; buildInputs = [pkgconfig ]; @@ -1101,7 +1101,7 @@ let name = "x11perf-1.5.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/x11perf-1.5.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2; sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4"; }; buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ]; @@ -1111,7 +1111,7 @@ let name = "xauth-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xauth-1.0.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2; sha256 = "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4"; }; buildInputs = [pkgconfig libX11 libXau libXext libXmu ]; @@ -1121,7 +1121,7 @@ let name = "xbacklight-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xbacklight-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xbacklight-1.1.2.tar.bz2; sha256 = "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg"; }; buildInputs = [pkgconfig libX11 libXrandr ]; @@ -1131,7 +1131,7 @@ let name = "xbitmaps-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xbitmaps-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2; sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n"; }; buildInputs = [pkgconfig ]; @@ -1141,38 +1141,38 @@ let name = "xcb-proto-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xcb-proto-1.7.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2; sha256 = "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"; }; buildInputs = [pkgconfig python ]; })) // {inherit python ;}; xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) { - name = "xcb-util-0.3.8"; + name = "xcb-util-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2; - sha256 = "1fa7njhg7dsqbrkwrzbkfszdp1dmggvlsrb05qshkg2h8wldkvn1"; + url = mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2; + sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) { - name = "xcb-util-image-0.3.8"; + name = "xcb-util-image-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2; - sha256 = "1nd67105lb8qfa7r2lli5sxnipi1p1wnbwa04l9k30kfq8l0afa0"; + url = mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2; + sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk"; }; buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ]; })) // {inherit gperf m4 libxcb xcbutil xproto ;}; xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) { - name = "xcb-util-keysyms-0.3.8"; + name = "xcb-util-keysyms-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2; - sha256 = "08b1d19gaqv3agpkvh5mgcir11vjy89ywdknva0cb073mzvk4gci"; + url = mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2; + sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; @@ -1188,11 +1188,11 @@ let })) // {inherit gperf m4 libxcb xproto ;}; xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) { - name = "xcb-util-wm-0.3.8"; + name = "xcb-util-wm-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2; - sha256 = "01shwv13rfcxycrsla6c5xlrk1qska7kvvj10n7jcibx9jzanmy5"; + url = mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2; + sha256 = "0c30fj33gvwzwhyz1dhsfwni0ai16bxpvxb4l6c6s7vvj7drp3q3"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; })) // {inherit gperf m4 libxcb xproto ;}; @@ -1211,7 +1211,7 @@ let name = "xcmiscproto-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xcmiscproto-1.2.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2; sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi"; }; buildInputs = [pkgconfig ]; @@ -1221,7 +1221,7 @@ let name = "xcmsdb-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xcmsdb-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2; sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74"; }; buildInputs = [pkgconfig libX11 ]; @@ -1231,7 +1231,7 @@ let name = "xcursorgen-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xcursorgen-1.0.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2; sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw"; }; buildInputs = [pkgconfig libpng libX11 libXcursor ]; @@ -1241,7 +1241,7 @@ let name = "xcursor-themes-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xcursor-themes-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2; sha256 = "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"; }; buildInputs = [pkgconfig libXcursor ]; @@ -1261,7 +1261,7 @@ let name = "xdpyinfo-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xdpyinfo-1.3.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2; sha256 = "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3"; }; buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; @@ -1271,7 +1271,7 @@ let name = "xdriinfo-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xdriinfo-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2; sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim"; }; buildInputs = [pkgconfig glproto libX11 ]; @@ -1281,7 +1281,7 @@ let name = "xev-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xev-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2; sha256 = "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip"; }; buildInputs = [pkgconfig libX11 xproto libXrandr ]; @@ -1291,7 +1291,7 @@ let name = "xextproto-7.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xextproto-7.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2; sha256 = "06kdanbnprxvgl56l5h0lqj4b0f1fbb1ndha33mv5wvy802v2lvw"; }; buildInputs = [pkgconfig ]; @@ -1311,7 +1311,7 @@ let name = "xf86bigfontproto-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86bigfontproto-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2; sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms"; }; buildInputs = [pkgconfig ]; @@ -1321,7 +1321,7 @@ let name = "xf86dgaproto-2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86dgaproto-2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2; sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc"; }; buildInputs = [pkgconfig ]; @@ -1331,7 +1331,7 @@ let name = "xf86driproto-2.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86driproto-2.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2; sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww"; }; buildInputs = [pkgconfig ]; @@ -1341,7 +1341,7 @@ let name = "xf86-input-evdev-2.7.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-evdev-2.7.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-2.7.0.tar.bz2; sha256 = "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; @@ -1351,7 +1351,7 @@ let name = "xf86-input-joystick-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-joystick-1.6.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2; sha256 = "1xgpkdmfw4ahjlva97gs9sllzw8nlpa8mxj59g28fxhak67mvv8x"; }; buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ]; @@ -1361,7 +1361,7 @@ let name = "xf86-input-keyboard-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-keyboard-1.6.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2; sha256 = "1hwc1bjw5mxv186xbrxiky0agfglwqg8fsxqdh4br1vzgxpck7ma"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; @@ -1371,18 +1371,18 @@ let name = "xf86-input-mouse-1.7.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-mouse-1.7.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2; sha256 = "0fs1lwnycyv3d0m6l2wrnlgvbs8qw66d93hwlnmrsswfq5bp6ark"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.5.99.902"; + name = "xf86-input-synaptics-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-synaptics-1.5.99.902.tar.bz2; - sha256 = "0sz3ipjpm6iwqd2g8kx0nwymxwg2plys7lk38ks5py4cd49gj0vc"; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-1.6.1.tar.bz2; + sha256 = "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1391,7 +1391,7 @@ let name = "xf86-input-vmmouse-12.8.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2; sha256 = "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; @@ -1401,7 +1401,7 @@ let name = "xf86-input-void-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-void-1.4.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2; sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a"; }; buildInputs = [pkgconfig xorgserver xproto ]; @@ -1421,7 +1421,7 @@ let name = "xf86-video-ark-0.7.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ark-0.7.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2; sha256 = "194zc35ivfh3vcxcilf9nbi88c2di8kbh84x535cljlpiajdnk5x"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; @@ -1431,7 +1431,7 @@ let name = "xf86-video-ast-0.93.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ast-0.93.10.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2; sha256 = "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; @@ -1441,7 +1441,7 @@ let name = "xf86-video-ati-6.14.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ati-6.14.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-ati-6.14.4.tar.bz2; sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; @@ -1451,7 +1451,7 @@ let name = "xf86-video-cirrus-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-cirrus-1.4.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-1.4.0.tar.bz2; sha256 = "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; @@ -1461,7 +1461,7 @@ let name = "xf86-video-dummy-0.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-dummy-0.3.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2; sha256 = "0pyr50kqh7g84r4p0x09ay5kxax20dip9sh8h3cbd4xv8cswdbfm"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; @@ -1471,7 +1471,7 @@ let name = "xf86-video-fbdev-0.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-fbdev-0.4.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-0.4.2.tar.bz2; sha256 = "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; @@ -1481,7 +1481,7 @@ let name = "xf86-video-geode-2.11.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-geode-2.11.13.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2; sha256 = "09p2cjd2fb7h32k9qs4wp7qvhfn2zv454spv5mfplv7w2jis4863"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; @@ -1491,7 +1491,7 @@ let name = "xf86-video-glide-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glide-1.2.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2; sha256 = "0byapm9mnpqk3wijfnnan3d22ii5cw6dmg4xn1625iiz89j5vs1l"; }; buildInputs = [pkgconfig xextproto xorgserver xproto ]; @@ -1501,7 +1501,7 @@ let name = "xf86-video-glint-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glint-1.2.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2; sha256 = "0nf36jryabpncqq4m6sfsnmzk00f7gvfmjnl8l8sfy7w6sa6iacs"; }; buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; @@ -1511,18 +1511,18 @@ let name = "xf86-video-i128-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-i128-1.3.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2; sha256 = "1sik8ck410hb2885vy7rlc590hw5br8lr2fzxgmv55jyawgfpv9y"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.18.0"; + name = "xf86-video-intel-2.19.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-intel-2.18.0.tar.bz2; - sha256 = "1z4z0dq9abrbqk8mdzhdcwjwbm7dv3gnhrqy3vpkknpsrhrkxrnw"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-intel-2.19.0.tar.bz2; + sha256 = "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; @@ -1551,7 +1551,7 @@ let name = "xf86-video-mach64-6.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mach64-6.9.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2; sha256 = "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; @@ -1561,7 +1561,7 @@ let name = "xf86-video-mga-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mga-1.5.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2; sha256 = "03l3wz5kz0hmxmzqqbkgn7pf9d956jlag04rb701a0fr1mw3v66a"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; @@ -1571,18 +1571,18 @@ let name = "xf86-video-neomagic-1.2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-neomagic-1.2.6.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2; sha256 = "124qci48xrk0w2jy91n7vqs7s6q397zyiqqszhmkx6ld7six57mi"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) { - name = "xf86-video-newport-0.2.3"; + name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-newport-0.2.3.tar.bz2; - sha256 = "0w02rz49gipnfl33vak3zgis8bh9i0v5ykyj8qh9vzddjm7ypjp6"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2; + sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; @@ -1591,18 +1591,18 @@ let name = "xf86-video-nv-2.1.18"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-nv-2.1.18.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-nv-2.1.18.tar.bz2; sha256 = "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { - name = "xf86-video-openchrome-0.2.905"; + name = "xf86-video-openchrome-0.2.906"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-openchrome-0.2.905.tar.bz2; - sha256 = "1llbm020s0fck9chs0906xz7jr4h3whxan4s10ls9046g7xib3qc"; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2; + sha256 = "0hgzn1r7ig94xbr9dvq0bp1nxqlfp2ki8823jca3f22a2kf8wmg7"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; @@ -1611,7 +1611,7 @@ let name = "xf86-video-r128-6.8.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-r128-6.8.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2; sha256 = "1c84x40k9qz9dnf5qs6nnjcgz7px6mpc3rbk8mj62zhp7mf16hbv"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; @@ -1621,7 +1621,7 @@ let name = "xf86-video-savage-2.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-savage-2.3.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2; sha256 = "0jdy4wv3k3ylx3lajjcbsg37z2hf6366a1jvv16sv1ln6dk6lris"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; @@ -1631,7 +1631,7 @@ let name = "xf86-video-siliconmotion-1.7.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2; sha256 = "01sdl6ky1vmvmfgx2d44i35rqafi0z07xdy40cvindcr2k91p7x5"; }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; @@ -1641,7 +1641,7 @@ let name = "xf86-video-sis-0.10.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sis-0.10.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2; sha256 = "03diq0l93lfsipmwkpdb2ysgbxxryl6yakpghzc3fksjxa01112f"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; @@ -1651,7 +1651,7 @@ let name = "xf86-video-suncg6-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2; sha256 = "07w0hm63fiy5l3cpcjsl0ig8z84z9r36xm0cmnpiv3g75dy6q8fi"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; @@ -1661,7 +1661,7 @@ let name = "xf86-video-sunffb-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2; sha256 = "04byax4sc1fn183vyyq0q11q730k16h2by4ggjky7s36wgv7ldzx"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ]; @@ -1671,7 +1671,7 @@ let name = "xf86-video-tdfx-1.4.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tdfx-1.4.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2; sha256 = "124gsi30rj547jjd7gvv7xykfnwlyrxw0gcacamby7pvl3g33fg0"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; @@ -1681,7 +1681,7 @@ let name = "xf86-video-tga-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tga-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2; sha256 = "0mdqrn02zzkdnmhg4vh9djaawg6b2p82g5qbj66z8b30yr77b93h"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; @@ -1691,7 +1691,7 @@ let name = "xf86-video-trident-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-trident-1.3.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2; sha256 = "02y5pzdp0a1c12jr8gghbrzgbyfbgq67x7kd7n4f323pmf8x1csb"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; @@ -1701,7 +1701,7 @@ let name = "xf86-video-v4l-0.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-v4l-0.2.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2; sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb"; }; buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ]; @@ -1711,7 +1711,7 @@ let name = "xf86-video-vesa-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vesa-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-2.3.1.tar.bz2; sha256 = "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; @@ -1721,7 +1721,7 @@ let name = "xf86-video-vmware-12.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vmware-12.0.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2; sha256 = "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; @@ -1731,7 +1731,7 @@ let name = "xf86-video-voodoo-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-voodoo-1.2.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2; sha256 = "0ha748yz92yzn6hp2rhin3il8f4j2rs4vkgdvqkagnv1ryxkh0ph"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ]; @@ -1741,7 +1741,7 @@ let name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; buildInputs = [pkgconfig xorgserver xproto ]; @@ -1751,7 +1751,7 @@ let name = "xf86vidmodeproto-2.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2; sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5"; }; buildInputs = [pkgconfig ]; @@ -1771,7 +1771,7 @@ let name = "xgamma-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xgamma-1.0.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2; sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3"; }; buildInputs = [pkgconfig libX11 libXxf86vm ]; @@ -1781,7 +1781,7 @@ let name = "xhost-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xhost-1.0.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2; sha256 = "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18"; }; buildInputs = [pkgconfig libX11 libXau libXmu ]; @@ -1791,28 +1791,28 @@ let name = "xineramaproto-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xineramaproto-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2; sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) { - name = "xinit-1.3.0"; + name = "xinit-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.3.0.tar.bz2; - sha256 = "0k70bw6x2zgvmd0l7xyzbps18pbzfz26yzjva1vcz9s239pf6xms"; + url = mirror://xorg/individual/app/xinit-1.3.2.tar.bz2; + sha256 = "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) { - name = "xinput-1.5.99.1"; + name = "xinput-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xinput-1.5.99.1.tar.bz2; - sha256 = "0ldrhzrmphygsrdngv6ibxykvg85c55shyg7kywg86a1l0s5cijf"; + url = mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2; + sha256 = "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a"; }; buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ]; })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; @@ -1821,7 +1821,7 @@ let name = "xkbcomp-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xkbcomp-1.2.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2; sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i"; }; buildInputs = [pkgconfig libX11 libxkbfile xproto ]; @@ -1831,7 +1831,7 @@ let name = "xkbevd-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xkbevd-1.1.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2; sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm"; }; buildInputs = [pkgconfig libX11 libxkbfile ]; @@ -1841,18 +1841,18 @@ let name = "xkbutils-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xkbutils-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2; sha256 = "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4"; }; buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; })) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) { - name = "xkeyboard-config-2.5.1"; + name = "xkeyboard-config-2.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xkeyboard-config-2.5.1.tar.bz2; - sha256 = "14ncsbzi8l1dw0ypd36az9kxvrsqfspl3w51zj5p52f373ffi07b"; + url = mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2; + sha256 = "1nmb7ma8rqryicc5xqrn2hm5pwp5lkf7nj28bwbf63mz2r0mk892"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1861,7 +1861,7 @@ let name = "xkill-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xkill-1.0.3.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2; sha256 = "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx"; }; buildInputs = [pkgconfig libX11 libXmu ]; @@ -1871,7 +1871,7 @@ let name = "xlsatoms-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xlsatoms-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2; sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv"; }; buildInputs = [pkgconfig libxcb ]; @@ -1881,7 +1881,7 @@ let name = "xlsclients-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xlsclients-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2; sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"; }; buildInputs = [pkgconfig libxcb ]; @@ -1898,11 +1898,11 @@ let })) // {inherit libXaw libXt ;}; xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) { - name = "xmodmap-1.0.6"; + name = "xmodmap-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xmodmap-1.0.6.tar.bz2; - sha256 = "0p9skymavb0pi8jiylwwkdvp9r8say1hl903kcwpr1qiifagr2y5"; + url = mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2; + sha256 = "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg"; }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; @@ -1918,31 +1918,31 @@ let })) // {inherit ;}; xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) { - name = "xorg-docs-1.6.99.901"; + name = "xorg-docs-1.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-docs-1.6.99.901.tar.bz2; - sha256 = "0f0kk6za1k4nn1xycmd6hx85rf8mgzdk098f6phl3x2xfax6r43b"; + url = mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2; + sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.12.1"; + name = "xorg-server-1.12.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-server-1.12.1.tar.bz2; - sha256 = "0nml86yvvik7a90wpyr08jkjiydzs26wg119hzwmr5v7qzdc27fj"; + url = mirror://xorg/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2; + sha256 = "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { - name = "xorg-sgml-doctools-1.10.99.901"; + name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xorg-sgml-doctools-1.10.99.901.tar.bz2; - sha256 = "014ny4z5i69ang0yygvk7yiqb3m4bhmr05qvh2xmi0y0y61nlrjp"; + url = mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2; + sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1951,7 +1951,7 @@ let name = "xpr-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xpr-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2; sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy"; }; buildInputs = [pkgconfig libX11 libXmu xproto ]; @@ -1961,7 +1961,7 @@ let name = "xprop-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xprop-1.2.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2; sha256 = "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407"; }; buildInputs = [pkgconfig libX11 xproto ]; @@ -1971,7 +1971,7 @@ let name = "xproto-7.0.23"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xproto-7.0.23.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2; sha256 = "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d"; }; buildInputs = [pkgconfig ]; @@ -1981,7 +1981,7 @@ let name = "xrandr-1.3.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xrandr-1.3.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2; sha256 = "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h"; }; buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; @@ -1991,7 +1991,7 @@ let name = "xrdb-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xrdb-1.0.9.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2; sha256 = "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934"; }; buildInputs = [pkgconfig libX11 libXmu ]; @@ -2001,7 +2001,7 @@ let name = "xrefresh-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xrefresh-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2; sha256 = "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"; }; buildInputs = [pkgconfig libX11 ]; @@ -2011,7 +2011,7 @@ let name = "xset-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xset-1.2.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2; sha256 = "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"; }; buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ]; @@ -2021,7 +2021,7 @@ let name = "xsetroot-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xsetroot-1.1.0.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2; sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8"; }; buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ]; @@ -2031,7 +2031,7 @@ let name = "xtrans-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xtrans-1.2.7.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2; sha256 = "19p1bw3qyn0ia1znx6q3gx92rr9rl88ylrfijjclm8vhpa8i30bz"; }; buildInputs = [pkgconfig ]; @@ -2041,7 +2041,7 @@ let name = "xvinfo-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xvinfo-1.1.1.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2; sha256 = "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0"; }; buildInputs = [pkgconfig libX11 libXv ]; @@ -2051,7 +2051,7 @@ let name = "xwd-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xwd-1.0.5.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2; sha256 = "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82"; }; buildInputs = [pkgconfig libX11 xproto ]; @@ -2061,7 +2061,7 @@ let name = "xwininfo-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xwininfo-1.1.2.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2; sha256 = "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg"; }; buildInputs = [pkgconfig libX11 libxcb xproto ]; @@ -2071,7 +2071,7 @@ let name = "xwud-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7-RC1/src/everything/xwud-1.0.4.tar.bz2; + url = mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2; sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn"; }; buildInputs = [pkgconfig libX11 xproto ]; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 2763291d92f..3af867171ef 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,8 @@ mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 -mirror://xorg/individual/lib/pixman-0.24.4.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-0.3.8.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-image-0.3.8.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.8.tar.bz2 +mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 -mirror://xorg/individual/xcb/xcb-util-wm-0.3.8.tar.bz2 +mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2 diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 67a1e710a1b..94fae784488 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -3,7 +3,7 @@ mirror://xorg/individual/app/xclock-1.0.6.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 mirror://xorg/individual/app/xfs-1.1.2.tar.bz2 -mirror://xorg/individual/app/xinit-1.3.0.tar.bz2 +mirror://xorg/individual/app/xinit-1.3.2.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list b/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list deleted file mode 100644 index e7ad33b2971..00000000000 --- a/pkgs/servers/x11/xorg/tarballs-7.7-rc1.list +++ /dev/null @@ -1,184 +0,0 @@ -mirror://xorg/X11R7.7-RC1/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/bdftopcf-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/bigreqsproto-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/compositeproto-0.4.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/damageproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/dmxproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/dri2proto-2.6.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/encodings-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/fixesproto-5.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-alias-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-arabic-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bh-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bh-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bh-ttf-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bh-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-bitstream-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-cursor-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-daewoo-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-dec-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-ibm-type1-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-isas-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-jis-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-micro-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-misc-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-misc-ethiopic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-misc-meltho-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-misc-misc-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-mutt-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-schumacher-misc-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/fontsproto-2.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-sun-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-util-1.3.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/font-xfree86-type1-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/glproto-1.4.15.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/iceauth-1.0.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/inputproto-2.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/kbproto-1.0.6.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libAppleWM-1.4.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libdmx-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libfontenc-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libFS-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libICE-1.0.8.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libpciaccess-0.13.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libpthread-stubs-0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libSM-1.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libX11-1.4.99.901.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXau-1.0.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXaw-1.0.10.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libxcb-1.8.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXcomposite-0.4.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXcursor-1.1.13.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXdamage-1.1.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXdmcp-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXext-1.3.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXfixes-5.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXfont-1.4.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXft-2.3.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXi-1.6.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXinerama-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libxkbfile-1.0.8.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXmu-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXpm-3.5.10.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXrandr-1.3.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXrender-0.9.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXres-1.0.6.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXScrnSaver-1.2.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXt-1.1.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXtst-1.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXv-1.0.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXvMC-1.0.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXxf86dga-1.1.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/libXxf86vm-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/luit-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/makedepend-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/mkfontscale-1.1.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/randrproto-1.3.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/recordproto-1.14.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/renderproto-0.11.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/resourceproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/sessreg-1.0.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/setxkbmap-1.3.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/smproxy-1.0.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/util-macros-1.17.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/videoproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/windowswmproto-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/x11perf-1.5.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xauth-1.0.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xbacklight-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xbitmaps-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xcb-proto-1.7.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xcmiscproto-1.2.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xcmsdb-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xcursorgen-1.0.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xcursor-themes-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xdpyinfo-1.3.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xdriinfo-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xev-1.2.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xextproto-7.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86bigfontproto-1.2.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86dgaproto-2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-evdev-2.7.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-joystick-1.6.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-mouse-1.7.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-synaptics-1.5.99.902.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-input-void-1.4.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ark-0.7.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ast-0.93.10.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-ati-6.14.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-cirrus-1.4.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-dummy-0.3.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-fbdev-0.4.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-geode-2.11.13.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glide-1.2.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-glint-1.2.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-i128-1.3.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-intel-2.18.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mach64-6.9.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-mga-1.5.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-neomagic-1.2.6.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-newport-0.2.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-nv-2.1.18.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-openchrome-0.2.905.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-r128-6.8.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-savage-2.3.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sis-0.10.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tdfx-1.4.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-tga-1.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-trident-1.3.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vesa-2.3.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-vmware-12.0.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xgamma-1.0.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xhost-1.0.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xineramaproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xinput-1.5.99.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xkbcomp-1.2.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xkbevd-1.1.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xkbutils-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xkeyboard-config-2.5.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xkill-1.0.3.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xlsatoms-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xlsclients-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xmodmap-1.0.6.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xorg-docs-1.6.99.901.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xorg-server-1.12.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xorg-sgml-doctools-1.10.99.901.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xpr-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xprop-1.2.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xproto-7.0.23.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xrandr-1.3.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xrdb-1.0.9.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xrefresh-1.0.4.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xset-1.2.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xsetroot-1.1.0.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xtrans-1.2.7.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xvinfo-1.1.1.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xwd-1.0.5.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xwininfo-1.1.2.tar.bz2 -mirror://xorg/X11R7.7-RC1/src/everything/xwud-1.0.4.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list new file mode 100644 index 00000000000..861b88e9daf --- /dev/null +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -0,0 +1,184 @@ +mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/dri2proto-2.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-type1-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-alias-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-arabic-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bh-ttf-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bh-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bitstream-100dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bitstream-75dpi-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-bitstream-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-cronyx-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-cursor-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-daewoo-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-dec-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-ibm-type1-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-isas-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-jis-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-micro-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-misc-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-misc-ethiopic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-misc-meltho-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/glproto-1.4.15.tar.bz2 +mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libpthread-stubs-0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libxcb-1.8.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXrandr-1.3.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2 +mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xbacklight-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-2.7.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-1.6.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-ati-6.14.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-1.4.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-0.4.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-intel-2.19.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-nv-2.1.18.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-siliconmotion-1.7.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-sis-0.10.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-suncg6-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-sunffb-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-2.3.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xkeyboard-config-2.6.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xtrans-1.2.7.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2 +mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 -- GitLab From bb469d5e2545616f8f92dd9ced78efe723ceba07 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 15:03:36 -0400 Subject: [PATCH 0024/5607] xorgserver: Update dir path patch --- .../x11/xorg/xorgserver-dri-path.patch | 57 ++++--------------- 1 file changed, 12 insertions(+), 45 deletions(-) diff --git a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch index 30e423ba3cb..3a5f061eb9a 100644 --- a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch +++ b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch @@ -1,52 +1,19 @@ -diff --git a/glx/glxdri.c b/glx/glxdri.c -index 6122653..3f5fc2b 100644 ---- a/glx/glxdri.c -+++ b/glx/glxdri.c -@@ -1042,8 +1042,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - goto handle_error; - } +diff -Naur xorg-server-1.12.2-orig/glx/glxdricommon.c xorg-server-1.12.2/glx/glxdricommon.c +--- xorg-server-1.12.2-orig/glx/glxdricommon.c 2012-05-17 13:09:02.000000000 -0400 ++++ xorg-server-1.12.2/glx/glxdricommon.c 2012-07-14 14:57:37.972791909 -0400 +@@ -219,10 +219,14 @@ + int i; + void *driver; + char filename[PATH_MAX]; ++ char *real_dri_driver_path; + const __DRIextension **extensions; -+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH"); ++ real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH"); + if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path; + snprintf(filename, sizeof filename, "%s/%s_dri.so", - dri_driver_path, driverName); + real_dri_driver_path, driverName); - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { -diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index ed7fb4c..135b1c8 100644 ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -617,8 +617,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - __glXInitExtensionEnableBits(screen->glx_enable_bits); - -- snprintf(filename, sizeof filename, -- "%s/%s_dri.so", dri_driver_path, driverName); -+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH"); -+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path; -+ -+ snprintf(filename, sizeof filename, "%s/%s_dri.so", -+ real_dri_driver_path, driverName); - - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { -diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c -index 44f658f..8922414 100644 ---- a/glx/glxdriswrast.c -+++ b/glx/glxdriswrast.c -@@ -458,8 +458,11 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - screen->base.swapInterval = NULL; - screen->base.pScreen = pScreen; - -+ char *real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH"); -+ if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path; -+ - snprintf(filename, sizeof filename, -- "%s/%s_dri.so", dri_driver_path, driverName); -+ "%s/%s_dri.so", real_dri_driver_path, driverName); - - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { + driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + if (driver == NULL) { -- GitLab From 13c5b75b802292a5aa26482bf1b51cd6caae43e2 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 15:07:36 -0400 Subject: [PATCH 0025/5607] xorgserver: Add needed deps --- pkgs/servers/x11/xorg/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c46c7c830ac..e184536105b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -176,6 +176,7 @@ in xorg.xineramaproto xorg.xf86dgaproto xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont + xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto -- GitLab From d6d6b623c9b00c749067fd050b8e0426bc6fab8a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 15:13:08 -0400 Subject: [PATCH 0026/5607] xorgserver: Update xkbcomp-path patch _XkbDupString was migrated to Xstrdup --- pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch index 825d09ba1e0..f5196c60c7c 100644 --- a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch +++ b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch @@ -9,7 +9,7 @@ diff -rc xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c xorg-server-X11R7.2-1.2.0/ } + char *xkbBinDir = getenv("XKB_BINDIR"); + if (xkbBinDir) -+ XkbBinDirectory = _XkbDupString(xkbBinDir); ++ XkbBinDirectory = Xstrdup(xkbBinDir); return 0; } -- GitLab From fdf6f17a1b58faaadf5be092658cb7debd2fe9ab Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 16:16:31 -0400 Subject: [PATCH 0027/5607] x11: Some fonts need mkfontscale There may be others, these are just the ones that needed it for my configuration to build --- pkgs/servers/x11/xorg/overrides.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e184536105b..0a4d8d30753 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -8,7 +8,33 @@ let in { + fontadobe75dpi = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; + + fontadobe100dpi = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; + + fontbh100dpi = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; + + fontbhlucidatypewriter75dpi = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; + + fontbhlucidatypewriter100dpi = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; + + fontcursormisc = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; + fontmiscmisc = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + postInstall = '' ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias -- GitLab From 65ac9694c723fdc34f0402e02bd26b2edebb200f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 16:26:22 -0400 Subject: [PATCH 0028/5607] xorg: evdev and fbdev need pixman --- pkgs/servers/x11/xorg/overrides.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 0a4d8d30753..4492ea84afa 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -152,7 +152,8 @@ in xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; - buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto]; + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto xorg.pixman]; installFlags = "sdkdir=\${out}/include/xorg"; }; @@ -172,6 +173,11 @@ in buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; + xf86videofbdev = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + xf86videoopenchrome = attrs: attrs // rec { name = "xf86-video-openchrome-0.2.905"; src = args.fetchurl { -- GitLab From a47ba7a6f7b19cda1e013405c8e95f25cba45f76 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 16:32:20 -0400 Subject: [PATCH 0029/5607] xf86-input-mtrack: Update, use pixman --- pkgs/os-specific/linux/xf86-input-mtrack/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix index 405f722f70f..4f74ce57ea8 100644 --- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix +++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix @@ -10,10 +10,11 @@ , xorgserver , xproto , inputproto +, pixman }: stdenv.mkDerivation { - name = "xf86-input-mtrack-0.2.0"; + name = "xf86-input-mtrack-0.3.0"; preConfigure = "autoreconf -vfi"; @@ -27,12 +28,15 @@ stdenv.mkDerivation { xorgserver xproto inputproto + pixman ]; + CFLAGS = "-I${pixman}/include/pixman-1"; + src = fetchurl { name = "xf86-input-mtrack.tar.gz"; - url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.2.0"; - sha256 = "1zvd68dxpjn44ys7ysi3yc95xdjw1rz0s3xwlh3fzpw1ib3wrr3x"; + url = "https://github.com/BlueDragonX/xf86-input-mtrack/tarball/v0.3.0"; + sha256 = "174rdw7gv0wsnjgmwpx4pgjn1zfbylflda4k2dzff6phzxj9yl6v"; }; meta = { @@ -45,3 +49,4 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } + -- GitLab From e821297f820f515e8b6697f40ce26101967269fb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 23:09:14 -0400 Subject: [PATCH 0030/5607] qt-4.8: Patch to build with glib-2.32 --- .../libraries/qt-4.x/4.8/default.nix | 2 +- .../libraries/qt-4.x/4.8/glib-2.32.patch | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index f56886259a6..59761e5cf1d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj"; }; - patches = [ ( substituteAll { + patches = [ ./glib-2.32.patch ( substituteAll { src = ./dlopen-absolute-paths.diff; inherit cups icu libXfixes; glibc = stdenv.gcc.libc; diff --git a/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch b/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch new file mode 100644 index 00000000000..f92d3430514 --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch @@ -0,0 +1,24 @@ +diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +--- qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-04-26 15:46:22.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-07-14 22:47:02.145152876 -0400 +@@ -89,7 +89,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + +diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +--- qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2012-04-26 15:46:14.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2012-07-14 22:46:24.671138454 -0400 +@@ -52,7 +52,7 @@ + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; -- GitLab From e873877e426f8d7334084aca94517c5c59ca305f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Jul 2012 23:17:18 -0400 Subject: [PATCH 0031/5607] glib: update to 2.32.4 --- pkgs/development/libraries/glib/2.32.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/2.32.x.nix b/pkgs/development/libraries/glib/2.32.x.nix index 10e675e18af..40e0b81cb93 100644 --- a/pkgs/development/libraries/glib/2.32.x.nix +++ b/pkgs/development/libraries/glib/2.32.x.nix @@ -12,11 +12,11 @@ # $out/bin/gtester-report' to postInstall if this is solved stdenv.mkDerivation rec { - name = "glib-2.32.3"; + name = "glib-2.32.4"; src = fetchurl { url = "mirror://gnome/sources/glib/2.32/${name}.tar.xz"; - sha256 = "b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d"; + sha256 = "1qpscyqi2kfskdqfzm5gp04wilcx979gq34cbabvcbx2znj45mx5"; }; # configure script looks for d-bus but it is only needed for tests -- GitLab From 1a0baad6b20d36c6bd80799a3f6bc4529e236f4f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 03:32:50 -0400 Subject: [PATCH 0032/5607] Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh --- pkgs/applications/editors/monodevelop/default.nix | 6 ++---- pkgs/applications/editors/monodoc/default.nix | 6 ++---- pkgs/applications/graphics/f-spot/default.nix | 4 +++- pkgs/applications/video/RealPlayer/default.nix | 6 ++---- pkgs/misc/maven/maven-1.0.nix | 5 ++--- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index e4dc00ff0a1..c823ecfdf83 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -2,7 +2,7 @@ , gtkmozembedsharp, monodoc , perl, perlXMLParser, pkgconfig , glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome -, mozilla +, mozilla, makeWrapper }: stdenv.mkDerivation { @@ -14,8 +14,6 @@ stdenv.mkDerivation { md5 = "8c33df5629b0676b7ab552854c1de6fd"; }; - makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; - patches = [./prefix.patch]; buildInputs = [ @@ -24,5 +22,5 @@ stdenv.mkDerivation { gtkmozembedsharp monodoc ]; - inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp; + inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper; } diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix index db8b2e47884..8f6b6d6024c 100644 --- a/pkgs/applications/editors/monodoc/default.nix +++ b/pkgs/applications/editors/monodoc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mono, gtksharp, pkgconfig}: +{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}: stdenv.mkDerivation { name = "monodoc-1.0.6"; @@ -9,9 +9,7 @@ stdenv.mkDerivation { md5 = "f2fc27e8e4717d90dc7efa2450625693"; }; - makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; - buildInputs = [mono gtksharp pkgconfig]; - inherit gtksharp; + inherit gtksharp makeWrapper; } diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix index 17a3cd22a5f..856795ea356 100644 --- a/pkgs/applications/graphics/f-spot/default.nix +++ b/pkgs/applications/graphics/f-spot/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif , libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2 , monoDLLFixer +, makeWrapper }: stdenv.mkDerivation { name = "f-spot-0.0.10"; builder = ./builder.sh; - makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; + inherit makeWrapper; + src = fetchurl { url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2; md5 = "19cc6e067ccc261b0502ff6189b79832"; diff --git a/pkgs/applications/video/RealPlayer/default.nix b/pkgs/applications/video/RealPlayer/default.nix index 12d98bc3362..968846f1dcb 100644 --- a/pkgs/applications/video/RealPlayer/default.nix +++ b/pkgs/applications/video/RealPlayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11}: +{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11, makeWrapper}: # Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4. @@ -13,9 +13,7 @@ assert stdenv.system == "i686-linux"; md5 = "d28b31261059231a3e93c7466f8153e6"; }; - makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; - - inherit libstdcpp5; + inherit libstdcpp5 makeWrapper; libPath = [libstdcpp5 glib pango atk gtk libX11]; }) // {mozillaPlugin = "/real/mozilla";} diff --git a/pkgs/misc/maven/maven-1.0.nix b/pkgs/misc/maven/maven-1.0.nix index 2c84b6f006c..48058081f0c 100644 --- a/pkgs/misc/maven/maven-1.0.nix +++ b/pkgs/misc/maven/maven-1.0.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, jdk}: +{stdenv, fetchurl, jdk, makeWrapper}: assert jdk != null; @@ -10,7 +10,6 @@ stdenv.mkDerivation { 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; + inherit jdk makeWrapper; } -- GitLab From f0b7c9813ba98c15bd86bdc78e77d4a6fd58d909 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 03:36:48 -0400 Subject: [PATCH 0033/5607] xorg.ev: Needs libXrender --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4492ea84afa..09b2619597f 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -150,6 +150,10 @@ in buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; }; + xev = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.libXrender ]; + }; + xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; -- GitLab From 3060d2fcf6c309709a285538dabe0b70108d90db Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 03:59:04 -0400 Subject: [PATCH 0034/5607] libgsf: Update, fix test case compilation --- pkgs/development/libraries/libgsf/default.nix | 8 +- .../libraries/libgsf/syscall-name-clash.patch | 120 ++++++++++++++++++ 2 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/libgsf/syscall-name-clash.patch diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 3941fd4d694..0acd4a77b46 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -7,11 +7,11 @@ assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != n && glib != null; stdenv.mkDerivation rec { - name = "libgsf-1.14.22"; + name = "libgsf-1.14.23"; src = fetchurl { - url = mirror://gnome/sources/libgsf/1.14/libgsf-1.14.22.tar.xz; - sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5"; + url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; + sha256 = "05zvaazf0d584nfirwsz7889lbsl4v781hslv3kda6akiwbwdhdz"; }; buildNativeInputs = [ intltool pkgconfig ]; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { doCheck = true; + patches = [ ./syscall-name-clash.patch ]; + meta = { homepage = http://www.gnome.org/projects/libgsf; license = "LGPLv2"; diff --git a/pkgs/development/libraries/libgsf/syscall-name-clash.patch b/pkgs/development/libraries/libgsf/syscall-name-clash.patch new file mode 100644 index 00000000000..01543ade4fd --- /dev/null +++ b/pkgs/development/libraries/libgsf/syscall-name-clash.patch @@ -0,0 +1,120 @@ +diff -Naur libgsf-1.14.23-orig/tests/test-cp-msole.c libgsf-1.14.23/tests/test-cp-msole.c +--- libgsf-1.14.23-orig/tests/test-cp-msole.c 2009-05-18 21:55:48.000000000 -0400 ++++ libgsf-1.14.23/tests/test-cp-msole.c 2012-07-15 03:52:03.858382670 -0400 +@@ -34,7 +34,7 @@ + static void clone_dir (GsfInfile *in, GsfOutfile *out); + + static void +-clone (GsfInput *input, GsfOutput *output) ++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) + { + if (gsf_input_size (input) > 0) { + guint8 const *data; +@@ -87,7 +87,7 @@ + gsf_infile_name_by_index (in, i), + is_dir); + +- clone (new_input, new_output); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (new_input, new_output); + } + /* An observation: when you think about the explanation to is_dir + * above, you realize that clone_dir is called even for regular files. +@@ -137,7 +137,7 @@ + + outfile = gsf_outfile_msole_new (output); + g_object_unref (G_OBJECT (output)); +- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); + + return 0; + } +diff -Naur libgsf-1.14.23-orig/tests/test-cp-zip.c libgsf-1.14.23/tests/test-cp-zip.c +--- libgsf-1.14.23-orig/tests/test-cp-zip.c 2009-05-18 21:55:48.000000000 -0400 ++++ libgsf-1.14.23/tests/test-cp-zip.c 2012-07-15 03:54:53.719198559 -0400 +@@ -32,7 +32,7 @@ + #include + + static void +-clone (GsfInfile *in, GsfOutfile *out) ++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInfile *in, GsfOutfile *out) + { + GsfInput *input = GSF_INPUT (in); + GsfOutput *output = GSF_OUTPUT (out); +@@ -85,7 +85,7 @@ + output = gsf_outfile_new_child_full (out, name, is_dir, + "compression-level", level, + NULL); +- clone (GSF_INFILE (input), GSF_OUTFILE (output)); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INFILE (input), GSF_OUTFILE (output)); + } + } + gsf_output_close (GSF_OUTPUT (out)); +@@ -137,7 +137,7 @@ + + outfile = gsf_outfile_zip_new (output, &err); + g_object_unref (G_OBJECT (output)); +- clone (infile, outfile); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (infile, outfile); + + return 0; + } +diff -Naur libgsf-1.14.23-orig/tests/test-dump-msole.c libgsf-1.14.23/tests/test-dump-msole.c +--- libgsf-1.14.23-orig/tests/test-dump-msole.c 2011-12-07 18:05:18.000000000 -0500 ++++ libgsf-1.14.23/tests/test-dump-msole.c 2012-07-15 03:56:15.581110536 -0400 +@@ -32,7 +32,7 @@ + #include + + static void +-clone (GsfInput *input, GsfOutput *output) ++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) + { + guint8 const *data; + size_t len; +@@ -72,7 +72,7 @@ + dst = gsf_outfile_new_child (out, + gsf_infile_name_by_index (in, i), + is_dir); +- clone (src, dst); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); + } + } + +@@ -118,7 +118,7 @@ + g_error_free (err); + return 1; + } +- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); + + return 0; + } +diff -Naur libgsf-1.14.23-orig/tests/test-restore-msole.c libgsf-1.14.23/tests/test-restore-msole.c +--- libgsf-1.14.23-orig/tests/test-restore-msole.c 2011-12-07 18:05:18.000000000 -0500 ++++ libgsf-1.14.23/tests/test-restore-msole.c 2012-07-15 03:57:39.972017963 -0400 +@@ -32,7 +32,7 @@ + #include + + static void +-clone (GsfInput *input, GsfOutput *output) ++clone_is_a_stupid_name_for_a_function_compiled_on_linux (GsfInput *input, GsfOutput *output) + { + guint8 const *data; + size_t len; +@@ -72,7 +72,7 @@ + dst = gsf_outfile_new_child (out, + gsf_infile_name_by_index (in, i), + is_dir); +- clone (src, dst); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (src, dst); + } + } + +@@ -111,7 +111,7 @@ + + outfile = gsf_outfile_msole_new (output); + g_object_unref (G_OBJECT (output)); +- clone (GSF_INPUT (infile), GSF_OUTPUT (outfile)); ++ clone_is_a_stupid_name_for_a_function_compiled_on_linux (GSF_INPUT (infile), GSF_OUTPUT (outfile)); + + return 0; + } -- GitLab From 15f765cc6ad3c25a110f7b7ccab085cdb8966dbb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 09:55:41 -0400 Subject: [PATCH 0035/5607] awesome: update to 3.4.13 --- pkgs/applications/window-managers/awesome/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 5110e42fb18..960b0bfe31b 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,8 +36,8 @@ 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 @@ -58,3 +58,4 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; }; } + -- GitLab From cea4f23adf60ce1992426af4fd041d5a8d386042 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 09:59:08 -0400 Subject: [PATCH 0036/5607] json-glib: Update to 14.0.2 --- pkgs/development/libraries/json-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index ace271b7a35..ad3af7778ff 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "json-glib"; - major = "0"; minor = "14"; patchlevel = "0"; extension = "xz"; - sha256 = "0mpw996cyidspjwns281l5haj9i8azpkfpl4jf98lh3kcqcr07l2"; + major = "0"; minor = "14"; patchlevel = "2"; extension = "xz"; + sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; }; propagatedBuildInputs = [ glib ]; -- GitLab From 3c6a778b02bf49c0b32c932063667cc99bdb6080 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 11:01:27 -0400 Subject: [PATCH 0037/5607] dia: Fix build with glib-2.32.4 --- pkgs/applications/graphics/dia/default.nix | 2 + .../graphics/dia/glib-top-level-header.patch | 471 ++++++++++++++++++ 2 files changed, 473 insertions(+) create mode 100644 pkgs/applications/graphics/dia/glib-top-level-header.patch diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index f0c666b14ea..7662d64e9de 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; + patches = [ ./glib-top-level-header.patch ]; + meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; diff --git a/pkgs/applications/graphics/dia/glib-top-level-header.patch b/pkgs/applications/graphics/dia/glib-top-level-header.patch new file mode 100644 index 00000000000..80460ae9d72 --- /dev/null +++ b/pkgs/applications/graphics/dia/glib-top-level-header.patch @@ -0,0 +1,471 @@ +diff -Naur dia-0.97.2-orig/app/app_procs.c dia-0.97.2/app/app_procs.c +--- dia-0.97.2-orig/app/app_procs.c 2011-03-20 07:18:13.000000000 -0400 ++++ dia-0.97.2/app/app_procs.c 2012-07-15 10:49:08.192726306 -0400 +@@ -50,7 +50,7 @@ + #include + #include + +-#include ++#include + + #include "intl.h" + #include "app_procs.h" +diff -Naur dia-0.97.2-orig/app/dia-win-remote.c dia-0.97.2/app/dia-win-remote.c +--- dia-0.97.2-orig/app/dia-win-remote.c 2010-08-03 11:35:35.000000000 -0400 ++++ dia-0.97.2/app/dia-win-remote.c 2012-07-15 10:49:08.159726316 -0400 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + + /** + * PROTOTYPES: +diff -Naur dia-0.97.2-orig/app/filedlg.c dia-0.97.2/app/filedlg.c +--- dia-0.97.2-orig/app/filedlg.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/app/filedlg.c 2012-07-15 10:49:08.227726294 -0400 +@@ -28,7 +28,7 @@ + #include + #endif + #include +-#include ++#include + + #undef GTK_DISABLE_DEPRECATED /* gtk_file_chooser_dialog_new_with_backend */ + #include +diff -Naur dia-0.97.2-orig/app/load_save.c dia-0.97.2/app/load_save.c +--- dia-0.97.2-orig/app/load_save.c 2011-09-25 07:55:11.000000000 -0400 ++++ dia-0.97.2/app/load_save.c 2012-07-15 10:49:08.203726303 -0400 +@@ -30,7 +30,7 @@ + #include + + #include +-#include /* g_access() and friends */ ++#include /* g_access() and friends */ + #include + + #ifndef W_OK +diff -Naur dia-0.97.2-orig/app/sheets_dialog_callbacks.c dia-0.97.2/app/sheets_dialog_callbacks.c +--- dia-0.97.2-orig/app/sheets_dialog_callbacks.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/app/sheets_dialog_callbacks.c 2012-07-15 10:49:08.201726302 -0400 +@@ -44,7 +44,7 @@ + #endif + #endif + +-#include ++#include + #include + + #undef GTK_DISABLE_DEPRECATED /* GtkOptionMenu */ +diff -Naur dia-0.97.2-orig/ChangeLog.pre-git dia-0.97.2/ChangeLog.pre-git +--- dia-0.97.2-orig/ChangeLog.pre-git 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/ChangeLog.pre-git 2012-07-15 10:49:08.384726247 -0400 +@@ -4137,7 +4137,7 @@ + plug-ins/vdx/vdx-export.c plug-ins/vdx/vdx-import.c + plug-ins/wmf/wmf.cpp plug-ins/wpg/wpg.c + plug-ins/xfig/xfig-export.c plug-ins/xfig/xfig-import.c +- plug-ins/xslt/xslt.c : use to match GLib's filename ++ plug-ins/xslt/xslt.c : use to match GLib's filename + encoding to the io functions used, that is: g_open, g_fopen, g_stat, + g_unlink, g_mkdir, g_rename (, g_access, g_lstat, g_remove, g_freopen, + g_chdir, g_rmdir). Also replace gzopen() with gzdopen(g_open(), ...) +@@ -5995,7 +5995,7 @@ + Also special case strings starting with \tex - i.e. dont escape them - + to keep the use-case of direct tex input. + +- * lib/debug.c : #include not just ++ * lib/debug.c : #include + + + 2006-01-14 Hans Breuer +@@ -6207,7 +6207,7 @@ + * lib/makefile.msc : build debug.obj + + * plug-ins/makefile.msc : building pgf in the right alphabetical order +- * plug-ins/pgf/render_pgf.c : include ++ * plug-ins/pgf/render_pgf.c : include + + 2005-12-08 Lars Clausen + +diff -Naur dia-0.97.2-orig/lib/debug.c dia-0.97.2/lib/debug.c +--- dia-0.97.2-orig/lib/debug.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/lib/debug.c 2012-07-15 10:49:06.813726730 -0400 +@@ -21,7 +21,7 @@ + #include + + #include +-#include ++#include + #include + + #include "debug.h" +diff -Naur dia-0.97.2-orig/lib/dia_dirs.c dia-0.97.2/lib/dia_dirs.c +--- dia-0.97.2-orig/lib/dia_dirs.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/lib/dia_dirs.c 2012-07-15 10:49:06.740726750 -0400 +@@ -30,7 +30,7 @@ + #include + #include + #endif +-#include ++#include + + /** Get the name of a subdirectory of our data directory. + * This function does not create the subdirectory, just make the correct name. +diff -Naur dia-0.97.2-orig/lib/dia_xml.c dia-0.97.2/lib/dia_xml.c +--- dia-0.97.2-orig/lib/dia_xml.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/lib/dia_xml.c 2012-07-15 10:49:06.770726743 -0400 +@@ -25,7 +25,7 @@ + #include + + #include +-#include ++#include + + #include + #include +diff -Naur dia-0.97.2-orig/objects/custom/shape_typeinfo.c dia-0.97.2/objects/custom/shape_typeinfo.c +--- dia-0.97.2-orig/objects/custom/shape_typeinfo.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/objects/custom/shape_typeinfo.c 2012-07-15 10:49:06.639726783 -0400 +@@ -27,8 +27,8 @@ + #include "custom_util.h" + #include + #include +-#include +-#include ++#include ++#include + #include + + /* +diff -Naur dia-0.97.2-orig/objects/SISSI/sissi.c dia-0.97.2/objects/SISSI/sissi.c +--- dia-0.97.2-orig/objects/SISSI/sissi.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/objects/SISSI/sissi.c 2012-07-15 10:49:06.570726804 -0400 +@@ -42,7 +42,7 @@ + #include "dia_xml_libxml.h" + + #include +-#include ++#include + + #define DEFAULT_WIDTH 1.0 + #define DEFAULT_HEIGHT 1.0 +diff -Naur dia-0.97.2-orig/objects/standard/image.c dia-0.97.2/objects/standard/image.c +--- dia-0.97.2-orig/objects/standard/image.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/objects/standard/image.c 2012-07-15 10:49:06.683726770 -0400 +@@ -25,7 +25,7 @@ + #ifdef HAVE_UNIST_H + #include + #endif +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo.c dia-0.97.2/plug-ins/cairo/diacairo.c +--- dia-0.97.2-orig/plug-ins/cairo/diacairo.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/plug-ins/cairo/diacairo.c 2012-07-15 10:49:06.433726846 -0400 +@@ -28,7 +28,7 @@ + #include + #define G_LOG_DOMAIN "DiaCairo" + #include +-#include ++#include + + /* + * To me the following looks rather suspicious. Why do we need to compile +diff -Naur dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c dia-0.97.2/plug-ins/cairo/diacairo-renderer.c +--- dia-0.97.2-orig/plug-ins/cairo/diacairo-renderer.c 2011-01-07 06:54:21.000000000 -0500 ++++ dia-0.97.2/plug-ins/cairo/diacairo-renderer.c 2012-07-15 10:49:06.435726846 -0400 +@@ -28,7 +28,7 @@ + #include + #define G_LOG_DOMAIN "DiaCairo" + #include +-#include ++#include + + #ifdef HAVE_PANGOCAIRO_H + #include +diff -Naur dia-0.97.2-orig/plug-ins/cgm/cgm.c dia-0.97.2/plug-ins/cgm/cgm.c +--- dia-0.97.2-orig/plug-ins/cgm/cgm.c 2009-12-27 11:22:38.000000000 -0500 ++++ dia-0.97.2/plug-ins/cgm/cgm.c 2012-07-15 10:49:06.425726846 -0400 +@@ -31,7 +31,7 @@ + #include + #include + +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/drs/dia-render-script.c dia-0.97.2/plug-ins/drs/dia-render-script.c +--- dia-0.97.2-orig/plug-ins/drs/dia-render-script.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/plug-ins/drs/dia-render-script.c 2012-07-15 10:49:06.427726848 -0400 +@@ -54,7 +54,7 @@ + + #define G_LOG_DOMAIN "DiaRenderScript" + #include +-#include ++#include + + #include "intl.h" + #include "filter.h" +diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-export.c dia-0.97.2/plug-ins/dxf/dxf-export.c +--- dia-0.97.2-orig/plug-ins/dxf/dxf-export.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/dxf/dxf-export.c 2012-07-15 10:49:06.421726850 -0400 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + + #include "autocad_pal.h" + +diff -Naur dia-0.97.2-orig/plug-ins/dxf/dxf-import.c dia-0.97.2/plug-ins/dxf/dxf-import.c +--- dia-0.97.2-orig/plug-ins/dxf/dxf-import.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/dxf/dxf-import.c 2012-07-15 10:49:06.419726851 -0400 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/hpgl/hpgl.c dia-0.97.2/plug-ins/hpgl/hpgl.c +--- dia-0.97.2-orig/plug-ins/hpgl/hpgl.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/hpgl/hpgl.c 2012-07-15 10:49:06.487726830 -0400 +@@ -37,7 +37,7 @@ + #include + + #include +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/libart/export_png.c dia-0.97.2/plug-ins/libart/export_png.c +--- dia-0.97.2-orig/plug-ins/libart/export_png.c 2011-07-03 06:56:08.000000000 -0400 ++++ dia-0.97.2/plug-ins/libart/export_png.c 2012-07-15 10:49:06.415726849 -0400 +@@ -29,7 +29,7 @@ + #include + #include + +-#include ++#include + #include + + #include "intl.h" +diff -Naur dia-0.97.2-orig/plug-ins/metapost/render_metapost.c dia-0.97.2/plug-ins/metapost/render_metapost.c +--- dia-0.97.2-orig/plug-ins/metapost/render_metapost.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/metapost/render_metapost.c 2012-07-15 10:49:06.396726857 -0400 +@@ -43,7 +43,7 @@ + #endif + #include + +-#include ++#include + + #include "intl.h" + #include "render_metapost.h" +diff -Naur dia-0.97.2-orig/plug-ins/pgf/render_pgf.c dia-0.97.2/plug-ins/pgf/render_pgf.c +--- dia-0.97.2-orig/plug-ins/pgf/render_pgf.c 2011-01-07 07:11:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/pgf/render_pgf.c 2012-07-15 10:49:06.445726842 -0400 +@@ -61,8 +61,8 @@ + #endif + #include + +-#include +-#include ++#include ++#include + + #include "intl.h" + #include "render_pgf.h" +diff -Naur dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c dia-0.97.2/plug-ins/postscript/paginate_psprint.c +--- dia-0.97.2-orig/plug-ins/postscript/paginate_psprint.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/postscript/paginate_psprint.c 2012-07-15 10:49:06.451726838 -0400 +@@ -31,7 +31,7 @@ + #include + #include + +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/postscript/render_eps.c dia-0.97.2/plug-ins/postscript/render_eps.c +--- dia-0.97.2-orig/plug-ins/postscript/render_eps.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/postscript/render_eps.c 2012-07-15 10:49:06.451726838 -0400 +@@ -55,7 +55,7 @@ + #include + #include + +-#include ++#include + + #include "intl.h" + #include "render_eps.h" +diff -Naur dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c dia-0.97.2/plug-ins/pstricks/render_pstricks.c +--- dia-0.97.2-orig/plug-ins/pstricks/render_pstricks.c 2011-01-07 07:11:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/pstricks/render_pstricks.c 2012-07-15 10:49:06.410726853 -0400 +@@ -50,7 +50,7 @@ + #endif + #include + +-#include ++#include + + #include "intl.h" + #include "render_pstricks.h" +diff -Naur dia-0.97.2-orig/plug-ins/python/pydia-render.c dia-0.97.2/plug-ins/python/pydia-render.c +--- dia-0.97.2-orig/plug-ins/python/pydia-render.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/python/pydia-render.c 2012-07-15 10:49:06.503726822 -0400 +@@ -21,7 +21,7 @@ + + #include + #include +-#include ++#include + + #include + +diff -Naur dia-0.97.2-orig/plug-ins/shape/shape-export.c dia-0.97.2/plug-ins/shape/shape-export.c +--- dia-0.97.2-orig/plug-ins/shape/shape-export.c 2009-11-08 06:14:56.000000000 -0500 ++++ dia-0.97.2/plug-ins/shape/shape-export.c 2012-07-15 10:49:06.489726827 -0400 +@@ -40,7 +40,7 @@ + #include + #endif + +-#include ++#include + + /* the dots per centimetre to render this diagram at */ + /* this matches the setting `100%' setting in dia. */ +diff -Naur dia-0.97.2-orig/plug-ins/svg/render_svg.c dia-0.97.2/plug-ins/svg/render_svg.c +--- dia-0.97.2-orig/plug-ins/svg/render_svg.c 2011-12-17 11:30:38.000000000 -0500 ++++ dia-0.97.2/plug-ins/svg/render_svg.c 2012-07-15 10:49:06.392726859 -0400 +@@ -30,7 +30,7 @@ + #endif + + #include +-#include ++#include + + #include + #include +diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-export.c dia-0.97.2/plug-ins/vdx/vdx-export.c +--- dia-0.97.2-orig/plug-ins/vdx/vdx-export.c 2009-12-27 11:22:38.000000000 -0500 ++++ dia-0.97.2/plug-ins/vdx/vdx-export.c 2012-07-15 10:55:17.066579728 -0400 +@@ -32,11 +32,12 @@ + + #include + #include ++#include + #include + #include + #include + #include +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/vdx/vdx-import.c dia-0.97.2/plug-ins/vdx/vdx-import.c +--- dia-0.97.2-orig/plug-ins/vdx/vdx-import.c 2009-12-27 11:22:38.000000000 -0500 ++++ dia-0.97.2/plug-ins/vdx/vdx-import.c 2012-07-15 10:49:06.466726836 -0400 +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +diff -Naur dia-0.97.2-orig/plug-ins/wmf/wmf.cpp dia-0.97.2/plug-ins/wmf/wmf.cpp +--- dia-0.97.2-orig/plug-ins/wmf/wmf.cpp 2011-03-13 09:07:48.000000000 -0400 ++++ dia-0.97.2/plug-ins/wmf/wmf.cpp 2012-07-15 10:49:06.482726831 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/wpg/wpg.c dia-0.97.2/plug-ins/wpg/wpg.c +--- dia-0.97.2-orig/plug-ins/wpg/wpg.c 2009-11-07 09:28:34.000000000 -0500 ++++ dia-0.97.2/plug-ins/wpg/wpg.c 2012-07-15 10:49:06.406726855 -0400 +@@ -40,7 +40,7 @@ + #include + + #include +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-export.c dia-0.97.2/plug-ins/xfig/xfig-export.c +--- dia-0.97.2-orig/plug-ins/xfig/xfig-export.c 2011-12-17 11:30:38.000000000 -0500 ++++ dia-0.97.2/plug-ins/xfig/xfig-export.c 2012-07-15 10:49:06.400726856 -0400 +@@ -16,7 +16,7 @@ + #include + + #include +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/xfig/xfig-import.c dia-0.97.2/plug-ins/xfig/xfig-import.c +--- dia-0.97.2-orig/plug-ins/xfig/xfig-import.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/plug-ins/xfig/xfig-import.c 2012-07-15 10:49:06.402726853 -0400 +@@ -40,7 +40,7 @@ + #include + + #include +-#include ++#include + + #include "intl.h" + #include "message.h" +diff -Naur dia-0.97.2-orig/plug-ins/xslt/xslt.c dia-0.97.2/plug-ins/xslt/xslt.c +--- dia-0.97.2-orig/plug-ins/xslt/xslt.c 2009-11-07 12:13:53.000000000 -0500 ++++ dia-0.97.2/plug-ins/xslt/xslt.c 2012-07-15 10:49:06.440726844 -0400 +@@ -27,7 +27,7 @@ + #include + #include + +-#include ++#include + + #include "filter.h" + #include "intl.h" +diff -Naur dia-0.97.2-orig/tests/test-boundingbox.c dia-0.97.2/tests/test-boundingbox.c +--- dia-0.97.2-orig/tests/test-boundingbox.c 2009-11-07 09:28:35.000000000 -0500 ++++ dia-0.97.2/tests/test-boundingbox.c 2012-07-15 10:49:06.986726677 -0400 +@@ -29,7 +29,7 @@ + #include + + #if GLIB_CHECK_VERSION(2,16,0) +-#include ++#include + #endif + #include "dialib.h" + +diff -Naur dia-0.97.2-orig/tests/test-objects.c dia-0.97.2/tests/test-objects.c +--- dia-0.97.2-orig/tests/test-objects.c 2009-11-07 09:28:35.000000000 -0500 ++++ dia-0.97.2/tests/test-objects.c 2012-07-15 10:49:06.985726677 -0400 +@@ -29,7 +29,7 @@ + #include + + #if GLIB_CHECK_VERSION(2,16,0) +-#include ++#include + #endif + + #include "object.h" -- GitLab From 7d64f1a93e5b1aeb180185616cd981ba9578cf49 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 11:06:04 -0400 Subject: [PATCH 0038/5607] epdfview: Fix build with glib-2.32.4 --- pkgs/applications/misc/epdfview/default.nix | 1 + .../misc/epdfview/glib-top-level-header.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/applications/misc/epdfview/glib-top-level-header.patch diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 3ce652c1a33..6941e8df626 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; }; buildInputs = [ pkgconfig gtk poppler ]; + patches = [ ./glib-top-level-header.patch ]; meta = { homepage = http://trac.emma-soft.com/epdfview/; description = "A lightweight PDF document viewer using Poppler and GTK+"; diff --git a/pkgs/applications/misc/epdfview/glib-top-level-header.patch b/pkgs/applications/misc/epdfview/glib-top-level-header.patch new file mode 100644 index 00000000000..a321ad3a2b6 --- /dev/null +++ b/pkgs/applications/misc/epdfview/glib-top-level-header.patch @@ -0,0 +1,12 @@ +diff -Naur epdfview-0.1.8-orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h +--- epdfview-0.1.8-orig/src/gtk/StockIcons.h 2011-05-28 06:24:57.000000000 -0400 ++++ epdfview-0.1.8/src/gtk/StockIcons.h 2012-07-15 11:02:43.946339253 -0400 +@@ -18,7 +18,7 @@ + #if !defined (__STOCK_ICONS_H__) + #define __STOCK_ICONS_H__ + +-#include ++#include + + G_BEGIN_DECLS + -- GitLab From a55bcacbe25572ce97dc59b78390e2870ffef21b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:40:52 -0400 Subject: [PATCH 0039/5607] xorg-video-unichrome: Update git url, fix build with new xorg --- pkgs/servers/x11/xorg/unichrome/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix index 5cc26338c95..720ccd10158 100644 --- a/pkgs/servers/x11/xorg/unichrome/default.nix +++ b/pkgs/servers/x11/xorg/unichrome/default.nix @@ -1,24 +1,25 @@ {stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto, videoproto, libX11, xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake, -autoconf, libtool, libXext, utilmacros}: +autoconf, libtool, libXext, utilmacros, pixman}: stdenv.mkDerivation { name = "xf86-video-unichrome-git"; src = fetchgit { - url = "git://anongit.freedesktop.org/~libv/xf86-video-unichrome"; + url = "git://people.freedesktop.org/~libv/xf86-video-unichrome"; md5 = "6e5e0f8ee204af2385a02e502d1ca8f1"; rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC - glproto mesa automake autoconf libtool libXext utilmacros ]; + glproto mesa automake autoconf libtool libXext utilmacros pixman ]; preConfigure = "chmod +x autogen.sh"; prePatch = '' sed s,/bin/bash,/bin/sh, -i git_version.sh ''; patches = [ ./configure.patch ]; configureScript = "./autogen.sh"; + CFLAGS="-I${pixman}/include/pixman-1"; meta = { homepage = "http://unichrome.sourceforge.net/"; -- GitLab From c95e6d5dc445257cbbd0511ba27c9828516e98fc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:44:11 -0400 Subject: [PATCH 0040/5607] xf86-video-vesa: Need pixman --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 09b2619597f..a568fc63f3b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -191,6 +191,11 @@ in buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.libXext]; }; + xf86videovesa = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + xdriinfo = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; -- GitLab From 08e7a18a2c7f1c5f08401db0b3f791a8ff2d73b4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:45:57 -0400 Subject: [PATCH 0041/5607] xf86-video-nv: Needs pixman --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a568fc63f3b..fb962cc6aa7 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -191,6 +191,11 @@ in buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.libXext]; }; + xf86videonv = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + xf86videovesa = attrs: attrs // { NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; buildInputs = attrs.buildInputs ++ [xorg.pixman]; -- GitLab From ccceaba50a5c01e23ee3015f6f47f0c645fbea3e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:47:27 -0400 Subject: [PATCH 0042/5607] xf86-video-cirrus: Needs pixman --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fb962cc6aa7..ee7aec1663c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -177,6 +177,11 @@ in buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; + xf86videocirrus = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + xf86videofbdev = attrs: attrs // { NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; buildInputs = attrs.buildInputs ++ [xorg.pixman]; -- GitLab From d382822803664d42a75932224ef107c88710c3dd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:48:28 -0400 Subject: [PATCH 0043/5607] xf86-video-ati: Needs pixman --- pkgs/servers/x11/xorg/overrides.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ee7aec1663c..ae715bf33ca 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -174,7 +174,8 @@ in }; xf86videoati = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa xorg.pixman]; }; xf86videocirrus = attrs: attrs // { -- GitLab From 4f01e68ff80dc7e87cd812a70d81499bb3c45b9e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:53:43 -0400 Subject: [PATCH 0044/5607] xf86-input-synaptics: Needs mtdev and pixman --- pkgs/servers/x11/xorg/overrides.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ae715bf33ca..9aaede9d324 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -162,6 +162,8 @@ in }; xf86inputsynaptics = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [args.mtdev xorg.pixman]; installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 204c844640f..828b5347b70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5350,7 +5350,7 @@ let inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig libxslt expat libdrm libpng zlib perl mesa xkeyboard_config dbus libuuid openssl gperf m4 - autoconf libtool xmlto asciidoc udev flex bison python; + autoconf libtool xmlto asciidoc udev flex bison python mtdev; automake = automake110x; }); -- GitLab From 27339f2ad8a4ad70e2e9e03bc578717e585503a0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:55:12 -0400 Subject: [PATCH 0045/5607] xf86-input-mouse: Needs pixman --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9aaede9d324..c0dee900307 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -161,6 +161,11 @@ in installFlags = "sdkdir=\${out}/include/xorg"; }; + xf86inputmouse = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + xf86inputsynaptics = attrs: attrs // { NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; buildInputs = attrs.buildInputs ++ [args.mtdev xorg.pixman]; -- GitLab From 5315a0bb6d0ca9a6c79258434387a1f5e7ce1c78 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 22:56:49 -0400 Subject: [PATCH 0046/5607] xf86-input-keyboard: Needs pixman --- pkgs/servers/x11/xorg/overrides.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c0dee900307..a4a38d8ac38 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -161,6 +161,11 @@ in installFlags = "sdkdir=\${out}/include/xorg"; }; + xf86inputkeyboard = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; + buildInputs = attrs.buildInputs ++ [xorg.pixman]; + }; + xf86inputmouse = attrs: attrs // { NIX_CFLAGS_COMPILE = "-I${xorg.pixman}/include/pixman-1"; buildInputs = attrs.buildInputs ++ [xorg.pixman]; -- GitLab From 1e4e0c18b8f018cedc26c09b7b770ea24c8c7fc0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 23:03:23 -0400 Subject: [PATCH 0047/5607] xf86-input-wacom: Update to 0.16.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 10 ++++++---- 1 file changed, 6 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 98446c70867..e043b12e820 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl , file, inputproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }: +, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: 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 - ncurses pkgconfig randrproto xorgserver xproto udev ]; + ncurses pkgconfig randrproto xorgserver xproto udev libXinerama pixman ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ''; + CFLAGS = "-I${pixman}/include/pixman-1"; + meta = with stdenv.lib; { maintainers = [ maintainers.goibhniu maintainers.urkud ]; description = "Wacom digitizer driver for X11"; -- GitLab From f85fc1eafb22b5ab1e9bd60d4dadfe1bde14fdc3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 23:15:21 -0400 Subject: [PATCH 0048/5607] xchat: Fix build with glib-2.32.4 --- .../networking/irc/xchat/default.nix | 2 + .../irc/xchat/glib-top-level-header.patch | 75 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 pkgs/applications/networking/irc/xchat/glib-top-level-header.patch diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix index 4b9cef2d501..1999bd030cb 100644 --- a/pkgs/applications/networking/irc/xchat/default.nix +++ b/pkgs/applications/networking/irc/xchat/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { buildInputs = [pkgconfig tcl gtk]; configureFlags = "--disable-nls"; + patches = [ ./glib-top-level-header.patch ]; + meta = { description = "IRC client using GTK"; homepage = http://www.xchat.org; diff --git a/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch b/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch new file mode 100644 index 00000000000..b1413b35753 --- /dev/null +++ b/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch @@ -0,0 +1,75 @@ +diff -Naur xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c xchat-2.8.8/src/common/dbus/dbus-plugin.c +--- xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c 2009-08-16 05:40:15.000000000 -0400 ++++ xchat-2.8.8/src/common/dbus/dbus-plugin.c 2012-07-15 23:07:33.678948703 -0400 +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include "../xchat-plugin.h" + + #define PNAME _("remote access") +diff -Naur xchat-2.8.8-orig/src/common/modes.c xchat-2.8.8/src/common/modes.c +--- xchat-2.8.8-orig/src/common/modes.c 2010-05-29 21:52:18.000000000 -0400 ++++ xchat-2.8.8/src/common/modes.c 2012-07-15 23:07:33.654948723 -0400 +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + + #include "xchat.h" + #include "xchatc.h" +diff -Naur xchat-2.8.8-orig/src/common/servlist.c xchat-2.8.8/src/common/servlist.c +--- xchat-2.8.8-orig/src/common/servlist.c 2010-05-16 03:24:26.000000000 -0400 ++++ xchat-2.8.8/src/common/servlist.c 2012-07-15 23:07:33.643948732 -0400 +@@ -24,7 +24,7 @@ + #include + + #include "xchat.h" +-#include ++#include + + #include "cfgfiles.h" + #include "fe.h" +diff -Naur xchat-2.8.8-orig/src/common/text.c xchat-2.8.8/src/common/text.c +--- xchat-2.8.8-orig/src/common/text.c 2010-05-29 22:14:41.000000000 -0400 ++++ xchat-2.8.8/src/common/text.c 2012-07-15 23:07:33.671948706 -0400 +@@ -28,7 +28,7 @@ + #include + + #include "xchat.h" +-#include ++#include + #include "cfgfiles.h" + #include "chanopt.h" + #include "plugin.h" +diff -Naur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c +--- xchat-2.8.8-orig/src/common/util.c 2009-08-16 05:40:16.000000000 -0400 ++++ xchat-2.8.8/src/common/util.c 2012-07-15 23:07:33.649948724 -0400 +@@ -39,7 +39,7 @@ + #include + #include "xchat.h" + #include "xchatc.h" +-#include ++#include + #include + #include "util.h" + #include "../../config.h" +diff -Naur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h +--- xchat-2.8.8-orig/src/common/xchat.h 2009-08-16 05:40:16.000000000 -0400 ++++ xchat-2.8.8/src/common/xchat.h 2012-07-15 23:08:20.855910521 -0400 +@@ -1,10 +1,6 @@ + #include "../../config.h" + +-#include +-#include +-#include +-#include +-#include ++#include + #include /* need time_t */ + + #ifndef XCHAT_H -- GitLab From 4fd1a24af44f6b363a9296c39e84b38ad47b6e9f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 23:39:55 -0400 Subject: [PATCH 0049/5607] libsoup: Update to 2.38.1 --- pkgs/development/libraries/libsoup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 861f41cb7a4..87aaafabcc4 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -2,11 +2,11 @@ , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: stdenv.mkDerivation { - name = "libsoup-2.36.1"; + name = "libsoup-2.38.1"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz; - sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk"; + url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz; + sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i"; }; -- GitLab From 37cc7e80ad4da70a05dd039a2ba393ff1d23b47c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Jul 2012 00:02:24 -0400 Subject: [PATCH 0050/5607] gstreamer: Update gstreamer and plugins-base to 0.10.36 --- .../libraries/gstreamer/gst-plugins-base/default.nix | 9 +++++---- .../libraries/gstreamer/gstreamer/default.nix | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix index 47762660b29..2ac325dc282 100644 --- a/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/gst-plugins-base/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-0.10.35"; + name = "gst-plugins-base-0.10.36"; src = fetchurl { urls = [ - "${meta.homepage}/src/gst-plugins-base/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "00vis5kg6km26zaq1ywz7ki9xvkwpc9c5wn41d01z2i5nldz096d"; + sha256 = "0jp6hjlra98cnkal4n6bdmr577q8mcyp3c08s3a02c4hjhw5rr0z"; }; patchPhase = '' @@ -43,3 +43,4 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; }; } + diff --git a/pkgs/development/libraries/gstreamer/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/gstreamer/default.nix index 01d5487302c..5d33e7bff03 100644 --- a/pkgs/development/libraries/gstreamer/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamer/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2 }: stdenv.mkDerivation rec { - name = "gstreamer-0.10.35"; + name = "gstreamer-0.10.36"; src = fetchurl { urls = - [ "${meta.homepage}/src/gstreamer/${name}.tar.bz2" - "mirror://gentoo/distfiles/${name}.tar.bz2" + [ "${meta.homepage}/src/gstreamer/${name}.tar.xz" + "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "11lp13lig3c6qys80phyvsik56r9y0c95vg2jxxliqj6rnigwyw1"; + sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; }; buildInputs = [ perl bison flex pkgconfig ]; -- GitLab From 0ef65a6bab0b2386a36c03fd1661824860645c58 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 16 Jul 2012 00:16:03 -0400 Subject: [PATCH 0051/5607] webkit: Update to 1.8.1 in attempt to fix build with new glib Sorry if my 'fixConfigure' is not idiomatic builderDefs, I've not used it before --- pkgs/development/libraries/webkit/default.nix | 11 +++++++++-- pkgs/development/libraries/webkit/src-for-default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index c0fd878e0bb..d229228b94f 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -14,7 +14,7 @@ rec { sqlite icu gperf bison flex autoconf automake libtool perl intltool pkgconfig libsoup gtkdoc libXt libproxy enchant python ruby which renderproto libXrender geoclue - kbproto + kbproto mesa ]; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ rec { ]; /* doConfigure should be specified separately */ - phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") + phaseNames = ["setVars" "fixConfigure" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"]; setVars = fullDepEntry ('' @@ -78,6 +78,13 @@ rec { sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h') '') ["minInit" "doUnpack"]; + # See http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2012-April/022893.html + fixConfigure = fullDepEntry ('' + sed -i -e 's/=GSTREAMER_0_10_REQUIRED_VERSION/=\$GSTREAMER_0_10_REQUIRED_VERSION/' \ + -e 's/=GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/=\$GSTREAMER_0_10_PLUGINS_BASE_REQUIRED_VERSION/' \ + configure{,.ac} + '') ["minInit" "doUnpack"]; + name = s.name; meta = { description = "WebKit - a fast and correct HTML renderer"; diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix index 30e129e2fae..65bcd435096 100644 --- a/pkgs/development/libraries/webkit/src-for-default.nix +++ b/pkgs/development/libraries/webkit/src-for-default.nix @@ -1,9 +1,10 @@ rec { - version="1.6.3"; - name="webkit-1.6.3"; - hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j"; - url="http://webkitgtk.org/webkit-1.6.3.tar.xz"; - advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz"; + version="1.8.1"; + name="webkit-1.8.1"; + hash="0a1v3v8dp2cl332qr51j4fpl0rwpgxbf29hn3zdim9hcniv6l4ls"; + url="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz"; + advertisedUrl="http://webkitgtk.org/releases/webkit-1.8.1.tar.xz"; } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 828b5347b70..5dd39ffef29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4822,7 +4822,7 @@ let libjpeg libtiff libxml2 libxslt sqlite icu cairo intltool automake libtool pkgconfig autoconf bison libproxy enchant - python ruby which flex geoclue; + python ruby which flex geoclue mesa; inherit gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good; inherit (xlibs) libXt renderproto libXrender kbproto; -- GitLab From 78c742c720ad85cef3b2597827ebcc26ea95684c Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Wed, 18 Jul 2012 01:29:22 +0300 Subject: [PATCH 0052/5607] GNOME3: at-spi2-core --- .../gnome-3/core/at-spi2-core/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix index 5d7170f4450..de4f3e8485f 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, python, pkgconfig, popt, libX11, libICE, xlibs, libXi +{ stdenv, fetchurl, python, pkgconfig, popt, libX11, xextproto, libSM, libICE, libXtst, libXi , intltool, dbus_glib }: -stdenv.mkDerivation { - name = "at-spi2-core-2.5.3"; +stdenv.mkDerivation rec { + + versionMajor = "2.5"; + versionMinor = "4"; + moduleName = "at-spi2-core"; + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { - url = mirror://gnome/sources/at-spi2-core/2.5/at-spi2-core-2.5.3.tar.xz; - sha256 = "0g1w8k13xjz6jcbkdy3h8w4x8g5g1f0nwykidairvfyi6yi9xdpm"; + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "167zm1a36rd09wg161fsq8swnzdk3wv23kq49nd0l7gr89flf9ig"; }; - buildInputs = [ python pkgconfig popt libX11 libICE xlibs.libXtst libXi - intltool dbus_glib ]; + buildInputs = [ python pkgconfig popt libX11 xextproto libSM libICE libXtst libXi intltool dbus_glib ]; } -- GitLab From cd7027bdaecda32b83805b0f336bbfee0f2fadc2 Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Wed, 18 Jul 2012 01:46:29 +0300 Subject: [PATCH 0053/5607] GNOME3: at-spi2-atk (TODO: deal with gschemas.compiled conflict) --- .../desktops/gnome-3/core/at-spi2-atk/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix index a26928fadf7..12b4c08cc6d 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -1,14 +1,17 @@ { stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi -, intltool, dbus_glib }: +, intltool, dbus_glib, gnome3, libSM }: -stdenv.mkDerivation { - name = "at-spi2-atk-2.5.3"; +stdenv.mkDerivation rec { + versionMajor = "2.5"; + versionMinor = "4"; + moduleName = "at-spi2-atk"; + name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { - url = mirror://gnome/sources/at-spi2-atk/2.5/at-spi2-atk-2.5.3.tar.xz; - sha256 = "16y6q0v3va7r77ns1r6w4mg3rvyxmnyzx1b3n0wqjzmqkd8avgmx"; + url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + sha256 = "1bl5jl644slf5mmnr4z7xj433prvjjpgmv9rdmxdny23j08qa8vs"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi - intltool dbus_glib ]; + intltool dbus_glib gnome3.at_spi2_core libSM ]; } -- GitLab From 3665e02901759cb584b383306cbba867a25918ff Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 20 Jul 2012 20:11:04 +0200 Subject: [PATCH 0054/5607] python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion} --- pkgs/development/interpreters/python/2.6/default.nix | 2 ++ pkgs/development/interpreters/python/2.7/default.nix | 2 ++ pkgs/development/interpreters/python/wrapper.nix | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index f87e1e3810f..6fa27c23525 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -60,6 +60,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 09860310541..7e28cdc1db7 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -74,6 +74,8 @@ let postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb + ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ''; passthru = { diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index e8e343976bc..f4892f92b41 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' mkdir -p "$out/bin" - for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do + for prg in 2to3 idle pdb pdb${python.majorVersion} pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH" done ensureDir "$out/share" -- GitLab From e7c1aa52cc9594fa48622c2048ab69766f3f27d3 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 00:11:02 +0200 Subject: [PATCH 0055/5607] python: rename eventually created easy_install.pth to pkg-specific file --- pkgs/development/python-modules/generic/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4e0b6100231..4aa17d28b25 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -20,6 +20,15 @@ , installCommand ? '' easy_install --prefix="$out" . + + # A pth file might have been generated to load the package from + # within its own site-packages, rename this package not to + # collide with others. + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi '' , buildPhase ? "true" -- GitLab From 2c3ffeb79c9baabd36bcd24a054121c06f204026 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 00:11:17 +0200 Subject: [PATCH 0056/5607] python: remove colliding site.py* files --- pkgs/development/python-modules/generic/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4aa17d28b25..3a6024e09a8 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -29,6 +29,11 @@ # move colliding easy_install.pth to specifically named one mv "$eapth" $(dirname "$eapth")/${name}.pth fi + + # Remove any site.py files generated by easy_install as these + # cause collisions. If pth files are to be processed a + # corresponding site.py needs to be included in the PYTHONPATH. + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* '' , buildPhase ? "true" -- GitLab From 5c564f26f09d313a127668ab6c77a8e9d254eaa4 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 00:20:21 +0200 Subject: [PATCH 0057/5607] python: always unzip eggs installed into the store grepping and tagging are two use cases coming to mind --- pkgs/development/python-modules/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 4e0b6100231..3c5b7186f74 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -19,7 +19,7 @@ , installCommand ? '' - easy_install --prefix="$out" . + easy_install --always-unzip --prefix="$out" . '' , buildPhase ? "true" @@ -47,8 +47,6 @@ python.stdenv.mkDerivation (attrs // { pythonPath = [ setuptools] ++ pythonPath; - # XXX: Should we run `easy_install --always-unzip'? It doesn't seem - # to have a noticeable impact on small scripts. installPhase = '' mkdir -p "$out/lib/${python.libPrefix}/site-packages" -- GitLab From a40da09b444ad00c46d952bc4b4ac9e5cd51c6f9 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 21 Jul 2012 01:55:50 +0200 Subject: [PATCH 0058/5607] python: create pth files for python build inputs (propagate/native or not) --- pkgs/development/python-modules/generic/default.nix | 11 ++++++++++- pkgs/development/python-modules/generic/wrap.sh | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 3a6024e09a8..6e8794103bc 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -59,6 +59,8 @@ python.stdenv.mkDerivation (attrs // { buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; + buildInputStrings = map toString buildInputs; + pythonPath = [ setuptools] ++ pythonPath; # XXX: Should we run `easy_install --always-unzip'? It doesn't seem @@ -76,7 +78,7 @@ python.stdenv.mkDerivation (attrs // { postFixup = '' wrapPythonPrograms - + # If a user installs a Python package, she probably also wants its # dependencies in the user environment (since Python modules don't # have something like an RPATH, so the only way to find the @@ -84,5 +86,12 @@ python.stdenv.mkDerivation (attrs // { if test -e $out/nix-support/propagated-build-inputs; then ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages fi + + createBuildInputsPth build-inputs "$buildInputStrings" + for inputsfile in propagated-build-inputs propagated-build-native-inputs; do + if test -e $out/nix-support/$inputsfile; then + createBuildInputsPth $inputsfile "$(cat $out/nix-support/$inputsfile)" + fi + done ''; }) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 65f3229ca7c..7cc72849190 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -45,3 +45,15 @@ _addToPythonPath() { done fi } + +createBuildInputsPth() { + local category="$1" + local inputs="$2" + if [ foo"$inputs" != foo ]; then + for x in $inputs; do + if test -d "$x"/lib/@libPrefix@/site-packages; then + echo $x >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth + fi + done + fi +} -- GitLab From f8d3671629441fd6b528a532e9d3356d8d21f168 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 22 Jul 2012 02:07:23 +0200 Subject: [PATCH 0059/5607] fix pth files --- pkgs/development/python-modules/generic/wrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 7cc72849190..71269945d6f 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -52,7 +52,8 @@ createBuildInputsPth() { if [ foo"$inputs" != foo ]; then for x in $inputs; do if test -d "$x"/lib/@libPrefix@/site-packages; then - echo $x >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth + echo $x/lib/@libPrefix@/site-packages \ + >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth fi done fi -- GitLab From 6bc1086ff0ede347fc691c4b310c64f136691477 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Jul 2012 18:54:50 +0200 Subject: [PATCH 0060/5607] 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 00000000000..96fa7dc8ca5 --- /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 24a2f6cf85e..f7f5de01c63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2877,6 +2877,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; }; -- GitLab From e23e934bbc8035b8084aa8bc272177307cf9ddb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Jul 2012 19:03:33 +0200 Subject: [PATCH 0061/5607] all-packages.nix: bump default version of 'bison' from 2.5 to 2.6 --- 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 f7f5de01c63..8b4c5f62e54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2867,7 +2867,7 @@ let cross = assert crossSystem != null; crossSystem; }); - bison = bison25; + bison = bison26; bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { }; -- GitLab From dccfb866daceb22b2b3d10202cfec8e8d7f59fd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 22 Jul 2012 19:09:28 +0200 Subject: [PATCH 0062/5607] all-packages.nix: comment-out obsolete bison versions 2.3, 2.4, and 2.5 After a reasonable grace period, these packages should be removed. --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b4c5f62e54..1b9d8156272 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2871,11 +2871,12 @@ let bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { }; - bison23 = callPackage ../development/tools/parsing/bison/bison-2.3.nix { }; - - bison24 = callPackage ../development/tools/parsing/bison/bison-2.4.nix { }; - - bison25 = callPackage ../development/tools/parsing/bison/bison-2.5.nix { }; + # These attributes are unused and should be removed as well as the + # corresponding nix files: + # + # bison23 = callPackage ../development/tools/parsing/bison/bison-2.3.nix { }; + # bison24 = callPackage ../development/tools/parsing/bison/bison-2.4.nix { }; + # bison25 = callPackage ../development/tools/parsing/bison/bison-2.5.nix { }; bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; -- GitLab From 30ffafb47d14fb905d0ca2345fe097903e9180e1 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sun, 22 Jul 2012 02:16:59 +0200 Subject: [PATCH 0063/5607] recursive pth loader --- .../recursive-pth-loader/default.nix | 20 ++++++++ .../recursive-pth-loader/sitecustomize.py | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++ 3 files changed, 72 insertions(+) create mode 100644 pkgs/development/python-modules/recursive-pth-loader/default.nix create mode 100644 pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix new file mode 100644 index 00000000000..3452c62e216 --- /dev/null +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -0,0 +1,20 @@ +{ stdenv, python }: + +stdenv.mkDerivation rec { + name = "resursive-pth-loader-1.0"; + + unpackPhase = "true"; + + buildInputs = [ python ]; + + installPhase = + '' + dst=$out/lib/${python.libPrefix}/site-packages + mkdir -p $dst + cat ${./sitecustomize.py} >> $dst/sitecustomize.py + ''; + + meta = { + description = "Enable recursive processing of pth files anywhere in sys.path"; + }; +} diff --git a/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py b/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py new file mode 100644 index 00000000000..057e779803c --- /dev/null +++ b/pkgs/development/python-modules/recursive-pth-loader/sitecustomize.py @@ -0,0 +1,46 @@ +"""Recursively load pth files in site-packages of sys.path + +- iterate over sys.path +- check for pth in dirs that end in site-packages +- ignore import statements in pth files +- add dirs listed in pth files right after current sys.path element, + they will be processed in next iteration +""" + +import os +import site +import sys + + +for path_idx, sitedir in enumerate(sys.path): + # ignore non-site-packages + if not sitedir.endswith('site-packages'): + continue + + # find pth files + try: + names = os.listdir(sitedir) + except os.error: + continue + dotpth = os.extsep + "pth" + pths = [name for name in names if name.endswith(dotpth)] + + for pth in pths: + fullname = os.path.join(sitedir, pth) + try: + f = open(fullname, "rU") + except IOError: + continue + + with f: + for n, line in enumerate(f): + if line.startswith("#"): + continue + + if line.startswith(("import ", "import\t")): + continue + + line = line.rstrip() + dir, dircase = site.makepath(sitedir, line) + if not dircase in sys.path: + sys.path.insert(path_idx+1, dir) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b8327ddaaae..f06a97aadc9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13,6 +13,12 @@ let pythonPackages = python.modules // rec { }; + recursivePthLoader = import ../development/python-modules/recursive-pth-loader { + inherit (pkgs) stdenv; + inherit python; + }; + + setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; inherit python wrapPython; -- GitLab From 3aae4ccffa8bdaea0bcc136c39fdc33729e76af3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 25 Jul 2012 11:04:47 -0400 Subject: [PATCH 0064/5607] libpng: Update to 1.2.50 and 1.5.12 Addresses CVE-2012-3386. --- pkgs/development/libraries/libpng/12.nix | 4 ++-- pkgs/development/libraries/libpng/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 5d6e439484d..ebdb9e756aa 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -3,11 +3,11 @@ assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.47"; + name = "libpng-1.2.50"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "1lai3dnzw81y40jr17bdj1qh08hwv9mc1v74yybl7jdx2hiilsvx"; + sha256 = "1rz8v3cvy1zzpagxn91lj8swb9vf75rz3yyi18v7zb4jihgzh927"; }; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index a06e8e12543..a211d3deb05 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.5.10"; + name = "libpng-1.5.12"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "0pb096zn6iyza28js4j7krvcw23b979igfi315aqmvx622bw6jfx"; + sha256 = "03fl91yirm59s1ppdflvqqbhsmwhxwf9mchambwvvd18yp56ip5s"; }; propagatedBuildInputs = [ zlib ]; -- GitLab From 64f932f8fda4fc87a7ee3ce604405c5c775f5926 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 2 Aug 2012 23:44:50 +0400 Subject: [PATCH 0065/5607] 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 00000000000..55ade68dd41 --- /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 dc3c1643ebc..8d2acfe9b31 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; -- GitLab From bff9f2720f36ff1f3ac3ac86a3c0adb9d572c7e7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 02:30:25 +0400 Subject: [PATCH 0066/5607] 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 d898daad2a7..ce799242e12 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 00000000000..a8412d69fd3 --- /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 + + -- GitLab From da7408e105d605596ac926dd990d2c2e7aee2bc8 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 02:33:06 +0400 Subject: [PATCH 0067/5607] 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 ce799242e12..3cb16a6b442 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 \ -- GitLab From 179b1bd2943edb2be18c67813e1f4af7dd21cf87 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2012 03:58:17 +0400 Subject: [PATCH 0068/5607] 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 00000000000..ce1c7401a4e --- /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 79bd7583317..356384e95cb 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 { }; -- GitLab From 8071b4040e7629943097b21a13a8a71b51e20def Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:54:10 +0400 Subject: [PATCH 0069/5607] 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 adb22a8d9c6..88f1a86a2ed 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 = '' -- GitLab From 8040b72293c0751bc77aa3402a3342698d226252 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:55:00 +0400 Subject: [PATCH 0070/5607] 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 682b78f2bae..1919186586a 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 ]; -- GitLab From fcdfc1c50c18e2107b72998e69b1d0bc1c3daa47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Aug 2012 14:39:30 -0400 Subject: [PATCH 0071/5607] bash: Update to 4.2-p37 --- pkgs/shells/bash/bash-4.2-patches.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index 8d2a74e95b0..073ad106a7c 100644 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -25,4 +25,17 @@ patch: [ (patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") (patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") (patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") +(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") +(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") +(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") +(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") +(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") +(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") +(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") +(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") +(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") +(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") +(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") +(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") +(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") ] -- GitLab From 9df88a047238b253ddfbfdace2c9f76712b8941a Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Thu, 16 Aug 2012 15:56:23 +0300 Subject: [PATCH 0072/5607] GNOME3: Low prio for atk --- pkgs/desktops/gnome-3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b9558fa7ec6..f35a4f40d91 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -8,7 +8,7 @@ #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - at_spi2_atk = callPackage ./core/at-spi2-atk { }; + at_spi2_atk = lib.lowPrio (callPackage ./core/at-spi2-atk { }); at_spi2_core = callPackage ./core/at-spi2-core { }; -- GitLab From 049c38a9a292376d9c99628015d1adc609ac347e Mon Sep 17 00:00:00 2001 From: Antono Vasiljev Date: Thu, 16 Aug 2012 15:56:51 +0300 Subject: [PATCH 0073/5607] GNOME3: bump atk version --- pkgs/desktops/gnome-3/core/atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/atk/default.nix b/pkgs/desktops/gnome-3/core/atk/default.nix index 98ff11cd12e..62c610de565 100644 --- a/pkgs/desktops/gnome-3/core/atk/default.nix +++ b/pkgs/desktops/gnome-3/core/atk/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { versionMajor = "2.5"; - versionMinor = "3"; + versionMinor = "4"; name = "atk-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/atk/${versionMajor}/atk-${versionMajor}.${versionMinor}.tar.xz"; - sha256 = "04v3hzdgp2cajpgkbgr36wlxcdbpzzywyl6g2fhhyjgm9vrqw4dc"; + sha256 = "1asaq6y9cdnmji5czl9xj4cp86w9d7g78sa7ya5k6gslqj76svdg"; }; buildNativeInputs = [ pkgconfig perl ]; -- GitLab From d339184bbf05fe6ee93369625dd2c9e5e69005e5 Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Tue, 15 May 2012 01:43:46 +0400 Subject: [PATCH 0074/5607] 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 | 64 +++++++++++-------- .../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, 241 insertions(+), 26 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 00000000000..074f70448cd --- /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 00000000000..9ca45b2cc99 --- /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 0075/5607] 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 074f70448cd..2fa36b33eb0 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 8b23fba5e27..0c58965fc19 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 17ce88a8203..b5ba4f9ada7 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 9d3ff5da482..c4656e73236 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 0d7b4cc830f..17e00b4e622 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 7c733e5380d..ae9aeee7715 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; }; -- GitLab From 3694b0f892867a7b5d714eb7efa6532683a4bdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 19 Aug 2012 13:22:54 +0200 Subject: [PATCH 0076/5607] glibc: setting --enable-kernel=2.6.35 It was taking 2.4.0 as default, therefore, not using syscalls over 2.4.0 We may see performance improvements (openat, ...) --- pkgs/development/libraries/glibc/2.13/common.nix | 2 ++ pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 535fb373e04..5db9e08e3f9 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -110,6 +110,8 @@ stdenv.mkDerivation ({ (if profilingLibraries then "--enable-profile" else "--disable-profile") + ] ++ stdenv.lib.optionals (cross == null) [ + "--enable-kernel=${kernelHeaders.versionForGlibc}" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 3fb5ef8ef2d..f6004ccb151 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -59,4 +59,8 @@ stdenv.mkDerivation { ln -s asm $out/include/asm-x86 fi ''; + + passthru = { + versionForGlibc = "2.6.35"; + }; } -- GitLab From 93a7450c6a3987cee67a28efc3e1e51318a8d166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Aug 2012 10:04:07 +0200 Subject: [PATCH 0077/5607] glibc: fixing the glibcLocales build It was stopping hydra from evaluating further, I think. I broke it in my previous commit. --- pkgs/development/libraries/glibc/2.13/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 5db9e08e3f9..6e409158f0b 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation ({ (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ stdenv.lib.optionals (cross == null) [ + ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ "--enable-kernel=${kernelHeaders.versionForGlibc}" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") -- GitLab From d8fbcb7903fb933c6cd0620d2f132433220c2b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Aug 2012 15:27:36 +0200 Subject: [PATCH 0078/5607] release: Disabling hydra builds of now non-existant bison versions It breaks the evaluation of stdenv-updates by hydra. --- pkgs/top-level/release.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 18bad093294..5e0aeea2da6 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -34,9 +34,7 @@ with (import ./release-lib.nix); bc = all; binutils = linux; bind = linux; - bison23 = all; - bison24 = all; - bison25 = all; + bison26 = all; bitlbee = linux; bittorrent = linux; blender = linux; -- GitLab From 6bc378f5842d343b07a7b25abf25b0f79de92b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Aug 2012 19:12:38 +0200 Subject: [PATCH 0079/5607] release-small: make hydra evaluate fine for stdenv-updates In my previous commit I didn't know it was using release-small, instead of release.nix. --- pkgs/top-level/release-small.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 59777fe99be..36cf8d2910d 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -31,7 +31,7 @@ with (import ./release-lib.nix); bc = all; binutils = linux; bind = linux; - bison24 = all; + bison26 = linux; boostFull = all; bsdiff = all; bzip2 = all; -- GitLab From 6ed6d1c5c0ba55ac5e989878a5618d5032776c45 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 Aug 2012 23:07:38 -0400 Subject: [PATCH 0080/5607] 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 00000000000..539e1bd2350 --- /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 +'' -- GitLab 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 0081/5607] 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 fb577be0390..da786c23c33 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 2ee6dc66b2d..aaeaf48d212 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 -- GitLab From 4cc7571b9d515aad1051a0b696a3d2fa35b1fa60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Aug 2012 13:42:48 +0200 Subject: [PATCH 0082/5607] 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 25ec69c8459..82a96856ab8 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"; -- GitLab From a4b39fac652c6d829ea39c10f72b43f2074b1609 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 24 Aug 2012 08:30:48 -0400 Subject: [PATCH 0083/5607] 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 539e1bd2350..ca6533b72ac 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 '' -- GitLab 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 0084/5607] 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 00000000000..3b8f0f652a8 --- /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 aaeaf48d212..a5e69c7ebb0 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 { }; -- GitLab From 228c35f0b2b386635e6bbd8c6513e9fc5bafeb2f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 24 Aug 2012 22:29:23 -0400 Subject: [PATCH 0085/5607] 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 00000000000..8f603bb2354 --- /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 cf85c1706a8..5f5148911ec 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 ca6533b72ac..aa5b8ad39f5 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 2ee6dc66b2d..37ff40aac93 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; -- GitLab From 130a4aa5074100d32a288900effa29ca9a3bc56d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:12:54 +0200 Subject: [PATCH 0086/5607] 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 8ef55d3ff4c..eeba996990d 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 { -- GitLab From 8c96572638982826a4bf7e2466755c9a65998fab Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:13:20 +0200 Subject: [PATCH 0087/5607] 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 00000000000..2db90845f69 --- /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 0862b7eee27..cf591b9db3e 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 { }; -- GitLab From e5cc68e8d58ae2f98b80c6bc0912eef87ae96aba Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:13:59 +0200 Subject: [PATCH 0088/5607] 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 00000000000..41fca212158 --- /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 cf591b9db3e..6ef8f298028 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 {}; -- GitLab From 528b508b879ceb21f4ff35df68c8744c5882d273 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 11:14:40 +0200 Subject: [PATCH 0089/5607] 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 00000000000..1c57711940b --- /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 6ef8f298028..0987fcfae24 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 {}; -- GitLab From 9dace1124e5919a3bc5e0793d5c5fea6a9d90600 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 Aug 2012 16:02:27 +0200 Subject: [PATCH 0090/5607] 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 7dbbe375283..c518d863e7e 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 ]; -- GitLab From ca3f140e9b16905005f5ad0121bab1d5db511259 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 25 Aug 2012 16:08:01 +0200 Subject: [PATCH 0091/5607] 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 c518d863e7e..7c0ddde6612 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" ]; }; } -- GitLab 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 0092/5607] 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 00000000000..0e2df1e25fb --- /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 0987fcfae24..aa88a26c7a7 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 { }; -- GitLab From 79e3d1728044403a37e851ae90a71268f7515f4e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:39:19 +0200 Subject: [PATCH 0093/5607] 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 53343f00ca5..8d083126e4c 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 ]; -- GitLab From 1d26619edfed9ade95519c70871e6dcde451eb15 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:39:49 +0200 Subject: [PATCH 0094/5607] 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 696f179a2ed..0cabdf2f7e7 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: -- GitLab From d1d5c6d9830d9509999ab3d554fac6bbadca3ec7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:40:15 +0200 Subject: [PATCH 0095/5607] 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 800ae7ba718..3e666c9fa23 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 -- GitLab From 77948b72045bbd155098ef6ce59fdc00581c82d0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 25 Aug 2012 19:43:54 +0200 Subject: [PATCH 0096/5607] 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 3d14a064a94..00000000000 --- 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 85794901650..ec2b57e222a 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 2c84b6f006c..00000000000 --- 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 aa88a26c7a7..36ec708e8ca 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; -- GitLab From 55b964e1799881d4314c6e14412d978cc132a682 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 20:15:06 +0200 Subject: [PATCH 0097/5607] 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 00000000000..ad0df5c2cb0 --- /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 fddc9589d3a..9a252bbc0f2 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 {}; -- GitLab From 7202f40707a5fb37cea33018f70a762bd05ddbe9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 20:16:55 +0200 Subject: [PATCH 0098/5607] 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 9a252bbc0f2..f2d6e28de4b 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. -- GitLab From 84e1da4b09e2332447e5a2d9fc4e45b2499d7cc0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 25 Aug 2012 17:55:21 -0400 Subject: [PATCH 0099/5607] 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 8f603bb2354..2ac2eed117c 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"; -- GitLab From 224098757f84db54ec39345b9ad3c7f473fcdf62 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 02:52:33 +0200 Subject: [PATCH 0100/5607] 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 4721ded385a..c978ee4adf3 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; -- GitLab From 819ee63851170fc2256e37429dddacfc13a04993 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 02:56:59 +0200 Subject: [PATCH 0101/5607] 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 a250cda7610..8ae373438f5 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"; }; } -- GitLab From b1a6a98139f9ba3a6a30b751dfed332f8727a8e1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 03:03:24 +0200 Subject: [PATCH 0102/5607] 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 84cdf556d02..5949be2a4c8 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}"; -- GitLab From c67d8bcabe33e7dd8effa25510f4aca3a2442ce1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 26 Aug 2012 07:36:57 +0200 Subject: [PATCH 0103/5607] 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 5949be2a4c8..f9424f4d614 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; -- GitLab From c89a0d6c4f875fe4a3340b017b66057caec1ab6f Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 26 Aug 2012 14:43:25 +0200 Subject: [PATCH 0104/5607] 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 00000000000..0e7d688670f --- /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 466be2abbac..30d8410cad9 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 { }; -- GitLab From 016b665402807c7c4f54622cce75fd94c13aa55e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 13:33:44 -0400 Subject: [PATCH 0105/5607] 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 36ec708e8ca..b09de3fe16e 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); -- GitLab From c03efbd8f9201c6c852b5f60016700ebdacea976 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:10:36 +0400 Subject: [PATCH 0106/5607] 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 54dfc1aecc6..80f3a1b8e71 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 00000000000..12da8d41c7b --- /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)) { -- GitLab From 1e3c42eb696815f644127fe4e88e0473879da7ae Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:44:04 +0400 Subject: [PATCH 0107/5607] 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 00000000000..3e232ee5ac5 --- /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 00000000000..09ab9e11c16 --- /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 0be6ac5f4ef..379727aec5c 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 = { -- GitLab From bee287597a31d330e7d9669a9aa6967beb8d642b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:42:41 +0400 Subject: [PATCH 0108/5607] 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 360f98de758..3ea6f1a3b66 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"; -- GitLab From a4d13df801bd81f2dc86246dc4ef26ebc646c896 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:59:03 +0400 Subject: [PATCH 0109/5607] 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 00000000000..f93e4479e71 --- /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 36ec708e8ca..0ed730b5a42 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; }; -- GitLab From 497c364f7c4b31823d7450a7c54bd04860d7b6d0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 12:59:38 +0400 Subject: [PATCH 0110/5607] 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 39fcc6d1a68..23a800f6ae0 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 ]; -- GitLab From ce5d5568a43c0aaaf517b1c09ee4cbe94810737e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:14:21 +0400 Subject: [PATCH 0111/5607] 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 54e40efe65e..7705ee1893d 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 ]; -- GitLab From 40078e2f909232d72b0ba53b009497bf044262b0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Aug 2012 22:38:15 +0400 Subject: [PATCH 0112/5607] 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 98446c70867..4bcf82a7052 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 = '' -- GitLab From 77da73a72b2da15269924f9bf390e6b195e538be Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Aug 2012 22:38:50 +0400 Subject: [PATCH 0113/5607] 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 db0608ead3f..b939eb19b5e 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 ]; -- GitLab From 9a8b0b644b8b53c7790dd67991e52808dc3cd8ac Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 15:43:02 -0400 Subject: [PATCH 0114/5607] 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 c16c53d4a05..b98f35fb2d7 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 -- GitLab From a94e8d275626d34435d10832a6184625144862fe Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 16:02:04 -0400 Subject: [PATCH 0115/5607] 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 8300a7e2bc3..00000000000 --- 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 0ed730b5a42..ba29ea89a8c 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 b98f35fb2d7..99442b12c23 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 -- GitLab From ddb3f8c34e3e909b31a0ac62538e993bc7636ec1 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 16:11:29 -0400 Subject: [PATCH 0116/5607] 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 99442b12c23..bddb3f3edb7 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" ]; }; }; -- GitLab From 7e24bde3d9d90c5fbd3fe527e5643144d4285f61 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 26 Aug 2012 16:18:03 -0400 Subject: [PATCH 0117/5607] 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 bddb3f3edb7..0ab4306cca0 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 -- GitLab From bf007753d1333ed82a578038cc9cfc501ba91625 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 24 Aug 2012 16:00:18 +0200 Subject: [PATCH 0118/5607] 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 459ce6310bf..041544404ca 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" -- GitLab From df35189985bcd1e53513d48ac0956ec525b4f24e Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 24 Aug 2012 16:38:21 +0200 Subject: [PATCH 0119/5607] 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 041544404ca..0ced1da95d4 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"; -- GitLab From ba47bf725813e205ce1e28bf20cecdfdd425d48c Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Fri, 24 Aug 2012 17:10:23 +0200 Subject: [PATCH 0120/5607] 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 bc27516f46d..537867f215b 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; -- GitLab From e5bf4de6b650a3a3a39a6a646391a223aec7da9f Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 26 Aug 2012 23:15:02 +0200 Subject: [PATCH 0121/5607] 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 0ced1da95d4..1d9765539bf 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. -- GitLab From d5c2b35b82b7c2c22bcc7d85c4d2f1fe0b810b3c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 27 Aug 2012 06:45:32 +0200 Subject: [PATCH 0122/5607] 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 f9424f4d614..e9e9961d1cd 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 00000000000..f947d796f18 --- /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; + } -- GitLab From 48c5ad011de914036c184d1ec0bd502482981e1f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:29:11 +0200 Subject: [PATCH 0123/5607] 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 94054894568..00000000000 --- 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 d69bd131774..14fb53a5a09 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 f2d6e28de4b..f9f942d6a18 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 {}; -- GitLab From 430e7454e9e89d0d1ff231309808b380ba35c50f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:29:36 +0200 Subject: [PATCH 0124/5607] 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 e5ed53a56a0..00000000000 --- 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 f9f942d6a18..c2e457bfe45 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; }; -- GitLab From 8ff755c5f395ee3f69bcbf72dd56566d3ee95847 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:48 +0200 Subject: [PATCH 0125/5607] 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 3642d402615..705a0a5fdea 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"; -- GitLab From 322b47e7209d7136e4c23b99db7da8e54bf11cd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:48 +0200 Subject: [PATCH 0126/5607] 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 da343a527ce..d8c492f23b6 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"; -- GitLab From e40f7b88e9444a7a186599d4c161aea13586a8ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:48 +0200 Subject: [PATCH 0127/5607] 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 f673f708707..65f39c8cc08 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"; -- GitLab From 6596fdf4d7434c485fe7de4aa2ea51c521e123f7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0128/5607] 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 ff65518e7f9..906c51fc072 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 = [ -- GitLab From d2b775d31c8651bb93841cf491f108cc3333f937 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0129/5607] 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 82a1e4d4c39..5d92b8178c1 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"; -- GitLab From bba0b43d0ff712a34b542ecb4f69ac2c04a9bb65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0130/5607] 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 82a96856ab8..85fe25f7d18 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"; -- GitLab From 3445b2cb0f97fead2ddfcc42130b94ca60ecca3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0131/5607] 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 77867472d66..4e6c7298b86 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 ]; -- GitLab From 38dda82cc1035ab16737a2922ca624fae7509747 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0132/5607] 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 7f01336f281..67159c2bcbf 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"; -- GitLab From 8782724875213c00ae6847500844eb2d9b8e2886 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0133/5607] 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 702e3383d34..2d46992ddab 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 ]; -- GitLab From 30637369188cd774f558fd8c57d5c71fa9e860f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0134/5607] 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 1c5cb92d47b..98438bbb3d2 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 ]; -- GitLab From 527dd9db069ce49233fe8e63b654f9ebbb7edc65 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:49 +0200 Subject: [PATCH 0135/5607] 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 7ed81b8d986..77bc9105193 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 ]; -- GitLab From da852fee50a105be6fafee787387ddc8001725a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:50 +0200 Subject: [PATCH 0136/5607] 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 d977fabb92c..de1fd4533ef 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 -- GitLab From 8cb967fb9582ca7be20fda8e05c90e25e53fe6d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Aug 2012 11:30:50 +0200 Subject: [PATCH 0137/5607] 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 85e6bb81533..df329ba1d90 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"; -- GitLab 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 0138/5607] 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 00000000000..f9c58857731 --- /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''; + }; +} + -- GitLab 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 0139/5607] 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 00000000000..e83824bd685 --- /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''; + }; +} -- GitLab 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 0140/5607] 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 ba29ea89a8c..31cbe85624d 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 { }; -- GitLab 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 0141/5607] 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 388972abd01..82238a55d1c 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 = -- GitLab From f4bc57febac5150a385165c6a9df054482f669ba Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 Aug 2012 12:41:13 -0400 Subject: [PATCH 0142/5607] 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 5f5148911ec..f243baab591 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 aa5b8ad39f5..090a1479741 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 -- GitLab 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 0143/5607] 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 e86177bb53c..e1cf5fee1cc 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 = { -- GitLab From 395718e927029cf18f77e4a63970890eb8a6931b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 12:22:41 -0400 Subject: [PATCH 0144/5607] 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 777cc72aa0b..9b1c36a788d 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 ''; -- GitLab From bacc6ab790cd05c7fa1360b87be321602e87a69d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 13:39:13 -0400 Subject: [PATCH 0145/5607] 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 5e4ea54c43f..f5b764783b4 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 9b1c36a788d..5ec551fc718 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 ''; }; - + }; - + } -- GitLab From 20de8c808658154a838d6519ecfa32f260b25fd7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 13:46:51 -0400 Subject: [PATCH 0146/5607] 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 f5b764783b4..1d41f89218b 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 5ec551fc718..8781fbf2d10 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" ]; }; -- GitLab From bc8b1376dae0f751a15f56e10cc8a4ef5bec124c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Aug 2012 14:02:39 -0400 Subject: [PATCH 0147/5607] 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 e173a270e88..e490a14bea6 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"; + }; } -- GitLab From 8c128db32e473115669a9955f16093f7ff605558 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 27 Aug 2012 14:15:57 -0400 Subject: [PATCH 0148/5607] 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 f01ae4a9c0b..02a8565a83d 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 = -- GitLab 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 0149/5607] 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 00000000000..eb34335721f --- /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 02a8565a83d..7cd66bbe7cb 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 { -- GitLab 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 0150/5607] 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 00000000000..f2f196acdd8 --- /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 7cd66bbe7cb..3922e569a3a 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 { }; -- GitLab 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 0151/5607] 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 1ef081c84d0..c74cd2b0d7d 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 00000000000..114726db19d --- /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; + } -- GitLab From 824b62a61a79a08fea6f31de6ceca67d2091faa4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:18:10 +0200 Subject: [PATCH 0152/5607] 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 00000000000..e89fc1d6faf --- /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 c2e457bfe45..87a6b8a2049 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 {}; -- GitLab From bf188b3fd290f56c3c87ae7126eda90eb881f6c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:28:51 +0200 Subject: [PATCH 0153/5607] 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 9c0efe3f05c..ee9d43966af 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"; -- GitLab From 7d889c6dfaefbb7631757773d04e0471b4a40ca4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:31:19 +0200 Subject: [PATCH 0154/5607] 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 d7e9498c968..8fffccd649a 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"; -- GitLab From 9bce51f6ec0730eb1160edcc51c4901061f8f0dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:34:15 +0200 Subject: [PATCH 0155/5607] 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 148750e9ddc..41d521805ce 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"; -- GitLab From dbe1ee0921832c000c81d5e22ca36d2ba9e92d88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0156/5607] 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 3a4c94e33a2..9eefaaef84a 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 = { -- GitLab From b61ed4a580adc1e26ff91cbeaccc925a00dc6c1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0157/5607] 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 90d6f4c274e..a6219a4b2a0 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; -- GitLab From 77cd02f766695843b2b703489e667ad824228192 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0158/5607] 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 60e795f6e2e..a90e8e769e2 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 ]; -- GitLab From c7a7caf7ab21660ae936d23f27a8955b40f12508 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0159/5607] 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 5fd552d6272..bc3eca3050d 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"; -- GitLab From cf4076daba72e39781dbc8ae2a316729b7427c38 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0160/5607] 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 6581ddf0e1a..d79f6faa3ef 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 ]; -- GitLab From e01aa340f6896ab5553397eb4b290b4069bd4f2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0161/5607] 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 0c4c610106e..3618f598055 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 ]; -- GitLab From 5bddcc2f21513b48e5a6f7a7b679798de284d61d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0162/5607] 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 881d4519a53..1feb21a8b63 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"; -- GitLab From 49a3481f5d6af2147ec500ee9ac0057cd12d9f1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0163/5607] 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 14d347f39f5..242f73e9b21 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"; -- GitLab From fda535b52defe398a182806dd7b90cfe1b31fed7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0164/5607] 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 98438bbb3d2..a80e911eefa 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"; -- GitLab From da00b344cf16b76c8d55cf62826917cd15933cc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:37:14 +0200 Subject: [PATCH 0165/5607] 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 219a83e1e96..66432d02f59 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 -- GitLab From def452861da8470fd7cd268bda67be1870301cc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 12:59:20 +0200 Subject: [PATCH 0166/5607] 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 1dd7c212c71..00000000000 --- 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 53e014fb8ac..00000000000 --- 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 776e452eafe..00000000000 --- 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 ad0df5c2cb0..00000000000 --- 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 462ee658fd2..00000000000 --- 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 9d9a4f07586..00000000000 --- 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 87a6b8a2049..1f06a00b64f 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. -- GitLab From aa583c8cf4702f8c071b89bb514d4caf453122f8 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 28 Aug 2012 14:40:24 +0200 Subject: [PATCH 0167/5607] 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 de6eccbec1f..63448847a15 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 835298ddb9e..04acb7632ea 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 = -- GitLab From b920bd538ae381f01ffe5baecac6c3dbdbe9bfa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:13:21 +0200 Subject: [PATCH 0168/5607] 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 16d9127e556..6319a60cedb 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; } -- GitLab From 919b35725521789e8f8606f4e711559453354b03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:13:34 +0200 Subject: [PATCH 0169/5607] 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 6319a60cedb..155d534c747 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; -- GitLab From 40fe2d03b5e294ba5456f34d55e1efd427ef942c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:14:03 +0200 Subject: [PATCH 0170/5607] 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 155d534c747..37a3869a733 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"; }; -- GitLab From 85350ca2d44fc272d893e566be3044920524d4e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:17:06 +0200 Subject: [PATCH 0171/5607] 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 37a3869a733..d505f459b9e 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; } -- GitLab From d7470b6c689b7384c30e20c87d0e81c857943c6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 28 Aug 2012 15:18:17 +0200 Subject: [PATCH 0172/5607] 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 d505f459b9e..a435eea8663 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]; -- GitLab 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 0173/5607] 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 b9d30409711..3af9bc7690f 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"; }; -- GitLab From aed5c366944b98624411c5551f2d43becafdf44d Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 29 Aug 2012 15:16:03 +0200 Subject: [PATCH 0174/5607] 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 0e7d688670f..b29d4300e71 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 = { -- GitLab From af6265e66dd24e12587157c01e9c9e1bad953f09 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:35:29 +0200 Subject: [PATCH 0175/5607] 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 00000000000..0f42e7cd040 --- /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 3922e569a3a..fda096dc487 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 {}; -- GitLab From 30514a53469c206677cff3313c2edf352bd5b2c4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:36:16 +0200 Subject: [PATCH 0176/5607] 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 00000000000..a7541932c6c --- /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 fda096dc487..e94767297d5 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 {}; -- GitLab From cb4443ef260926290184f8952070fab45b55a6dc Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:47:00 +0200 Subject: [PATCH 0177/5607] 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 00000000000..f14214f5a88 --- /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 e94767297d5..9c7f687e527 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 { }; -- GitLab From fadaad6f89cf7448088930473ac00ee53949dc63 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 28 Aug 2012 00:55:43 +0200 Subject: [PATCH 0178/5607] 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 f6709bb439f..39b7074e299 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 = '' -- GitLab From 23f20dcdfeca29cf4d1a1b226d2ddc42fcf2975e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 29 Aug 2012 22:57:57 +0200 Subject: [PATCH 0179/5607] 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 c15ff6afcb2..a253e25cad4 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 = { -- GitLab From 280fb5585d783f30c03049f5e01fee8c4e7d7e5b Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 29 Aug 2012 23:35:39 +0200 Subject: [PATCH 0180/5607] 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 a7541932c6c..bc7a8c893f8 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 f14214f5a88..cba5d910783 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; }; } -- GitLab 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 0181/5607] 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 9b39d8e8f1f..a811d759f7e 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 = { -- GitLab From b54e608807b25e0c388f07276a9a7a7a0e24bd7a Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 08:33:10 +0200 Subject: [PATCH 0182/5607] 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 bc7a8c893f8..c1b6d0e67e7 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; }; } -- GitLab From 7e8240d71ba9087033773da09fa6077ff144bdb3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 10:11:23 +0200 Subject: [PATCH 0183/5607] 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 00000000000..eca99a8c440 --- /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 1f06a00b64f..20466090324 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 {}; -- GitLab From 59180564d58d8c0cc9c019b9f51ad153878f2f9f Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 30 Aug 2012 11:07:45 +0200 Subject: [PATCH 0184/5607] 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 0dfb0be96f9..539588ac3ad 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)"; -- GitLab From 69e307a2e3df07e82d60d695798929d090323517 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 30 Aug 2012 11:56:33 +0200 Subject: [PATCH 0185/5607] 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 20466090324..908d6857794 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 -- GitLab From 70acc59794a2b59d1e4f5c992f7b1490846dbd0f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0186/5607] 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 d0258fd2698..90bcb9f8605 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 ]; -- GitLab From 60ae16e0aa26350bef58754744ad589635e9a6fa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0187/5607] 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 4e6c7298b86..7986ef07c1e 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 ]; -- GitLab From 45485db6239440ebefdfabb9ec8a0697df0e26e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0188/5607] 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 e118f765097..c568b292c3c 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 -- GitLab From d11f3d5551b613b4e6c87749c69a8bcd15c2c1e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0189/5607] 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 ee9d43966af..eef0a2b5259 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"; -- GitLab From 9ffc9076dcf2a4f486989a62227855bf3f4b0cac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0190/5607] 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 28b5c0dec85..3e3a1b7dbfd 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 -- GitLab From 7638637b68c58dbbec1434711dd7b1d809a0a351 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0191/5607] 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 1f1a45d4245..e0615469ab7 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 ]; -- GitLab From 410ba4ee200ae7e3aafafe6a02f0bbd779f920d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Aug 2012 13:02:00 +0200 Subject: [PATCH 0192/5607] 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 731722126ca..382a940408f 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 = [ -- GitLab From 50400e345c130d223c1671483f7838445f2c72db Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 30 Aug 2012 14:07:47 +0200 Subject: [PATCH 0193/5607] 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 b29d4300e71..83f7c62c426 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 ''; -- GitLab From a23f6dc4c47d1427f307b1d7459c724b2d675eec Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Thu, 30 Aug 2012 14:27:03 +0200 Subject: [PATCH 0194/5607] 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 83f7c62c426..e3463c6a1d4 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 ''; -- GitLab 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 0195/5607] 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 b8f88c6f5b8..961387012c6 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 ""} ''; -- GitLab From 8f1a34e2282cf4fe69c7bd5f111fdc2ac34c0440 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:01 +0200 Subject: [PATCH 0196/5607] 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 8e347595f22..62cf4998536 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; -- GitLab From 6fabe047c6acdfbfad50808970d72850a47b8724 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:18 +0200 Subject: [PATCH 0197/5607] 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 7d421af4917..c57a409810e 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; -- GitLab From 50dca38b26b00a0e88cbaa2929c9f7c0db04d389 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 17:39:50 +0200 Subject: [PATCH 0198/5607] 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 63eafb93e30..9e761b90a05 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; }; } -- GitLab From d37b642769023232787f217f64d6c594ed49618d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 30 Aug 2012 18:04:55 +0200 Subject: [PATCH 0199/5607] 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 c57a409810e..8b0e3e0d8a2 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 62cf4998536..61d6b0aeba5 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"] -- GitLab 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 0200/5607] 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 961387012c6..93f5dab537e 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 ""} ''; -- GitLab From 702854cb5dd1d4a6ee3c3a2251a59b6c481e15f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Aug 2012 09:10:18 +0200 Subject: [PATCH 0201/5607] 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 81815500c61..f1964e815f6 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 ]; -- GitLab From 30ba367d5a9450f57c71085061651abeac1dd191 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:21:13 +0400 Subject: [PATCH 0202/5607] 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 00000000000..99146cd02cc --- /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 9c7f687e527..4b28b19053f 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 -- GitLab From d41c08ee5410f0e7435c85c4fb24113ac41c02cf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:25:30 +0400 Subject: [PATCH 0203/5607] 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 00000000000..484f878a55e --- /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 4b28b19053f..74f7b0a1236 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 { }; -- GitLab From 34bafa4893df4aaf18538155711b24ce191400a6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:30:15 +0400 Subject: [PATCH 0204/5607] 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 00000000000..823a4839e80 --- /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 74f7b0a1236..099261ab5b4 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; }; -- GitLab From 28f0597bd60378b9b323d0b31799bf07f64d0a4e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:31:26 +0400 Subject: [PATCH 0205/5607] 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 00000000000..72460184df2 --- /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 00000000000..80e49a8e712 --- /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 00000000000..f5f44a7fa2c --- /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 00000000000..899411fe02b --- /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 099261ab5b4..75c286b965b 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 -- GitLab From 38d07f50183afbe49d1fcb953413c252807fd1b5 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 30 Aug 2012 00:35:30 +0400 Subject: [PATCH 0206/5607] 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 00000000000..ff06f2a0050 --- /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 75c286b965b..7a0b578eb58 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"; -- GitLab From c5f9ee33259fd94ef81c672e50a2f69999cb9a29 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:01:57 +0400 Subject: [PATCH 0207/5607] 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 00000000000..a75fada7484 --- /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 00000000000..0be4ffdc93a --- /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 7a0b578eb58..9bc56479723 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 {}; -- GitLab From f15e95a8913ee4b57dad2d2c65fe5e16ea593aae Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 26 Aug 2012 23:05:40 +0400 Subject: [PATCH 0208/5607] 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 f598482f830..63d698dda18 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 = { -- GitLab From dd45319df1a6a9699b20aeed587b51a96c39558e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:05:47 +0400 Subject: [PATCH 0209/5607] 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 ad553c9db34..a60ecdcb866 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 00000000000..57a5ec46b84 --- /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) -- GitLab From 7d8aa35a0703e493dc7f1bc0ff71730248c463e2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:06:48 +0400 Subject: [PATCH 0210/5607] 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 791b73c9c78..4a46de14f9b 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; -- GitLab From f1a2d031e56c03d746736454c4df9a86d3ba9922 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:07:09 +0400 Subject: [PATCH 0211/5607] 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 938a26fd785..c4d2f4b3782 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 -- GitLab From c2ad9f873d6ac0d59dd826166185fa1f096a15b2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:07:22 +0400 Subject: [PATCH 0212/5607] 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 ca272504517..9e8024d7b19 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 = { -- GitLab From 97c6a2fd4ff73f9ab33ae748bdbd98a5e692ff6d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:08:04 +0400 Subject: [PATCH 0213/5607] 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 9b27a3e2379..44ffdf57db5 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 ]; -- GitLab From ebf190e793e17d8b9ee81bba1cadd10adbc39312 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:08:31 +0400 Subject: [PATCH 0214/5607] 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 b64338adaf1..152246ee58f 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"; -- GitLab From 834884ae7b50e0d753ee009c27227fbf5f43f6ca Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:09:11 +0400 Subject: [PATCH 0215/5607] 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 d8620eb33cd..b518e9c7456 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 = { -- GitLab From db81ec42420ce143719ee96ee988d7dc34919fc8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:09:38 +0400 Subject: [PATCH 0216/5607] 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 2fe4b4d0bdc..0bc7476dc82 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; }; } -- GitLab From 7a9def28299abcbeb03161abfba53f71ca486944 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 31 Aug 2012 12:11:41 +0400 Subject: [PATCH 0217/5607] 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 | 152 +++-- 3 files changed, 389 insertions(+), 373 deletions(-) diff --git a/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/openoffice/generate-libreoffice-srcs.sh index 1d751ec7049..fb8cc816114 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 0218/5607] 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 92b4da5280a..249ede5ebd0 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 10aa4c02028..367987d5dee 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 ]; -- GitLab From 1de042802022f15c6a359ad5fff9411022f4854f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 8 Aug 2012 13:47:10 +0400 Subject: [PATCH 0219/5607] 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 5f15cbc495f..b408f20b711 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 2998b392679..00000000000 --- 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 1f50f1b976b..083fbf13c81 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 ]; -- GitLab From abf6366f87efa94138c034a4e138a78ed01127e0 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 31 Aug 2012 10:55:23 +0200 Subject: [PATCH 0220/5607] 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 00000000000..6fcc031aab4 --- /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 9bc56479723..90d526a929d 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; }; -- GitLab 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 0221/5607] 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 90d526a929d..473c6a00393 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 -- GitLab From 66bb38cce3c8498ff9135a46566f7b645953e53d Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 31 Aug 2012 12:25:53 +0200 Subject: [PATCH 0222/5607] 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 637d53b06f7..d76215961f2 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"; -- GitLab From addbf658e5d793e23da7935c6e8a7ed448a3bfa4 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 31 Aug 2012 16:01:19 +0200 Subject: [PATCH 0223/5607] 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 e3463c6a1d4..4ee6a84548b 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 ]; }; } -- GitLab From c98559a6fc7012cc556c0bca32f23ec01f16dd1f Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 31 Aug 2012 16:02:10 +0200 Subject: [PATCH 0224/5607] 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 4ee6a84548b..5e684cfa377 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" ]; -- GitLab From fbbaf6759d869216d7c1eccf7dffd93378734e16 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 31 Aug 2012 23:22:04 +0200 Subject: [PATCH 0225/5607] 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 ff199791bba..5e9724b939c 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."; -- GitLab 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 0226/5607] 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 34ec8eed90e..3cd35073be6 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)"; -- GitLab 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 0227/5607] 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 00000000000..54903496391 --- /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 5a027d3dffe..7994649cfe4 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; -- GitLab 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 0228/5607] 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 ba6b65d602b..b2210141f57 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"; }; -- GitLab 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 0229/5607] 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 54903496391..186f9602f0a 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 = { -- GitLab From ac8dd727d077120099db60a40d768c32de74a6f7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 1 Sep 2012 21:36:46 +0200 Subject: [PATCH 0230/5607] 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 5e9724b939c..a3f255b5d3e 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."; -- GitLab 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 0231/5607] 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 2f257fccc52..f59bb2cac40 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`) -- GitLab 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 0232/5607] 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 186f9602f0a..54903496391 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 d8e192a6e55..68c387d2a55 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; -- GitLab From 7672f20121383656e1950c49af8960f8e4fd72d8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Sep 2012 21:23:38 +0200 Subject: [PATCH 0233/5607] 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 d1a4bf9feb6..4328eb36b6d 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 = { -- GitLab From 8277c18b5395a0a3329230d63a67746a96665917 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 1 Sep 2012 21:53:58 +0200 Subject: [PATCH 0234/5607] 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 69a0a7efde8..57afefd7dcd 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 = '' -- GitLab From 14c808baa782aac052ebf62dc35ca6e7250af19a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:18:13 +0200 Subject: [PATCH 0235/5607] 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 00000000000..b58152f7c24 --- /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 908d6857794..eea0ea7adb0 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 { -- GitLab From 267e268a31afae7d23dd93579374fa8f28eaf719 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:19:16 +0200 Subject: [PATCH 0236/5607] 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 00000000000..6f7b57ba64c --- /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 eea0ea7adb0..cce03161d4e 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 {}; -- GitLab From 1637d95fffc6411cefdc9ed1faba088cce09a7ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:19:35 +0200 Subject: [PATCH 0237/5607] 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 00000000000..a460dcbdafc --- /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 cce03161d4e..f90e16abe02 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 {}; -- GitLab From e9abf1899a70b3c9420b57edf1779a29cbc2bc37 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:10 +0200 Subject: [PATCH 0238/5607] 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 644406ae1ec..de2e40a03d5 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 efc2936f406..a02697be7c2 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"; -- GitLab From f11475eaa8c33068139e73e62f6d3e0bf4753e08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0239/5607] 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 38b0bf24bcb..0719bf5a03c 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 ]; -- GitLab From 1505130da1cbe6a2a4088ead5ba784858bfebf12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0240/5607] 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 71afad2cdbc..299b2e926db 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; -- GitLab From 02d27b8a026b86a9bf2fcf5432830f27dc180696 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0241/5607] 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 14c125121bd..bc99a88895b 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 -- GitLab From 40431dfcd4631a2d9ab364a98af4118fec215ff3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 14:20:15 +0200 Subject: [PATCH 0242/5607] 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 d440d942277..2154aa347d2 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 = [ -- GitLab 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 0243/5607] 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 8cbaa37553e..47630e5cfdf 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 6df0c3a7d25..b45ac5dd309 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 -- GitLab 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 0244/5607] 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 b45ac5dd309..d336266ccaf 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" -- GitLab 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 0245/5607] 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 2484be9ae1f..c1b607b725b 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 -- GitLab 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 0246/5607] 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 7fa9a62e5e3..097dde325f1 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 ]; -- GitLab From 264c528154364841730d9ab29128effb0da674e8 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 4 Sep 2012 12:02:18 +0200 Subject: [PATCH 0247/5607] 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 9a3d0a7deb4..2654fd513e5 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 -- GitLab From 286d068b37be4f76d546328b7fedf4f3d82acbc5 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 4 Sep 2012 14:34:31 +0200 Subject: [PATCH 0248/5607] 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 4a268cac645..bbc868910f5 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 ]; -- GitLab 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 0249/5607] 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 a625de6ffdc..a5042ffc7d4 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'. -- GitLab From b3c63a98f079fbcad2fa44b57c8edc8916362ba4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 4 Sep 2012 16:14:01 +0200 Subject: [PATCH 0250/5607] 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 dc63dd68503..47729a1b4ba 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 8ed91d9a8c8..30b5ad247d1 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 9d2cd0ef16b..6dae036b338 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 2651e2a1eee..dddbbb4a19e 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. -- GitLab From 2b8d80d22d28393f0bc743b266bad9b3a9dc2cc5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 00:40:05 +0200 Subject: [PATCH 0251/5607] 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 fb4de650ee0..d3829bc9d11 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 -- GitLab From 39760a2ad6cdb5a6ad9d657b6c64e3f349dc9fb5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 00:45:17 +0200 Subject: [PATCH 0252/5607] 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 8cc212deee4..ce4421f9ca7 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."; -- GitLab From df82c942635c045658ea618438d8b433f79348c9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 13:46:54 +0200 Subject: [PATCH 0253/5607] node-packages: introduced alphabet --- pkgs/top-level/node-packages.nix | 338 +++++++++++++++---------------- 1 file changed, 169 insertions(+), 169 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 0ab4306cca0..ae468d95eac 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -5,87 +5,74 @@ let self = { inherit stdenv nodejs; }; - "coffee-script" = self."coffee-script-1.3.3"; + "abbrev" = self."abbrev-1"; - "coffee-script-1.3.3" = self.buildNodePackage rec { - name = "coffee-script-1.3.3"; + "abbrev-1" = self.buildNodePackage rec { + name = "abbrev-1.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; - sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; + url = "http://registry.npmjs.org/abbrev/-/${name}.tgz"; + sha256 = "d444c07f411418828a5e81ac85569afe638e6441a562086faa0209ec7bdf55f2"; }; deps = [ ]; }; - "semver" = self."semver-1"; + "ansi" = self."ansi-~0.1.2"; - "semver-1" = self.buildNodePackage rec { - name = "semver-1.0.14"; + "ansi-~0.1.2" = self.buildNodePackage rec { + name = "ansi-0.1.2"; src = fetchurl { - url = "http://registry.npmjs.org/semver/-/${name}.tgz"; - sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; + url = "http://registry.npmjs.org/ansi/-/${name}.tgz"; + sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; }; deps = [ ]; }; - "npm2nix" = self."npm2nix-0.1.2"; + "block-stream" = self."block-stream-*"; - "npm2nix-0.1.2" = self.buildNodePackage rec { - name = "npm2nix-0.1.2"; + "block-stream-*" = self.buildNodePackage rec { + name = "block-stream-0.0.6"; src = fetchurl { - url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; - sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; - name = "${name}.tgz"; + url = "http://registry.npmjs.org/block-stream/-/${name}.tgz"; + sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; }; deps = [ - self."semver-1" + self."inherits-~1.0.0" ]; }; - "mkdirp" = self."mkdirp-0.3"; + "coffee-script" = self."coffee-script-1.3.3"; - "mkdirp-0.3" = self.buildNodePackage rec { - name = "mkdirp-0.3.4"; + "coffee-script-1.3.3" = self.buildNodePackage rec { + name = "coffee-script-1.3.3"; src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; - sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "deedd2cf9d5abe2bad724e6809bec40efa07215dae85f44d78cd37736bb50bc5"; }; 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"; + "fstream" = self."fstream-~0.1.13"; - "graceful-fs-1" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "fstream-~0.1.8" = self.buildNodePackage rec { + name = "fstream-0.1.18"; src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + 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" = self."fstream-~0.1.13"; - "fstream-~0.1.13" = self.buildNodePackage rec { name = "fstream-0.1.18"; src = fetchurl { @@ -100,259 +87,272 @@ let self = { ]; }; - "npmlog" = self."npmlog-0"; + "glob" = self."glob-3"; - "npmlog-0" = self.buildNodePackage rec { - name = "npmlog-0.0.2"; + "glob-3" = self.buildNodePackage rec { + name = "glob-3.1.12"; src = fetchurl { - url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; - sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; + url = "http://registry.npmjs.org/glob/-/${name}.tgz"; + sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; }; deps = [ - self."ansi-~0.1.2" + self."minimatch-0.2" + self."graceful-fs-~1.1.2" + self."inherits-1" ]; }; - "osenv" = self."osenv-0"; + "graceful-fs" = self."graceful-fs-1"; - "osenv-0" = self.buildNodePackage rec { - name = "osenv-0.0.3"; + "graceful-fs-1" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; src = fetchurl { - url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; - sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; }; deps = [ ]; }; - "node-gyp" = self."node-gyp-*"; - - "node-gyp-*" = self.buildNodePackage rec { - name = "node-gyp-0.6.8"; + "graceful-fs-~1.1" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; src = fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/${name}.tgz"; - sha256 = "b40064d825c492c544389812ecea2089606c31cbe4f3ee9e68048ea56a9aed4d"; + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; }; 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"; + "graceful-fs-~1.1.2" = self.buildNodePackage rec { + name = "graceful-fs-1.1.10"; src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; - sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; + url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; + sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; }; deps = [ - self."graceful-fs-~1.1" + ]; }; - "minimatch" = self."minimatch-0.2"; + "inherits" = self."inherits-1"; - "minimatch-0.2" = self.buildNodePackage rec { - name = "minimatch-0.2.6"; + "inherits-1" = self.buildNodePackage rec { + name = "inherits-1.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; - sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; }; deps = [ - self."lru-cache-~2.0.0" + ]; }; - "glob" = self."glob-3"; - - "glob-3" = self.buildNodePackage rec { - name = "glob-3.1.12"; + "inherits-1.x" = self.buildNodePackage rec { + name = "inherits-1.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/glob/-/${name}.tgz"; - sha256 = "a37c02e9a91915fe4e3232229676e842803151dde831d1046620ec96118f6036"; + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; }; 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"; + "inherits-~1.0.0" = self.buildNodePackage rec { + name = "inherits-1.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/tar/-/${name}.tgz"; - sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; + url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; + sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; }; deps = [ - self."inherits-1.x" - self."block-stream" - self."fstream-~0.1.8" + ]; }; - "which" = self."which-1"; + "lru-cache" = self."lru-cache-~2.0.0"; - "which-1" = self.buildNodePackage rec { - name = "which-1.0.5"; + "lru-cache-~2.0.0" = self.buildNodePackage rec { + name = "lru-cache-2.0.1"; src = fetchurl { - url = "http://registry.npmjs.org/which/-/${name}.tgz"; - sha256 = "e26f39d7b152c700636472ab4da57bfb9af17972c49a9e2a06f9ff347d8fad42"; + url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; + sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; }; deps = [ ]; }; - "abbrev" = self."abbrev-1"; + "mkdirp" = self."mkdirp-0.3"; - "abbrev-1" = self.buildNodePackage rec { - name = "abbrev-1.0.3"; + "mkdirp-0.3" = self.buildNodePackage rec { + name = "mkdirp-0.3.4"; src = fetchurl { - url = "http://registry.npmjs.org/abbrev/-/${name}.tgz"; - sha256 = "d444c07f411418828a5e81ac85569afe638e6441a562086faa0209ec7bdf55f2"; + url = "http://registry.npmjs.org/mkdirp/-/${name}.tgz"; + sha256 = "f87444f2376c56bf47846f3b885aae926c5d9504328923b166794b78c0e08425"; }; deps = [ ]; }; - "graceful-fs-~1.1.2" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "minimatch" = self."minimatch-0.2"; + + "minimatch-0.2" = self.buildNodePackage rec { + name = "minimatch-0.2.6"; src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + url = "http://registry.npmjs.org/minimatch/-/${name}.tgz"; + sha256 = "f0030112575a815ff304fa3bc64ee7e60ab8bfddb281602bc37eca0cddd48350"; }; deps = [ - + self."lru-cache-~2.0.0" ]; }; - "request" = self."request-2.9"; + "node-gyp" = self."node-gyp-*"; - "request-2.9" = self.buildNodePackage rec { - name = "request-2.9.203"; + "node-gyp-*" = self.buildNodePackage rec { + name = "node-gyp-0.6.8"; src = fetchurl { - url = "http://registry.npmjs.org/request/-/${name}.tgz"; - sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; + 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" ]; }; - "inherits-~1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; + "nopt" = self."nopt-2"; + + "nopt-2" = self.buildNodePackage rec { + name = "nopt-2.0.0"; src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + url = "http://registry.npmjs.org/nopt/-/${name}.tgz"; + sha256 = "112e9bea8b745a2e5a59d239e6f6f02e720e080ab8cdca89b6b8f0143ae718b5"; }; deps = [ - + self."abbrev-1" ]; }; - "ansi" = self."ansi-~0.1.2"; + "npm2nix" = self."npm2nix-0.1.2"; - "ansi-~0.1.2" = self.buildNodePackage rec { - name = "ansi-0.1.2"; + "npm2nix-0.1.2" = self.buildNodePackage rec { + name = "npm2nix-0.1.2"; src = fetchurl { - url = "http://registry.npmjs.org/ansi/-/${name}.tgz"; - sha256 = "6f2288b1db642eb822578f4ee70bf26bf97173cc7d3f10f496070fb96250006b"; + url = https://bitbucket.org/shlevy/npm2nix/get/0.1.2.tar.gz; + sha256 = "0wmgdbjvvwqv47113xdipzkmdafsca9av1s0fq605jf97wrpvbw3"; + name = "${name}.tgz"; }; deps = [ - + self."semver-1" ]; }; - "block-stream" = self."block-stream-*"; + "npmlog" = self."npmlog-0"; - "block-stream-*" = self.buildNodePackage rec { - name = "block-stream-0.0.6"; + "npmlog-0" = self.buildNodePackage rec { + name = "npmlog-0.0.2"; src = fetchurl { - url = "http://registry.npmjs.org/block-stream/-/${name}.tgz"; - sha256 = "2fc365b42b8601c8ee150d453f6cc762a01054b7fb28bdfcfcbce7c97e93601b"; + url = "http://registry.npmjs.org/npmlog/-/${name}.tgz"; + sha256 = "ce98d4d3380390c0259695cce407e2e96d2970c5caee1461a62ecbd38e8caed4"; }; deps = [ - self."inherits-~1.0.0" + self."ansi-~0.1.2" ]; }; - "lru-cache" = self."lru-cache-~2.0.0"; + "osenv" = self."osenv-0"; - "lru-cache-~2.0.0" = self.buildNodePackage rec { - name = "lru-cache-2.0.1"; + "osenv-0" = self.buildNodePackage rec { + name = "osenv-0.0.3"; src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/${name}.tgz"; - sha256 = "3b4fd68f0bd75f5abf69e349b6ffa918bfe4990ff36d2d88dc74f334a9ed627e"; + url = "http://registry.npmjs.org/osenv/-/${name}.tgz"; + sha256 = "aafbb23637b7338c9025f9da336f31f96674d7926c30f209e4d93ce16d5251c4"; }; deps = [ ]; }; - "graceful-fs-~1.1" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "request" = self."request-2.9"; + + "request-2.9" = self.buildNodePackage rec { + name = "request-2.9.203"; src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/${name}.tgz"; - sha256 = "1f9b7da8b0c75db49e0e5d2aaecc6f1dd3fca2bdbb2aecf95d1dbdec7f0cee24"; + url = "http://registry.npmjs.org/request/-/${name}.tgz"; + sha256 = "2af8f83a63c7227383fbdd6114e470e0921af86a037c4e82f42883120f35f836"; }; deps = [ ]; }; - "inherits" = self."inherits-1"; + "rimraf" = self."rimraf-2"; - "inherits-1" = self.buildNodePackage rec { - name = "inherits-1.0.0"; + "rimraf-2" = self.buildNodePackage rec { + name = "rimraf-2.0.2"; src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + url = "http://registry.npmjs.org/rimraf/-/${name}.tgz"; + sha256 = "3efcc60c9f6715a8746f3e0b82770468247f3e256778ef20733f334377392ab0"; }; deps = [ - + self."graceful-fs-~1.1" ]; }; - "inherits-1.x" = self.buildNodePackage rec { - name = "inherits-1.0.0"; + "semver" = self."semver-1"; + + "semver-1" = self.buildNodePackage rec { + name = "semver-1.0.14"; src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + url = "http://registry.npmjs.org/semver/-/${name}.tgz"; + sha256 = "560df522ae0e8834d8b07f6ca9c60bd8836e844642361abde108018cbe9ca82f"; }; deps = [ ]; }; - "fstream-~0.1.8" = self.buildNodePackage rec { - name = "fstream-0.1.18"; + "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/fstream/-/${name}.tgz"; - sha256 = "fd5791dd0ce8d7b707fa171ac5bd482e09f80cd09ec8176b45d547416893372d"; + url = "http://registry.npmjs.org/tar/-/${name}.tgz"; + sha256 = "fdf79b5e172badf924a12b501686e5cbf33c3ec7631eccc29c0e3e9fdcbb5ffe"; }; deps = [ - self."rimraf-2" - self."mkdirp-0.3" - self."graceful-fs-~1.1.2" - self."inherits-~1.0.0" + 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 = [ + ]; }; }; -- GitLab From 278312a38cdf0735957eefb8354627fd5191f9b4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 17:46:32 +0200 Subject: [PATCH 0254/5607] 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 ae468d95eac..ee05b92a255 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 { -- GitLab From b78b5b3f3630856180fe2ba7c39eb364cc0ce602 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 4 Sep 2012 17:47:42 +0200 Subject: [PATCH 0255/5607] 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 ee05b92a255..82d6b65ee48 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" + + ]; + }; + + "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-~0.1.13" = self.buildNodePackage rec { + "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,42 +358,38 @@ let self = { ]; }; - "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 = [ - - ]; - }; + "hat" = self."hat-0.0.3"; - "graceful-fs-~1.1.2" = self.buildNodePackage rec { - name = "graceful-fs-1.1.10"; + "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 = [ ]; }; - "inherits" = self."inherits-1"; + "hiredis" = self."hiredis-*"; - "inherits-1" = self.buildNodePackage rec { - name = "inherits-1.0.0"; + "hiredis-*" = self.buildNodePackage rec { + name = "hiredis-0.1.14"; src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; - sha256 = "2be196fa6bc6a0c65fecd737af457589ef88b22a95d5dc31aab01d92ace48186"; + url = "http://registry.npmjs.org/hiredis/-/${name}.tgz"; + sha256 = "9d7ce0a7ae81cf465a0c26c07fb618b6ffd98ca344f14369114abf548d75637a"; }; deps = [ ]; }; - "inherits-1.x" = self.buildNodePackage rec { + "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.0.0" = self.buildNodePackage rec { name = "inherits-1.0.0"; src = fetchurl { url = "http://registry.npmjs.org/inherits/-/${name}.tgz"; @@ -169,11 +400,13 @@ let self = { ]; }; - "inherits-~1.0.0" = self.buildNodePackage rec { - name = "inherits-1.0.0"; + "less" = self."less-1.3.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 -- GitLab From 314af2262c3980f67b061a86c8396116102d7c5b Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Tue, 4 Sep 2012 12:39:40 -0400 Subject: [PATCH 0256/5607] =?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 00000000000..162423dbc05 --- /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 f01ae4a9c0b..471de6cab5d 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 { }; -- GitLab From 0bf2161b03437b288a326efa84150a4a1b7a6ccb Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 5 Sep 2012 01:04:14 +0200 Subject: [PATCH 0257/5607] 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 bd697d761e0..4f4d235008b 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"; -- GitLab From 7fbf92d8f91063250bacf400392eaf3f2ece473d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 5 Sep 2012 12:22:03 -0400 Subject: [PATCH 0258/5607] 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 82d6b65ee48..7c083c7e0ee 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 = [ -- GitLab From 8ffc870e78198acbb4f8dd36c4cbcf527fe4bb0d Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 8 Aug 2012 00:53:05 +0200 Subject: [PATCH 0259/5607] 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 20d64ff11e4..88cfccf24a3 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 { }; -- GitLab From 843053d7a7b228db7784e4e5bb7778763cdb5397 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 5 Sep 2012 18:34:54 +0000 Subject: [PATCH 0260/5607] 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 00000000000..ad0df5c2cb0 --- /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 f90e16abe02..6df630f62d5 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 {}; -- GitLab From 38a844e0e9ae256c41185e818b1af38ea7cc3840 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 5 Sep 2012 18:37:35 +0000 Subject: [PATCH 0261/5607] 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 00000000000..f0a786e55f0 --- /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 6df630f62d5..10d925aea42 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 {}; -- GitLab From d4145f4f7dcbda697cb4cad37f46ab194c2f2d29 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Wed, 5 Sep 2012 18:38:07 +0000 Subject: [PATCH 0262/5607] 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 00000000000..c625fc44479 --- /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 10d925aea42..61f1a86deec 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 {}; -- GitLab From 116a96b7a43258e377ea3e7caaddb9bc95775ac2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 15:46:22 +0200 Subject: [PATCH 0263/5607] 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 f0a786e55f0..0e7a5413fa2 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 61f1a86deec..5e3b80c4b93 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 {}; -- GitLab From d9f3317942fbea79ed0643ef1f2b28ddb0df9098 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 15:47:03 +0200 Subject: [PATCH 0264/5607] 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 ad0df5c2cb0..00000000000 --- 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 5e3b80c4b93..b45db385e59 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 {}; -- GitLab 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 0265/5607] 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 9b1c9892cbf..bdbb53d1675 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 ]; -- GitLab From b6f5f5976a9fbf4d0c6be830971b54f2c54f3079 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 21:31:10 +0200 Subject: [PATCH 0266/5607] 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 d061495b176..1f99a02f429 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 -- GitLab From 33bf9644cf2227583bac023c86549e229ba80eb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 21:31:28 +0200 Subject: [PATCH 0267/5607] 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 16f62ad50ec..86c8e9717b1 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"; }; -- GitLab From 14da2bf31b4bc29e729f265b6e863b7209e67758 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 3 Sep 2012 21:33:33 +0200 Subject: [PATCH 0268/5607] 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 066b5a50913..b48c5f05d9e 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 ]; -- GitLab From 52e5b8e2c5da64dc5b7a36943127da5403b33285 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 18:32:59 +0200 Subject: [PATCH 0269/5607] 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 0a028660f7f..86fad985b9a 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 -- GitLab From 94da2e30ddf180cd22436da2627f220476c67b0d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 18:34:18 +0200 Subject: [PATCH 0270/5607] 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 86fad985b9a..ac171b2ff81 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 -- GitLab From ef649da11977556dce3cf0498f508b999dfe08f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 18:46:54 +0200 Subject: [PATCH 0271/5607] 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 2654fd513e5..dfdc50cd827 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 -- GitLab From a9da133fdadf212b055c63e0b9f377f564775943 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Sep 2012 14:35:05 +0200 Subject: [PATCH 0272/5607] 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 00000000000..8b040dd8647 --- /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 88cfccf24a3..4c6f65ff841 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 { }; -- GitLab From 28a725fcbed7e6360734e1701d76d2e294b742f5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:08:37 +0200 Subject: [PATCH 0273/5607] 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 30c91d3d905..6014f582467 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 693e0587a0b..b8aed94bb0b 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 fcfbbe19d94..6aec229f529 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 dbbfc3d3855..3f984c377dd 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 ]; } -- GitLab From 882289a583c11ec38d64d4509431e81a42b95177 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:20:31 +0200 Subject: [PATCH 0274/5607] 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 00000000000..d8bea7f14e3 --- /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 4c6f65ff841..4201d879ac8 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 { }; -- GitLab From d058ae5b0bafd2aa7a4075c9f09409b5a9a7329e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:26:37 +0200 Subject: [PATCH 0275/5607] 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 6014f582467..8bf7b44de9c 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/"; -- GitLab From 5d159722787ea2fab471e427306ed4b371e95576 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:41:40 +0200 Subject: [PATCH 0276/5607] 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 8bf7b44de9c..56672dee33f 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/"; -- GitLab From 5b59bb4d2850e09272d653020ff9efe681b41d57 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:44:54 +0200 Subject: [PATCH 0277/5607] 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 c361f3270e6..236f03ffba6 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]; } -- GitLab From bf72d46084d6cefea3c3c131ae380dee0361e9ea Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:49:15 +0200 Subject: [PATCH 0278/5607] 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 56672dee33f..6d0036c39b3 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; }; } -- GitLab From e18227378a3983dc1f23cc67fc6798c3a50ebb9f Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:51:56 +0200 Subject: [PATCH 0279/5607] 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 236f03ffba6..b46133e433e 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; + }; } -- GitLab From c544eb4c713caff1faa92312a2c45fa0aa3cbbcf Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:55:17 +0200 Subject: [PATCH 0280/5607] 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 6d0036c39b3..3b6547a8be9 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; -- GitLab From 36947c89570c06630a295a4b021619a577c2a033 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:02:57 +0200 Subject: [PATCH 0281/5607] 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 3b6547a8be9..03a98cb2059 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"'"@ -- GitLab From ce1c6fe0fd2cdd2dbfcf7e5ff85abf58d1a973d3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:23:54 +0200 Subject: [PATCH 0282/5607] 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 dc88f887cc7..87f9298706e 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"; -- GitLab From ae32dd91d4fdf83aa259e58cf2e4e36ce06ca30e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:30:44 +0200 Subject: [PATCH 0283/5607] 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 060aa3b5a6b..48755065b99 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 = { -- GitLab From bd130c34ec81a9b14c9a2d7d7f2beb610f35a26c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:31:52 +0200 Subject: [PATCH 0284/5607] 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 b8aed94bb0b..31dc885bc43 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; + }; } -- GitLab From 1ca55953fc8569293f1c4841253bc40a02a5eac5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:34:50 +0200 Subject: [PATCH 0285/5607] 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 6aec229f529..12bbe0914e0 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; + }; } -- GitLab From 4f1b8117f33de8de4291293cdb0adb7ababd0fae Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 06:38:25 +0200 Subject: [PATCH 0286/5607] 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 3f984c377dd..278fed37514 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; + }; } -- GitLab From 09c3613d4a3e97e957f08610c437707905b0a7c8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 13:27:20 +0200 Subject: [PATCH 0287/5607] 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 35f05e9d009..6fe31c63178 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 ]; -- GitLab From 3ab9e5a38af32ddfc6f793271e38e0550155be66 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 13:27:32 +0200 Subject: [PATCH 0288/5607] 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 d175c5f0478..68075d115a4 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"; -- GitLab From d9aac705bbb574888ea49c670495589d89702014 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 13:54:20 +0200 Subject: [PATCH 0289/5607] 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 522478ed5b7..f947bc9a1e7 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"; }) ]; -- GitLab From c1c9c9d2a127c76e6bdb8dc0c488f05247aa06e5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 14:21:24 +0200 Subject: [PATCH 0290/5607] 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 f7aab9fb4f2..eec7361f6a2 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 ]; -- GitLab From 3de1a56a73467206c87e36c808b0b8ac22dc48a3 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 15:04:47 +0200 Subject: [PATCH 0291/5607] 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 39f92d99b7f..f13a1033f8b 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"; -- GitLab From d7f89b207584f4e8f4310787b16542040de52197 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 7 Sep 2012 15:07:07 +0200 Subject: [PATCH 0292/5607] 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 4c6f65ff841..ffa151e98fc 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 { }; -- GitLab From 071d685dda26a31f43a3278c94ec13523995f0ac Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 8 Sep 2012 14:50:47 +0200 Subject: [PATCH 0293/5607] 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 685aeb05ce7..48a33377e50 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 ffa151e98fc..51b984e17f8 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); }; -- GitLab From ad628ab557e87ce981566af5fe162f9aab2fe1b9 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 17:25:59 +0200 Subject: [PATCH 0294/5607] 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 48a33377e50..ce664972037 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; }; } -- GitLab From 338e78c7b6df25d523696f17fe4f1d141db50176 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 19:31:54 +0200 Subject: [PATCH 0295/5607] 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 948beae82d4..d4de24d394c 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 = { -- GitLab From 7bbda346ba6be74b3b1bb9440261074aadf6863d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 19:32:14 +0200 Subject: [PATCH 0296/5607] 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 00000000000..87a732b5b4c --- /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 51b984e17f8..5ab5cfb2375 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; -- GitLab From da87b2c9bf9f5703e7d966849057ecd26c242f15 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 9 Sep 2012 19:32:27 +0200 Subject: [PATCH 0297/5607] 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 00000000000..c8c538c5cb7 --- /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 5ab5cfb2375..7d69d18ab8f 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 { }; -- GitLab From 64c0d7a4908d3a0eb073b9e2cf9f4cbfb0728301 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 11:30:12 +0200 Subject: [PATCH 0298/5607] 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 203a354c13c..77eeacb6a66 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 ]; -- GitLab From 1037089c55bd73a74cd21f71f99b03794b356515 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 11:31:36 +0200 Subject: [PATCH 0299/5607] 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 7d69d18ab8f..231c0cf7cc0 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 { }; -- GitLab From 15df3d131accbbc926a0d64b419b28a5485480cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 12:17:59 +0200 Subject: [PATCH 0300/5607] 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 77eeacb6a66..335befb6c12 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" -- GitLab From 11111c7d018f7297ed878b1b51584a404e1bda17 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 12:19:45 +0200 Subject: [PATCH 0301/5607] 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 b5983dec6fb..72c032342d9 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 ]; -- GitLab From 2ccd0238cb578d5b3a142b1e784485e31cc7f0c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 12:27:35 +0200 Subject: [PATCH 0302/5607] 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 00000000000..303e7ceb2c3 --- /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 b45db385e59..30c7bfc58c1 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 {}; -- GitLab From 470ade254e73e280b0ec9e1a1ef081926e0d1371 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 14:59:07 +0200 Subject: [PATCH 0303/5607] 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 8ae8c06d513..42392aff60c 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 -- GitLab From d7d1f995e6b1cb0feadc2436e254deb3d288441f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Sep 2012 15:21:17 +0200 Subject: [PATCH 0304/5607] 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 c72177e2108..b598accffc6 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 ff9a98cbb59..3772320b0c2 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 417e568092d..13513d02333 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 b0cc40d3914..e265cf54e4e 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 4827b749484..149e88cd01d 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 41d521805ce..7de302aee6d 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 7b2c937bd06..cf71dde30c3 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 410eb7e1d05..06b882c20bb 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 b457ec6dc32..8dfac311a9a 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 de2e40a03d5..af230b2e644 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 a02697be7c2..46ae378d738 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 9abc588a0e7..6303cbb8f4e 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 8f34d2d88a0..85a8338e431 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 4121a657357..e40aee63bc1 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 0e7a5413fa2..45891bb45b1 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 e1f2cb9116d..b6f80e49c5b 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 8fffccd649a..4a7d8c1a726 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"; -- GitLab From 9a19904d32c9f5bc912f0922c6d4fdbf6f9448e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:11:19 +0200 Subject: [PATCH 0305/5607] 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 e265cf54e4e..752037698ca 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 149e88cd01d..0b5fc5c107a 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; -- GitLab From b9f0b44b1ad6aa383447b08500312716b3f8510f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:14:33 +0200 Subject: [PATCH 0306/5607] 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 b58152f7c24..3d51d396c7f 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 30c7bfc58c1..fd200172e38 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 {}; -- GitLab From 18e9e6832bbaae2a6431c53f295bd0578595aea4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:18:40 +0200 Subject: [PATCH 0307/5607] 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 00000000000..92dccbf05a6 --- /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 00000000000..39610f9a08c --- /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 fd200172e38..c0f3ea890da 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 {}; -- GitLab From c03160831bb4c1881cc2ab63cadc47c97efc93f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:19:47 +0200 Subject: [PATCH 0308/5607] 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 00000000000..da14adfe339 --- /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 c0f3ea890da..71cd638ea7d 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 {}; -- GitLab From 062678654574cfc96831b2e4bf09594bcfb7485c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:21:42 +0200 Subject: [PATCH 0309/5607] 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 2470dcdf89f..78f9273e46a 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 71cd638ea7d..1f75e397846 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 {}; -- GitLab From 4517928069fed81eae1ecc31ef41604f8947f99a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:26:15 +0200 Subject: [PATCH 0310/5607] 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 6292f7eab5c..4a558d483a3 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 1f75e397846..cacd2d3a66c 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 {}; -- GitLab From 44f8ce0fe15d377da861f4e75d85f2cb3990eb48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 14:29:38 +0200 Subject: [PATCH 0311/5607] 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 d4cb1d97bb7..16f6d6362a1 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 cacd2d3a66c..e8d1b468e6c 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 {}; -- GitLab From 69f66a11b62df04ee5d8c0580c27bc4875d7b5ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:05:13 +0200 Subject: [PATCH 0312/5607] 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 a765b015a31..7cf0aae9596 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"; -- GitLab From ac751dc753d1acb4ba53825d4ebec525f079a40b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 0313/5607] 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 53cb4b360a0..3fb667b9461 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 = [ -- GitLab From e2c9238fae92072cec4e084a6bd366bef68d968b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 0314/5607] 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 baebfbce0f6..149f5f951e5 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/"; -- GitLab From 5d84d2e17694732eee659c7f8dbad935f8938c80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 0315/5607] 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 db4ebc6799d..e887b2d539c 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"; -- GitLab From 639926af26989bb1519f8982d996ef72363cf859 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:21 +0200 Subject: [PATCH 0316/5607] 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 db3e1e8a71f..14d4498f585 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"; -- GitLab From d35889b374d8389c5954aac898992cbdb905342a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0317/5607] 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 c8b2eb06a32..c2505aeb72f 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"; -- GitLab From 19c8861568e227048e7f1a660e2a6a153c75dad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0318/5607] 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 1b958b3240e..b7dae5d4a9b 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"; -- GitLab From bd4ae8058439ff9688221de87432f8c0c899af2b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0319/5607] 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 e76d5967836..539fa3b192f 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"; -- GitLab From ead567b8905da27259158df7ed00743fb9535d15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0320/5607] 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 296d639918e..3baa02d2674 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 ]; -- GitLab From 6c78b5f919f51eed6a7862b5d594c320bfb132e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0321/5607] 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 85fe25f7d18..79ea3160df2 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"; -- GitLab From 603be88be125b7910be1ce6f18b28f37aeb5606d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0322/5607] 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 ae28bdc2e41..0cd65bb1905 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"; -- GitLab From 6a34dabe17783041e4aadbbbad349fcdba709c8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0323/5607] 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 40ac59d1c9e..9cba8f2c13f 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"; -- GitLab From 8b4ee13aad188cdc40a385a40ffb68c91e08e8b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0324/5607] 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 08e08e29ec0..a4b613dd756 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"; -- GitLab From 26a7363aad26d762a091e2be44c8c60ce043ec13 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0325/5607] 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 2300d6e80ca..1d9bba47b4b 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; -- GitLab From 51384cc51900289cecaacebfdd66e3881ca09bc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0326/5607] 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 55051901206..21497f3252a 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 ]; -- GitLab From 4127150fcfda5d36d6fb5a6cfec783c37dcd7a74 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0327/5607] 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 2c2aa5be7e6..d8bc08b4b33 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 = { -- GitLab From b422578f1d35c2730eefe29d8a37eac2f6ff1d1e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0328/5607] 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 bc99a88895b..ee9026bae49 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 -- GitLab From 0a5b6548e79c5c4cdd204cb0a4ed89abbbc16dac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:22 +0200 Subject: [PATCH 0329/5607] 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 4e67e4ffb4c..a603b4fe644 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"; -- GitLab From e421db3284ee688808dcbf0247e1270fe695afb5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0330/5607] 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 fda06d718ed..127e888d110 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"; -- GitLab From b3eb13c229c210baf6f415687f4997c8d223d882 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0331/5607] 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 6303cbb8f4e..d24bf5719bd 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"; -- GitLab From efe11de735217ae119ff6bbe41aa94a49085125f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0332/5607] 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 4f73ffa98ae..a7d7459b455 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"; -- GitLab From bf6b450d70a18d5368495f24d1953f477b76fa9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0333/5607] 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 f05d191ed17..4c989e17698 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 ]; -- GitLab From 2d5e95a09c1bb9f82fb147bd84f7b8d7e2aa845f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0334/5607] 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 6820e92f7eb..732c04d8de7 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 -- GitLab From 76ae366292ca69d771e849115a0fee8817d9ec42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0335/5607] 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 9501c7ffff1..8e66b2c3c03 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"; -- GitLab From 2040c25c3d53dcb56b936e6a20a80e5ffd48d026 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0336/5607] 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 795c690d7a2..240062493e3 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"; -- GitLab From 6ab66d48fe142c5bdb9708a4a3dce83eb63825ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0337/5607] 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 20bdca91bb3..d99762df2b2 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"; -- GitLab From 0acfb5994f0b6b321e955cf5de95e03be3f371f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:23 +0200 Subject: [PATCH 0338/5607] 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 10f9f226f69..c6a85e27df1 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; -- GitLab From 0dd27329466804233bda5f198da60a942440d83f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0339/5607] 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 d4ffbf82d2a..851b28baafe 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/"; -- GitLab From d1990fed5d21e2b74c144160be570015feb61020 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0340/5607] 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 6820b2ed247..65d9da1548f 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 ]; -- GitLab From 69074bf98b2e4a7f1bfabcd5af4fac0396dc9d39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0341/5607] 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 e6ff0dd64b9..8ac2372d1c0 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; -- GitLab From 2c4011974d8ba2b5ff40f09494b5b04e0ce12535 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0342/5607] 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 e066196cd4d..30bbbef9a0b 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"; -- GitLab From 07a2ac1634854d242f8a5efc856c2de9675b437d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0343/5607] 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 bf27fa78162..5ff1da422ef 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"; -- GitLab From 09f1fbfa1ccaf1fa17f5dcb28cdd1c6d0b0569e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0344/5607] 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 3bb9d314957..c78ca3f68ee 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"; -- GitLab From 4fc17179f9cb5795f099f5df385e874408f3718c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0345/5607] 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 0f6a3656126..728d2d202f1 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"; -- GitLab From 010c282cb292e128e66dc6b9b3b3fec206ec2363 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:08:24 +0200 Subject: [PATCH 0346/5607] 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 5ac339e92ec..2b96ae526c4 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 = '' -- GitLab From 5bde8b0985010cb8abd13f814c142dbd09fb88c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:39:44 +0200 Subject: [PATCH 0347/5607] 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 e076a92350d..f747c3669ad 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 e8d1b468e6c..775ae03c083 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 {}; -- GitLab From 249ff424a9caf4e0c9d593879292a7054f04572b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:56:51 +0200 Subject: [PATCH 0348/5607] 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 a151a45c0e7..bba9e1a13fe 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; -- GitLab From bbf098baa88f7e3d79cb2c6d7055cb64314283dc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 15:59:20 +0200 Subject: [PATCH 0349/5607] 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 f747c3669ad..f33defcb809 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 = -- GitLab From 741a7ef530e47fb2a2c6a1ccf22b87b7072659bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 16:30:58 +0200 Subject: [PATCH 0350/5607] 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 775ae03c083..d61ee5f28a0 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 : { -- GitLab From 9f7f71aeaa21a100df8f476d1fed12e0d162633e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 16:31:41 +0200 Subject: [PATCH 0351/5607] 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 f6893cc3797..ed68f0cc1fe 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 b27ff78d8f9..3d873dc2073 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 aab6530fcc9..af5fddda1c0 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 36a320dbe68..c6dd1c6a568 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 36080e9044e..88799c9318a 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 ]; }; }) -- GitLab From 7b587a5ad87b17f34ec13ea839e046f653e3e45c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 18:27:35 +0200 Subject: [PATCH 0352/5607] 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 ed68f0cc1fe..d17ca718f0a 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 + ]; }; }) -- GitLab From bb7daf767b7835c20c3fca4d369754f6e7b42d72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 10 Sep 2012 18:28:02 +0200 Subject: [PATCH 0353/5607] 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 3d873dc2073..37698cebb38 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 af5fddda1c0..2a83df47f09 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 c6dd1c6a568..f69789772ac 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 88799c9318a..fef81d92212 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 + ]; }; }) -- GitLab From 6e0924ca84ffe4c7ea0a51e85b23edf9baa93ddd Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:08:29 +0200 Subject: [PATCH 0354/5607] 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 00000000000..5c563ad9cd7 --- /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 d61ee5f28a0..44554b49592 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 {}; -- GitLab From d12f707f6c471bb04332a4a6e2df4b5fde018109 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:09:44 +0200 Subject: [PATCH 0355/5607] 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 00000000000..40354c9472c --- /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 44554b49592..edd21f50a97 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 {}; -- GitLab From cad8a942e1fbe79e42c6897a8012526c89e69fc9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:28:00 +0200 Subject: [PATCH 0356/5607] 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 00000000000..7497ed59c4f --- /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 edd21f50a97..b148cb782d5 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 {}; -- GitLab From a7ca54494548fe30612b8cabba4885391bec2077 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:30:28 +0200 Subject: [PATCH 0357/5607] 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 00000000000..d5c386c1e1f --- /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 b148cb782d5..b49531d5d72 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 { -- GitLab From e3826e5e9cc63a948cd75c50a3ec61be3d4a9f75 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:31:48 +0200 Subject: [PATCH 0358/5607] 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 00000000000..365e2737131 --- /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 b49531d5d72..5c2f99c1a7b 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 {}; -- GitLab From 1763eb518b4b57dd47be792b44fcc830bba35c71 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:32:40 +0200 Subject: [PATCH 0359/5607] 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 00000000000..294a266fef4 --- /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 5c2f99c1a7b..fd56c927371 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 {}; -- GitLab From 4c418cd3aa4a8a690f1e939ad09509efa831c8e4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 13:33:36 +0200 Subject: [PATCH 0360/5607] 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 00000000000..11feea574f0 --- /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 fd56c927371..9f8808ccb22 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 {}; -- GitLab From 3e1c9217c4a1f1592d897bbf6903f77d713bce18 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 14:43:12 +0200 Subject: [PATCH 0361/5607] 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 11feea574f0..21c3a7a28f6 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"; -- GitLab From 5320792ed70da5e07d5b04afb06c9d929d1764fe Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 14:45:19 +0200 Subject: [PATCH 0362/5607] 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 9f8808ccb22..30edecc335d 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 {}; -- GitLab From 96ab1aa9df4a0fc8b7f89afeda6b6b915ee70e98 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 31 Aug 2012 14:47:47 +0200 Subject: [PATCH 0363/5607] 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 d76215961f2..9cdbae68564 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"; -- GitLab From e94d50f3590982b3cf7841bdf63aaec5c525a7aa Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 31 Aug 2012 15:03:27 +0200 Subject: [PATCH 0364/5607] 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 9cdbae68564..c809aa54441 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"; -- GitLab From 03a8eea607e05c743addce66b3b44ebd46067c95 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 2 Sep 2012 13:13:18 +0200 Subject: [PATCH 0365/5607] 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 c809aa54441..1ac77919531 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"; -- GitLab From 930d13e12ccb4924b534333bfcc6861961fbe46f Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 01:15:23 +0200 Subject: [PATCH 0366/5607] 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 00000000000..dccb6571f4d --- /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 231c0cf7cc0..73ee8d25f04 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; -- GitLab From de5c5467a682e9cc678fe8f8f6b22c850607ecda Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 01:44:21 +0200 Subject: [PATCH 0367/5607] 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 00000000000..e6e7eb505bf --- /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 73ee8d25f04..79c7da88a54 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 { }; -- GitLab From 194e9d929c2b2f2c7a05843664bceca575b7cbd4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 02:55:35 +0200 Subject: [PATCH 0368/5607] 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 2a05e920d5f..9dc7116234e 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 -- GitLab From 9d71bb96c0d2a7f1640dd05c3dcc06c2d1501057 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 02:59:01 +0200 Subject: [PATCH 0369/5607] 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 9dc7116234e..38ef20ec969 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}" -- GitLab From 3ed91754e27683abf611d5089612f57366335207 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 5 Sep 2012 03:56:24 +0200 Subject: [PATCH 0370/5607] 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 00000000000..324a0b0bebc --- /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 79c7da88a54..49a608d273c 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 { -- GitLab From d891fc6f3bf5dd08f249cdf8a452b6d97b43903e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 20:34:10 +0200 Subject: [PATCH 0371/5607] 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 1067300a2ef..56387f9e5c4 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 = -- GitLab From fc872096917968411a24667528a3060118008cc6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 21:36:36 +0200 Subject: [PATCH 0372/5607] 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 5b207e2e799..d903c44866c 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 ]; -- GitLab From 46d9146d64a2e405a1465a0b0246c2e2257e7487 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Mon, 10 Sep 2012 23:15:54 +0200 Subject: [PATCH 0373/5607] 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 c554b5dcea1..764954f54f8 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 edb8a6111f7..2211d880258 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 88cfccf24a3..74edde7615d 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; }; -- GitLab From 3692a2e83d9012b4f3493c15e93c1e5af0c3e8ea Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 22:06:02 +0200 Subject: [PATCH 0374/5607] 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 fda361d6c74..2ef52aee99e 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 ]; -- GitLab From b2b67c055b048c0db9dea06a219b8ef87d5dbbfc Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 22:18:13 +0200 Subject: [PATCH 0375/5607] 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 ba99da23b46..00000000000 --- 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 2ef52aee99e..94c7e72f0e2 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"; -- GitLab From 3b7dd3c9309c0865d2d2e5adc7715e8dae4bbbce Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:34:44 +0200 Subject: [PATCH 0376/5607] 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 94c7e72f0e2..f5cccff6650 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 00000000000..3f0b714a1f0 --- /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 -- GitLab From b0ace9fa110fbd68bd7be9bc58f5168b66ae3707 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:40:52 +0200 Subject: [PATCH 0377/5607] 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 f5cccff6650..381cc44e36f 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; }; } - -- GitLab From 2b7e88e9f5c867356df9976c288b40b36c74b3c5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:46:32 +0200 Subject: [PATCH 0378/5607] 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 381cc44e36f..a75df8b531c 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 = { -- GitLab From 109fdfe34fd77687946d43e740ef24948e574bab Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 10 Sep 2012 23:50:33 +0200 Subject: [PATCH 0379/5607] 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 a75df8b531c..086b792b4cd 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/; -- GitLab From 20f883179e4d1bf35c2d05f73f6ad35b0226ac72 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 11 Sep 2012 00:15:26 +0200 Subject: [PATCH 0380/5607] 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 8ae373438f5..7d03c397bdc 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"; }; } -- GitLab From 2347cfa4f99aa4e44eaf5a3b9be4406c1d57d60e Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 11 Sep 2012 04:34:41 +0200 Subject: [PATCH 0381/5607] 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 e9e9961d1cd..7a3c387deda 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 -- GitLab From 2a183e60bf8802499e1ffc229994737eb657cf99 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 10:42:50 +0200 Subject: [PATCH 0382/5607] 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 097d01b2f41..b7d4dc1830f 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; -- GitLab From b4102299e5d2b1ab2a3779ad2b45f6c741d531b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 0383/5607] 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 dc0ce313eff..27edc1e9a9c 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 -- GitLab From e81449b41ebff5c6e3da296599059dc5800aab24 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 0384/5607] 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 13513d02333..03d3896e853 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"; -- GitLab From 74eaab50ce8e669461ecd9a702956af2b83957df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 0385/5607] 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 6ed4ae90221..c383c46f30b 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 -- GitLab From 6cff725ee9c96409e4c6bec88228d705a7fe6ebf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:51 +0200 Subject: [PATCH 0386/5607] 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 1ca06b356ec..0a6fdf6c8cc 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"; -- GitLab From 7ef7641d1e9d7d69bee1b1f8ccf1f77c03406643 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 0387/5607] 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 eef0a2b5259..8e647b43eec 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 -- GitLab From 80505bb4169ea482732977d21c90491b2a3e7379 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 0388/5607] 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 66f10e16e66..740b68edb96 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"; -- GitLab From 027faa30455ba8ca4831230ad25b999db8242c80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 0389/5607] 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 b6f80e49c5b..f073d36f502 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"; -- GitLab From 277527fef74a53503e28b294d4666f32368cc4ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 0390/5607] 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 c7732cc6e2b..0debe101b4f 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"; -- GitLab From 20518a9556e4af2c8d608f5ba204298efbe681e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:05:52 +0200 Subject: [PATCH 0391/5607] 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 c6a456bf9a4..52460c8246b 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 -- GitLab From d23a9edde14273dfea5205216ad394b8bdebff59 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:13:55 +0200 Subject: [PATCH 0392/5607] 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 294a266fef4..f23be1ebfb1 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"; -- GitLab From 98865175ace24898767b70663f25e9d9e9077231 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:34 +0200 Subject: [PATCH 0393/5607] 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 499dc394ece..a0da6384e95 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"; -- GitLab From 5c75c45f26c3269e438d97f57dd11b815035c718 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:34 +0200 Subject: [PATCH 0394/5607] 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 74f78e72af2..e266aa15ff8 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; -- GitLab From bee2f63817b581e9f1ccc606424a28eb830d5bc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0395/5607] 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 8e647b43eec..b1cb2bac6ab 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 -- GitLab From b32dc0cad763191e0fcca772c941dd40f2bb84a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0396/5607] 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 13c40c6781f..f87e6348963 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"; -- GitLab From 0af0365640a7f98ac1b4bd8a88f4e3f32cbe1cc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0397/5607] 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 732c04d8de7..73bb01d7075 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 -- GitLab From 1464dd71833485f9b31f96071d2b1adb960cb41c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0398/5607] 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 73966514e49..b951b0d435f 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"; -- GitLab From 053d65377b27266c2e8092263b56a8d2c2efea1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0399/5607] 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 7531008d854..e3190749f1c 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 ]; -- GitLab From 7b27f68e4204d89142758b172af90073e730b31a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0400/5607] 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 1619cc6760c..3cc2456a7d5 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"; -- GitLab From 1622070cef8ec4d39be9f43cd6c05f1f2c7f86a3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0401/5607] 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 5a4afd9309b..d6719c7a451 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"; -- GitLab From b24351998b7c275583ba42630ca9df6ce3f5d7d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:35 +0200 Subject: [PATCH 0402/5607] 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 49e643b4e20..16f02f87746 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"; -- GitLab From 4d329a6ee5c33a8341a151b0c03692cd0b394cf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 0403/5607] 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 e321d2b08d9..3f2e6e6af4f 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 -- GitLab From 44fe21f0935e854385c1fba809d3057d5597f5d3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 0404/5607] 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 fdb6b0e3f60..ac5c87d7613 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 -- GitLab From 6d21a18369e79eedc668c144612dfae553155f0a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 0405/5607] 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 66432d02f59..5a6d6e1c41c 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 -- GitLab From bac22b874340d57d66bb447e24f678df560a2a23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 0406/5607] 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 35a0adc2592..8f3cf37149f 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 -- GitLab From cc22e43f5aea4a478b74e72fcde2a18ecd0486f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 0407/5607] 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 4a7d8c1a726..ddd0f24d9af 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"; -- GitLab From d6f289f10c0c2b6556ae5c9d668751445e276874 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 12:15:36 +0200 Subject: [PATCH 0408/5607] 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 eeb2e376680..46ebf6c8b85 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 = [ -- GitLab From 504e2ad1287435c0d0ca2a181cfbf222693c9fc0 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 11 Sep 2012 15:02:37 +0200 Subject: [PATCH 0409/5607] 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 0b5fa4b8d61..044ae8f93a0 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"; -- GitLab From 77a21eed0889adc76d9fcd80f6a6326be35ac63a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 16:53:48 +0200 Subject: [PATCH 0410/5607] Clean up changes to the Cabal builder, which needed to be done in an awkward fashion to avoid a complete re-build of all Haskell packages. --- pkgs/build-support/cabal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 42392aff60c..e3ef829f5cb 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -86,8 +86,8 @@ configurePhase = '' eval "$preConfigure" - ${lib.optionalString (lib.attrByPath ["jailbreak"] false self) "${jailbreakCabal}/bin/jailbreak-cabal ${self.pname}.cabal && " - }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 -- GitLab From ff68b3e130fe1161a12c8f9d9ef37b5a11034948 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 11 Sep 2012 17:07:52 +0200 Subject: [PATCH 0411/5607] Add apacheAntOracleJDK variant --- 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 b7d4dc1830f..e61817fd992 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2893,6 +2893,7 @@ let apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; }; + apacheAntOracleJDK = ant.override { jdk = pkgs.oraclejdk; }; apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { # must be either pre-built or built with GCJ *alone* -- GitLab From 7596ce3dbb0ef9815948052d757365ba84d3ce14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 18:21:54 +0200 Subject: [PATCH 0412/5607] Remove myself as maintainer of these packages. --- pkgs/applications/window-managers/xmonad/default.nix | 1 - pkgs/development/compilers/pakcs/default.nix | 2 +- pkgs/development/compilers/uhc/default.nix | 1 - pkgs/development/libraries/haskell/Crypto/default.nix | 5 +---- pkgs/development/libraries/haskell/hfuse/default.nix | 1 - pkgs/development/libraries/haskell/json/default.nix | 5 +---- pkgs/development/libraries/haskell/readline/default.nix | 1 - pkgs/development/tools/documentation/haddock/2.7.2.nix | 5 +---- pkgs/development/tools/documentation/haddock/2.9.2.nix | 1 - 9 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index a490bc8018d..fd215986fa3 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -14,7 +14,6 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 35771f6691f..817559ffecc 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { with dynamic web pages, prototyping embedded systems). ''; - maintainers = [ stdenv.lib.maintainers.kkallio stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index 2c812e8842b..fa66306721d 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -44,7 +44,6 @@ in stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index f6f06b9c283..f93fbdcb679 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -11,9 +11,6 @@ cabal.mkDerivation (self: { description = "Collects together existing Haskell cryptographic functions into a package"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/hfuse/default.nix b/pkgs/development/libraries/haskell/hfuse/default.nix index 8ff4f7fd275..64943d5e1c1 100644 --- a/pkgs/development/libraries/haskell/hfuse/default.nix +++ b/pkgs/development/libraries/haskell/hfuse/default.nix @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index 5bfbb59d83f..63a6d176c94 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -10,9 +10,6 @@ cabal.mkDerivation (self: { description = "Support for serialising Haskell to and from JSON"; 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 ]; }; }) diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix index 898b005c4da..0e65740b47e 100644 --- a/pkgs/development/libraries/haskell/readline/default.nix +++ b/pkgs/development/libraries/haskell/readline/default.nix @@ -16,7 +16,6 @@ cabal.mkDerivation (self : { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons ]; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.7.2.nix b/pkgs/development/tools/documentation/haddock/2.7.2.nix index c94b3e43b7e..0c744d62419 100644 --- a/pkgs/development/tools/documentation/haddock/2.7.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.7.2.nix @@ -17,9 +17,6 @@ cabal.mkDerivation (self : { 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 - self.stdenv.lib.maintainers.simons - ]; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/documentation/haddock/2.9.2.nix b/pkgs/development/tools/documentation/haddock/2.9.2.nix index c6543936ab3..8e5b79cd519 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.2.nix @@ -19,7 +19,6 @@ cabal.mkDerivation (self : { platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons ]; }; }) -- GitLab From 52bdfef521bb954716f3e796cec1f60eae435513 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 11 Sep 2012 18:22:10 +0200 Subject: [PATCH 0413/5607] hopenssl: add myself as maintainer --- pkgs/development/libraries/haskell/hopenssl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix index 5c62cbf3fe0..fec3f5dccf4 100644 --- a/pkgs/development/libraries/haskell/hopenssl/default.nix +++ b/pkgs/development/libraries/haskell/hopenssl/default.nix @@ -11,6 +11,9 @@ cabal.mkDerivation (self: { description = "FFI bindings to OpenSSL's EVP digest interface"; 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 + ]; }; }) -- GitLab From 4db2f403ba5dc85833e9eda59c2e9583dfd3e45b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Sep 2012 13:44:18 -0400 Subject: [PATCH 0414/5607] nspr: Update to 4.9.2 --- pkgs/development/libraries/nspr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index c570688de21..2b8a327e2d5 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.9.1"; in +let version = "4.9.2"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "1d52282668f2f8f5aabf7a5a3e7f6ba9a5df9710"; + sha1 = "455eab365f8fd732a4b014ca0af685f3c2dec598"; }; preConfigure = "cd mozilla/nsprpub"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; enableParallelBuilding = true; - + meta = { homepage = http://www.mozilla.org/projects/nspr/; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; -- GitLab From fcd30ecfc15c82af419af85bbe6208e7cd2d5be5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Sep 2012 13:44:28 -0400 Subject: [PATCH 0415/5607] systemd: Add to channel --- pkgs/os-specific/linux/systemd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e6e5822c9ea..796aa9c32f8 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -90,5 +90,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/systemd; description = "A system and service manager for Linux"; + platforms = stdenv.lib.platforms.linux; }; } -- GitLab From b1ce15f77b13d83424db3f9e2eae08e12dd75e2f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Sep 2012 13:44:49 -0400 Subject: [PATCH 0416/5607] firefox: Update to 15.0.1 Also untabified the expression. --- .../networking/browsers/firefox/15.0.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix index 54903496391..c0b45d45cf3 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -15,16 +15,16 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "15.0"; - - xulVersion = "15.0"; # this attribute is used by other packages + firefoxVersion = "15.0.1"; + + xulVersion = "15.0.1"; # 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"; + sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641"; }; - + commonConfigureFlags = [ "--enable-optimize" "--disable-debug" @@ -40,14 +40,14 @@ rec { "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" + "--disable-installer" "--disable-updater" ]; xulrunner = stdenv.mkDerivation rec { name = "xulrunner-${xulVersion}"; - + inherit src; buildInputs = @@ -65,7 +65,7 @@ rec { ] ++ commonConfigureFlags; enableParallelBuilding = true; - + preConfigure = '' export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" @@ -85,9 +85,9 @@ rec { cd $out/bin rm xulrunner - for i in $out/lib/$libDir/*; do + for i in $out/lib/$libDir/*; do file $i; - if file $i | grep executable &>/dev/null; then + 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; @@ -116,7 +116,7 @@ rec { 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 @@ -142,7 +142,7 @@ rec { preConfigure = '' find . -name Makefile.in -execdir sed -i '{}' -e '1ivpath %.so ${ - stdenv.lib.concatStringsSep ":" + stdenv.lib.concatStringsSep ":" (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc])) }' ';' ''; @@ -150,19 +150,19 @@ rec { postInstall = '' ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner - for j in $out/bin/*; do - i="$(readlink "$j")"; + for j in $out/bin/*; do + i="$(readlink "$j")"; file $i; - if file $i | grep executable &>/dev/null; then - rm "$out/bin/$(basename "$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 + cd "$out/lib/"firefox-* + rm firefox + echo -e '#!${stdenv.shell}\n${xulrunner}/bin/xulrunner "'"$PWD"'/application.ini" "$@"' > firefox + chmod a+x firefox ''; # */ meta = { -- GitLab From ea2fbd78641509e8ed13d0d16ebf4fbc9512ec02 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Sep 2012 16:11:16 -0400 Subject: [PATCH 0417/5607] Fix Thunderbird/Firefox URLs The Mozilla FTP site has old releases, so is preferred over HTTP. --- pkgs/applications/networking/browsers/firefox/15.0.nix | 2 +- pkgs/applications/networking/mailreaders/thunderbird/11.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/15.0.nix b/pkgs/applications/networking/browsers/firefox/15.0.nix index c0b45d45cf3..cb79f4422eb 100644 --- a/pkgs/applications/networking/browsers/firefox/15.0.nix +++ b/pkgs/applications/networking/browsers/firefox/15.0.nix @@ -21,7 +21,7 @@ rec { src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; sha1 = "bdbc4b6656c59b926e18f99b3335484427d08641"; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix index 0c8ba4b05ff..0d36bf88739 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/11.0.1/source/thunderbird-${version}.source.tar.bz2"; sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3"; }; -- GitLab From 0695a74c68a5fafcbd89c6f9dfb548651d6f4a71 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:31:49 +0200 Subject: [PATCH 0418/5607] haskell-silently: New package, v1.2.0.2. Let's begin silently and add the first dependency in our ongoing roadmap of butchering missing dependencies leading up to yesod-test: .---- yesod-test -------. | | | | | | .- hspec -. wai-test html-conduit -. | | | | : | | filesystem-conduit : hspec-expectations | : | : tagstream-conduit : : silently <- Yay, our first victim, silently killed by a chainsaw: .,.,.,.,.,.,.||\ ,-. ROAWRR! :::::::::::::: | o O `-' `'`'`'`'`'`'`---` Signed-off-by: aszlig --- .../libraries/haskell/silently/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/silently/default.nix diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix new file mode 100644 index 00000000000..4fb4323bd17 --- /dev/null +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "silently"; + version = "1.2.0.2"; + sha256 = "0qcprbjnh351hc9v12gww478qd4pw7wgpyjj1gmkx4mr80w0qmm1"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/trystan/silently"; + description = "Prevent or capture writing to stdout and other handles"; + 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 30edecc335d..eabe79f14ca 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1347,6 +1347,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); simpleSendfile = callPackage ../development/libraries/haskell/simple-sendfile {}; + silently = callPackage ../development/libraries/haskell/silently {}; + skein = callPackage ../development/libraries/haskell/skein {}; smallcheck = callPackage ../development/libraries/haskell/smallcheck {}; -- GitLab From fb5c721cbead4d01120ee6f78431d0a9c6faa521 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:17:44 +0200 Subject: [PATCH 0419/5607] haskell-hspec-expectations: New package, v0.3.0.2. Let's continue our trip into the ancient realms of yesod-test: .---- yesod-test -------. | | | | | | hspec wai-test html-conduit -. | | | filesystem-conduit | | tagstream-conduit `. . .`-___ ' ' ' `- ` `-'-'._, , ' ______ `', ''' '' `-(o,-` `. , ,'hspec, `' ) ,'' ,' __.-,,_,._,-,,' ,-', expectations `-,===,-'-,-'-,====='-, ,'''' ' `,,==-,-'-,-======,-'---' ,' -,-,-,-,,_ `-,__ '', ` ' ' ' /'/' `-,-.__`-,' )' Signed-off-by: aszlig --- .../haskell/hspec-expectations/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec-expectations/default.nix diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix new file mode 100644 index 00000000000..bd2d4d290ee --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -0,0 +1,14 @@ +{ cabal, HUnit }: + +cabal.mkDerivation (self: { + pname = "hspec-expectations"; + version = "0.3.0.2"; + sha256 = "1jwwi4pbv0pc88vdg5y0ljjq41sha4v4y5qaxi6qms7rl6cp4qkr"; + buildDepends = [ HUnit ]; + meta = { + homepage = "https://github.com/sol/hspec-expectations#readme"; + description = "Catchy combinators for HUnit"; + 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 eabe79f14ca..cd502e2f6d2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -940,6 +940,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; + hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; + hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; -- GitLab From ecceb38bfbcea0f795cc0641e0cb8174e4652d92 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:16:01 +0200 Subject: [PATCH 0420/5607] haskell-hspec: New package, v1.3.0. Well, we now have a direct dependency of yesod-test, things are coming close, almost TOO close. But we still have a long journey ahead. .---- yesod-test -------. | | | | | | : wai-test html-conduit -. : | | : | filesystem-conduit : | . | . tagstream-conduit . ,-.,-.,-.-,-.-,.-,-.,-.,-. ( down with the s^Hhspec! ) ,--. ,'`-'-`-'`-'-`-'--'-`-'-`-' |o o| `-'\. [|]-' \.-` .'. `\ | | '` | | | | \| hspec Signed-off-by: aszlig --- .../libraries/haskell/hspec/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec/default.nix diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix new file mode 100644 index 00000000000..1a22ff5df0d --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -0,0 +1,21 @@ +{ cabal, ansiTerminal, filepath, hspecExpectations, HUnit +, QuickCheck, silently, time, transformers +}: + +cabal.mkDerivation (self: { + pname = "hspec"; + version = "1.3.0"; + sha256 = "0kl9mdksy8bifb37dfb9y8mnnjlq0x1h970cgzv9idq61gafii4n"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansiTerminal filepath hspecExpectations HUnit QuickCheck silently + time transformers + ]; + meta = { + homepage = "http://hspec.github.com/"; + description = "Behavior Driven Development for Haskell"; + 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 cd502e2f6d2..9534a72fcc4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -940,6 +940,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hsloggerTemplate = callPackage ../development/libraries/haskell/hslogger-template {}; + hspec = callPackage ../development/libraries/haskell/hspec {}; + hspecExpectations = callPackage ../development/libraries/haskell/hspec-expectations {}; hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; -- GitLab From b0522b53cd2658d28e0d6b5e7eb0950e2bc08e61 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:36:05 +0200 Subject: [PATCH 0421/5607] haskell-filesystem-conduit: New package, v0.5.0.1. A fresh delivery of filesystem conduits just arrived, so we just have to add tagstream-conduit and we just have direct dependencies left. .- yesod-test -. | | wai-test | ,-------. html-conduit | FOOD! | | | ______/ tagstream-conduit |/` ._________________________. | | ,'`--__T__T__T_`:: | FILESYSTEM CONDUIT(S) | Vvvv. --------) _________,-': ...`-'`-'.............`-'`-'.........\^^^^_,'`-'.`-'`-'.: `""" Signed-off-by: aszlig --- .../haskell/filesystem-conduit/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/filesystem-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix new file mode 100644 index 00000000000..3e6252a4e00 --- /dev/null +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -0,0 +1,17 @@ +{ cabal, conduit, systemFileio, systemFilepath, text, transformers +}: + +cabal.mkDerivation (self: { + pname = "filesystem-conduit"; + version = "0.5.0.1"; + sha256 = "1rpyrvs9hsi86zj6rghv91jn5lcx9wppg1wa4gp976kmagd4wl93"; + buildDepends = [ + conduit systemFileio systemFilepath text transformers + ]; + meta = { + homepage = "http://github.com/snoyberg/conduit"; + description = "Use system-filepath data types with conduits"; + 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 9534a72fcc4..d8de1b65864 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -712,6 +712,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); filestore = callPackage ../development/libraries/haskell/filestore {}; + filesystemConduit = callPackage ../development/libraries/haskell/filesystem-conduit {}; + fgl_5_4_2_2 = callPackage ../development/libraries/haskell/fgl/5.4.2.2.nix {}; fgl_5_4_2_3 = callPackage ../development/libraries/haskell/fgl/5.4.2.3.nix {}; fgl_5_4_2_4 = callPackage ../development/libraries/haskell/fgl/5.4.2.4.nix {}; -- GitLab From a4d82a227364112c89270c602c4d00d613388bbf Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:37:28 +0200 Subject: [PATCH 0422/5607] haskell-tagstream-conduit: New package, v0.5.2. So, look at how small we chopped our little tree, we finally got all dependencies for html-conduit: .- yesod-test -. | | wai-test html-conduit ___ <' `> <' ,.., `> |----------.. < `-'`-' > | conduit `. `< ^^ > |--------. | \vvvvv/' | | TAGSTREAM `^^^^^' Signed-off-by: aszlig --- .../haskell/tagstream-conduit/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tagstream-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix new file mode 100644 index 00000000000..2f22f8e905d --- /dev/null +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -0,0 +1,18 @@ +{ cabal, attoparsec, blazeBuilder, blazeBuilderConduit, conduit +, text +}: + +cabal.mkDerivation (self: { + pname = "tagstream-conduit"; + version = "0.5.2"; + sha256 = "12hg9khc670499c3ymc0s4xd2sg71grlk21ykqmby972dva77vxr"; + buildDepends = [ + attoparsec blazeBuilder blazeBuilderConduit conduit text + ]; + meta = { + homepage = "http://github.com/yihuang/tagstream-conduit"; + description = "streamlined html tag parser"; + 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 d8de1b65864..15e70693861 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1467,6 +1467,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagsoup = callPackage ../development/libraries/haskell/tagsoup {}; + tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; + temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; -- GitLab From 86f00072caa1a7e8589ad089e086b7808b2ea012 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:34:06 +0200 Subject: [PATCH 0423/5607] haskell-html-conduit: New package, v0.1.0.2. ~~_-~,----.~- ~~-,' `.~- ,' | / | `. ,',' |`. | `,','/'\ | | | .'~`| |. .| |~`|' : (`-') (`-') : : `'~ ~~`' : "OMG! They killed html-conduit!" : `' /^\ () : Let's see what we have left: : ()`'~`' ,, : : ,_--_--_. : yesod-test `. '/ HTML! \` : | `.'~\_---_/~` : wai-test `._ _.' | ~~~~~~~| :.:.::.::: : :"::"' Signed-off-by: aszlig --- .../haskell/html-conduit/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/html-conduit/default.nix diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix new file mode 100644 index 00000000000..b3482292b04 --- /dev/null +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -0,0 +1,19 @@ +{ cabal, conduit, filesystemConduit, resourcet, systemFilepath +, tagstreamConduit, text, transformers, xmlConduit, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "html-conduit"; + version = "0.1.0.2"; + sha256 = "0r9bnzz6r5q2fgichg8vfjgwyig33diqvj5pxchk97m3m5rqj5k4"; + buildDepends = [ + conduit filesystemConduit resourcet systemFilepath tagstreamConduit + text transformers xmlConduit xmlTypes + ]; + meta = { + homepage = "https://github.com/snoyberg/xml"; + description = "Parse HTML documents using xml-conduit datatypes"; + 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 15e70693861..e41d6031695 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -951,6 +951,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); html_1_0_1_2 = callPackage ../development/libraries/haskell/html/1.0.1.2.nix {}; html = self.html_1_0_1_2; + htmlConduit = callPackage ../development/libraries/haskell/html-conduit {}; + httpConduit = callPackage ../development/libraries/haskell/http-conduit {}; httpdShed = callPackage ../development/libraries/haskell/httpd-shed {}; -- GitLab From afe407545feaac9bd4bde8bb44c57bb5b2a838a9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:38:37 +0200 Subject: [PATCH 0424/5607] haskell-wai-test: New package, v1.3.0. ::::::: .||||||| /"""""""""". ,` `. | wai test? | | ,". .-, | ____) because! | | `-` `-' | `---------------' `. ,----. ,' `----./' Now guess what we have left? Just one single destination: , : .___. _ _ .___. ,'-.,-' ___ ,---' ,-. ,--: | | | | | | | | | :: ,'.,-' `--. : : : : | _ | :: `-,-- .--' `--' `--' | |_| | | I have to admit, that i got lazy wthi the ASCII drawings in this commit, but well... isn't this all about lazy ev Signed-off-by: aszlig --- .../libraries/haskell/wai-test/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wai-test/default.nix diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix new file mode 100644 index 00000000000..0c9b8eb2eb8 --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -0,0 +1,19 @@ +{ cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive +, conduit, cookie, httpTypes, HUnit, text, transformers, wai +}: + +cabal.mkDerivation (self: { + pname = "wai-test"; + version = "1.3.0"; + sha256 = "15y0aw5c4sh1mns4ss39l0wsxrd1b6yq6m5r638x23zl6y7d9j40"; + buildDepends = [ + blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie + httpTypes HUnit text transformers wai + ]; + meta = { + homepage = "http://www.yesodweb.com/book/wai"; + description = "Unit test framework (built on HUnit) for WAI applications"; + 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 e41d6031695..49e076902dd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1590,6 +1590,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); waiLogger = callPackage ../development/libraries/haskell/wai-logger {}; + waiTest = callPackage ../development/libraries/haskell/wai-test {}; + warp = callPackage ../development/libraries/haskell/warp {}; WebBits_1_0 = callPackage ../development/libraries/haskell/WebBits/1.0.nix { -- GitLab From 8f29e4edb3ecf410ac9c42803613b6564fc466b6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Sep 2012 05:39:27 +0200 Subject: [PATCH 0425/5607] haskell-yesod-test: New package, version 0.3.0. You might have noticed, that the commit summary always abbreviated "version". That's no coincidence, as we want to empathize that our goal is (or was) yesod-test, right? /\ `.,' .''. ,`, () HOORAY! ,''. `,.' `,' () ___ __ ()_ __ `,' _(*__)(__) __\##/)(_*)_ ' ` _(__)(__)(*_)(__/||\)(*)(_)__ _(__*__)(__*__)(_*)(_*_)(__)(_*)_ _(_*__)(_*_)(_*_)(__*_)(_*_)(*_)(__)_ (_*_)(_*_)(_*____)(_)(___)(__)(_*_)(__) _(__*__)()_(_*_)(_)(*_)(__*)(_*__)(__*_) (_*(__)`--`---(___)' (__) _ (__*_)(__) (_(_*_):| .-. . (o) |(_*)(_) (___)::| ( o ) .' `._~ |:(*__*) | `-' .' ~-. |::(_*_) `. .' ______ `.| (_) We now `. .' _ .' () `. | finally `. | | `. `. () _.' .' have `. `.`--' ` ()' _,'| yesod-test `. ~~~-----~()~~ .' in nixpkgs | _ _ _ _ _() | by just `.|#|#|#|#|#()\ .' running ||#|#|#|#|.() `.___ cabal2nix `.________|() |.-.| on a bunch | || |^.-. of packages! | `| | | |^. `-._._| | | | |\. | | |_| next time, let's be `. .' productive, shall we? | | | | Signed-off-by: aszlig --- .../libraries/haskell/yesod-test/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/yesod-test/default.nix diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix new file mode 100644 index 00000000000..2e504ca0f6d --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, blazeHtml, blazeMarkup, caseInsensitive, hspec +, htmlConduit, httpTypes, HUnit, monadControl, network, persistent +, poolConduit, text, transformers, wai, waiTest, xmlConduit +, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "yesod-test"; + version = "0.3.0"; + sha256 = "194m4va6am2fmnsvs60jclym6bvjmwp35nyv3srbdnqwg3r983h4"; + buildDepends = [ + attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit + httpTypes HUnit monadControl network persistent poolConduit text + transformers wai waiTest xmlConduit xmlTypes + ]; + meta = { + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + 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 49e076902dd..070310d5a85 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1673,6 +1673,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yesodStatic = callPackage ../development/libraries/haskell/yesod-static {}; + yesodTest = callPackage ../development/libraries/haskell/yesod-test {}; + yst = callPackage ../development/libraries/haskell/yst {}; zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell {}; -- GitLab From 44dec2d5dd702051c07d133a2a99d9d371ec8461 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Wed, 12 Sep 2012 12:08:21 +0200 Subject: [PATCH 0426/5607] fixes the build of coccinelle. --- pkgs/development/tools/misc/coccinelle/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 044ae8f93a0..d31e2ec5f3b 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }: +{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }: let @@ -17,6 +17,7 @@ in stdenv.mkDerivation { ocaml findlib menhir ocaml_pcre pycaml python ncurses pkgconfig + makeWrapper ]; # TODO: is the generation of this wrapper truly/still needed? -- GitLab From 14b1ed53a08b3125af8ecbf9ec7103c770a08a88 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Sep 2012 12:33:03 -0400 Subject: [PATCH 0427/5607] DBD::SQLite: Don't link against /usr/lib/libsqlite3.dylib on Darwin --- pkgs/development/perl-modules/DBD-SQLite/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index bbe50182b90..5afa889f543 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -17,6 +17,11 @@ buildPerlPackage rec { ./external-sqlite.patch ]; + preBuild = + '' + substituteInPlace Makefile --replace -L/usr/lib "" + ''; + postInstall = '' # Prevent warnings from `strip'. -- GitLab From de5be50b2d5a67dd1f969fc8f451ea7a74debac7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 13:59:23 +0400 Subject: [PATCH 0428/5607] Adding a function capable of extracting the name with version out of url/file path --- pkgs/lib/strings.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index fb2752d97c1..4bd7a5bebde 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -155,4 +155,14 @@ rec { # Return true iff string v1 denotes a version older than v2. versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; + # Extract name with version from URL. Ask for separator which is + # supposed to start extension + nameFromURL = url: sep: let + components = splitString "/" url; + filename = lib.last components; + name = builtins.head (splitString sep filename); + in + assert ! eqStrings name filename; + name; + } -- GitLab From 45f8ec426a2bdd03805b4a23af85894eb87cc3db Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 13:59:48 +0400 Subject: [PATCH 0429/5607] Fix a typo in beautifulsoup name --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ac77919531..4d24315413d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -194,8 +194,8 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [logilabCommon]; }; - beautifulsoap = buildPythonPackage (rec { - name = "beautifulsoap-3.0.8"; + beautifulsoup = buildPythonPackage (rec { + name = "beautifulsoup-3.0.8"; src = fetchurl { url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; @@ -213,6 +213,7 @@ let pythonPackages = python.modules // rec { description = "Undemanding HTML/XML parser"; }; }); + beautifulsoap = builtins.trace "beatifulsoap is a typo" beautifulsoup; # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. -- GitLab From e67736de93460c460fe79981bf190f93956b25cd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:09:08 +0400 Subject: [PATCH 0430/5607] Add wokkel library --- 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 4d24315413d..61294537db9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2824,6 +2824,24 @@ let pythonPackages = python.modules // rec { }; + wokkel = buildPythonPackage (rec { + url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; + name = pkgs.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; + }; + + buildInputs = [twisted dateutil]; + + meta = { + description = "Some (mainly XMPP-related) additions to twisted"; + homepage = "http://wokkel.ik.nu/"; + license = stdenv.lib.licenses.mit; + }; + }); + + wxPython = wxPython28; -- GitLab From bc8e5d2da23ea15209531e09005c7ecc6d880015 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:12:42 +0400 Subject: [PATCH 0431/5607] Propagate dependencies of wokkel --- 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 61294537db9..d1f4469a7da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2832,7 +2832,7 @@ let pythonPackages = python.modules // rec { sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; }; - buildInputs = [twisted dateutil]; + propagatedBuildInputs = [twisted dateutil]; meta = { description = "Some (mainly XMPP-related) additions to twisted"; -- GitLab From b52919ac9e2631b2eba0e5bebbe4479f4506c0a6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:14:49 +0400 Subject: [PATCH 0432/5607] =?UTF-8?q?Buildable=20Salut-=C3=A0-toi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salut-a-toi/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix new file mode 100644 index 00000000000..a7f4162a4a1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, python, pythonPackages, pygobject}: +stdenv.mkDerivation rec { + url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1"; + }; + + buildInputs = with pythonPackages; + [ + python twisted urwid beautifulsoup wxPython distribute pygobject + wokkel + ]; + + configurePhase = '' + sed -e "s@sys.prefix@'$out'@g" -i setup.py + + echo 'import wokkel.muc' | python + ''; + + buildPhase = '' + python setup.py build + ''; + + installPhase = '' + python setup.py install --prefix="$out" + ''; + + meta = { + homepage = "http://sat.goffi.org/"; + description = "A multi-frontend XMPP client"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + license = stdenv.lib.licenses.gpl3plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e61817fd992..d2473638634 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1431,6 +1431,8 @@ let sablotron = callPackage ../tools/text/xml/sablotron { }; + salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; + screen = callPackage ../tools/misc/screen { }; scrot = callPackage ../tools/graphics/scrot { }; -- GitLab From 070f2419ddeb28644b2ad8a89645fd5fad036ce4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:24:07 +0400 Subject: [PATCH 0433/5607] Fixed a few SaT dependencies --- .../networking/instant-messengers/salut-a-toi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index a7f4162a4a1..37e024bbf49 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, pythonPackages, pygobject}: +{stdenv, fetchurl, python, pythonPackages, pygobject, pythonDBus}: stdenv.mkDerivation rec { url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2"; name = stdenv.lib.nameFromURL url ".tar"; @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { buildInputs = with pythonPackages; [ python twisted urwid beautifulsoup wxPython distribute pygobject - wokkel + wokkel pythonDBus ]; configurePhase = '' sed -e "s@sys.prefix@'$out'@g" -i setup.py + sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh + sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/lib/${python.libPrefix}/site-packages"" -i src/sat.sh echo 'import wokkel.muc' | python ''; -- GitLab From 48b257663a6c85444bf3470f295e569fb7593227 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:28:05 +0400 Subject: [PATCH 0434/5607] Added PyFeed --- 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 d1f4469a7da..9bdbc87d8a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1758,6 +1758,22 @@ let pythonPackages = python.modules // rec { }; }; + pyfeed = buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; + }; + + # tests not described in setup.py + doCheck = false; + + meta = { + homepage = "http://home.blarg.net/~steveha/pyfeed.html"; + description = "Tools for syndication feeds"; + }; + }; pygments = buildPythonPackage rec { name = "Pygments-1.5"; -- GitLab From 5c767b9313297852246caaae2a14815d148fa223 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:32:16 +0400 Subject: [PATCH 0435/5607] Add xe, a dependency of pyfeed --- 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 9bdbc87d8a9..0354796f730 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1765,6 +1765,7 @@ let pythonPackages = python.modules // rec { inherit url; sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; }; + propagatedBuildInputs = [xe]; # tests not described in setup.py doCheck = false; @@ -2867,6 +2868,23 @@ let pythonPackages = python.modules // rec { wxGTK = pkgs.wxGTK28; }; + xe = buildPythonPackage rec { + url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; + name = stdenv.lib.nameFromURL url ".tar"; + src = fetchurl { + inherit url; + sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; + }; + + # tests not described in setup.py + doCheck = false; + + meta = { + homepage = "http://home.blarg.net/~steveha/xe.html"; + description = "XML elements"; + }; + }; + xlib = buildPythonPackage (rec { name = "xlib-0.15rc1"; -- GitLab From 917db3212fd4303a5e320b19521cb56b1ef9338e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:32:38 +0400 Subject: [PATCH 0436/5607] Add PyFeed dependency. Starts now --- .../networking/instant-messengers/salut-a-toi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 37e024bbf49..e62567b8027 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = with pythonPackages; [ python twisted urwid beautifulsoup wxPython distribute pygobject - wokkel pythonDBus + wokkel pythonDBus pyfeed ]; configurePhase = '' -- GitLab From 2dec65340b6362b0408e09062da069ec670b3e54 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 14:46:45 +0400 Subject: [PATCH 0437/5607] Fix python path --- .../networking/instant-messengers/salut-a-toi/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index e62567b8027..1cac193e1b6 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = with pythonPackages; [ python twisted urwid beautifulsoup wxPython distribute pygobject - wokkel pythonDBus pyfeed + wokkel pythonDBus pyfeed wrapPython ]; configurePhase = '' @@ -27,6 +27,12 @@ stdenv.mkDerivation rec { installPhase = '' python setup.py install --prefix="$out" + + for i in "$out/bin"/*; do + head -n 1 "$i" | grep -E '[/ ]python( |$)' && { + wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages" + } || true + done ''; meta = { -- GitLab From 009db2ae7a30006207908a1bcc7d9ec88885a93f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 15:30:12 +0400 Subject: [PATCH 0438/5607] Fix license --- .../networking/instant-messengers/salut-a-toi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 1cac193e1b6..c35101bb874 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "A multi-frontend XMPP client"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [raskin]; - license = stdenv.lib.licenses.gpl3plus; + license = stdenv.lib.licenses.gpl3Plus; }; } -- GitLab From b9739ad02f1f2b8731ff90c55fed1b294cc665f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:39:29 +0200 Subject: [PATCH 0439/5607] haskell-cgi: update to version 3001.1.8.3 --- .../haskell/cgi/{3001.1.8.2.nix => 3001.1.8.3.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/cgi/{3001.1.8.2.nix => 3001.1.8.3.nix} (84%) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix similarity index 84% rename from pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix rename to pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix index d77bd227f8b..cfe95ab8e1e 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cgi"; - version = "3001.1.8.2"; - sha256 = "09ly7bn5ck563jq1wip5w628g74xj4p1ha9rllfdck33pqrl2mgz"; + version = "3001.1.8.3"; + sha256 = "1pacv0qxfs7l71xvf9amd7qsw5g725qbrm8r6fgdb2awyl925sf4"; buildDepends = [ extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 070310d5a85..0667e073891 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -120,7 +120,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - cgi = self.cgi_3001_1_8_2; # 7.6 fail + cgi = self.cgi_3001_1_8_3; # 7.6 ok 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 @@ -518,8 +518,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; - cgi_3001_1_8_2 = callPackage ../development/libraries/haskell/cgi/3001.1.8.2.nix {}; - cgi = self.cgi_3001_1_8_2; + cgi_3001_1_8_3 = callPackage ../development/libraries/haskell/cgi/3001.1.8.3.nix {}; + cgi = self.cgi_3001_1_8_3; Chart = callPackage ../development/libraries/haskell/Chart {}; -- GitLab From d8202101888610f51ded4c4e330dc67c2c5a7623 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:43:55 +0200 Subject: [PATCH 0440/5607] haskell-zlib: add version 0.5.4.0 --- .../development/libraries/haskell/zlib/0.5.4.0.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/zlib/0.5.4.0.nix diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix new file mode 100644 index 00000000000..abeed295e03 --- /dev/null +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix @@ -0,0 +1,14 @@ +{ cabal, zlib }: + +cabal.mkDerivation (self: { + pname = "zlib"; + version = "0.5.4.0"; + sha256 = "18hc4wr8brzbl9qapjbjyb9kyqrznv2xbw7rv1a6k8i3392ilxv1"; + extraLibraries = [ zlib ]; + meta = { + description = "Compression and decompression in the gzip and zlib formats"; + 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 0667e073891..cafe393821d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,7 +142,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 + zlib = self.zlib_0_5_4_0; # 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 @@ -1695,7 +1695,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); zlib_0_5_3_3 = callPackage ../development/libraries/haskell/zlib/0.5.3.3.nix { inherit (pkgs) zlib; }; - zlib = self.zlib_0_5_3_3; + zlib_0_5_4_0 = callPackage ../development/libraries/haskell/zlib/0.5.4.0.nix { + inherit (pkgs) zlib; + }; + zlib = self.zlib_0_5_4_0; zlibBindings = callPackage ../development/libraries/haskell/zlib-bindings {}; -- GitLab From a0395b87c4d02ea291a55c4936cae8aa9ae58f14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:14 +0200 Subject: [PATCH 0441/5607] haskell-X11: update to version 1.6.0.2 --- .../libraries/haskell/X11/{1.6.0.1.nix => 1.6.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/X11/{1.6.0.1.nix => 1.6.0.2.nix} (84%) diff --git a/pkgs/development/libraries/haskell/X11/1.6.0.1.nix b/pkgs/development/libraries/haskell/X11/1.6.0.2.nix similarity index 84% rename from pkgs/development/libraries/haskell/X11/1.6.0.1.nix rename to pkgs/development/libraries/haskell/X11/1.6.0.2.nix index 4a558d483a3..dff5bca4400 100644 --- a/pkgs/development/libraries/haskell/X11/1.6.0.1.nix +++ b/pkgs/development/libraries/haskell/X11/1.6.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "X11"; - version = "1.6.0.1"; - sha256 = "0crbprh4m48l4yvbamgvvzrmm1d94lgbyqv1xsd37r4a3xh7qakz"; + version = "1.6.0.2"; + sha256 = "0z1g93k2zbkb9is2zy6pfwp13bv11cvs30b9cz253wjv2liphshw"; extraLibraries = [ libX11 libXext libXinerama libXrandr libXrender ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cafe393821d..b4aeb4bfb3c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1630,8 +1630,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_1 = callPackage ../development/libraries/haskell/X11/1.6.0.1.nix {}; - X11 = self.X11_1_6_0_1; + X11_1_6_0_2 = callPackage ../development/libraries/haskell/X11/1.6.0.2.nix {}; + X11 = self.X11_1_6_0_2; X11Xft = callPackage ../development/libraries/haskell/X11-xft {}; -- GitLab From 3ee9d56b8357e65f17fde5a6728a7293a19c8d71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:19 +0200 Subject: [PATCH 0442/5607] haskell-data-accessor: update to version 0.2.2.3 --- .../libraries/haskell/data-accessor/data-accessor.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 6f73cc48817..7c1de10b20b 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-accessor"; - version = "0.2.2.2"; - sha256 = "1q9hx2bkp7dknr9ygx39lj93i846x8g9j7lkhkjijvsicih28yyi"; + version = "0.2.2.3"; + sha256 = "1fa1rbbs3m05y61w42vj4vqlcpqmz60v8mv3r0h6lx669k6ka5gj"; buildDepends = [ transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; -- GitLab From 7254d03a59601f5b763092efc10cc6369840eff6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:19 +0200 Subject: [PATCH 0443/5607] haskell-explicit-exception: update to version 0.1.7.1 --- .../libraries/haskell/explicit-exception/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 86d4cc50c3b..0f2385a004f 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "explicit-exception"; - version = "0.1.7"; - sha256 = "0pqh97fxs55554bd16dknggkr0yayqj1dz0sddp9b2svjy2q4vrm"; + version = "0.1.7.1"; + sha256 = "15p5pndam6byd3p8qlnn8pjdhb7rvn93fxa2m40x3wxh58ymkh14"; isLibrary = true; isExecutable = true; buildDepends = [ transformers ]; -- GitLab From 3fb5f84abd3527de308a8f65ee8076e224e45137 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:19 +0200 Subject: [PATCH 0444/5607] haskell-ghc-syb-utils: update to version 0.2.1.1 --- pkgs/development/libraries/haskell/ghc-syb-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index 804e55a2245..6f5f1458507 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-syb-utils"; - version = "0.2.1.0"; - sha256 = "02wmd4zkng38z3bhsk4w4dqj1lzznhg2p0ijwr1a0dgx8cqr490z"; + version = "0.2.1.1"; + sha256 = "1fwlzqbkjn592jh01nccn99iii6047fg9f3hh255586nzngihh1l"; buildDepends = [ syb ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; -- GitLab From b89096d865daf69ce792ae772e7fb9decbd2c309 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:19 +0200 Subject: [PATCH 0445/5607] haskell-instant-generics: update to version 0.3.6 --- .../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 f4dfc4848a6..edbf96128da 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.5"; - sha256 = "15j41krvabf541vm4vpn2jvlg3nbi6pywcig9zbjjpckzwp5vj9x"; + version = "0.3.6"; + sha256 = "0rwxj30p4s8imwfsrrrb26dvxax74cr77yzrm5s9yj7hc7hr0c5p"; buildDepends = [ syb ]; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; -- GitLab From 4c814f87728faab48e4d3faa51f99e9ae6ed637f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:19 +0200 Subject: [PATCH 0446/5607] haskell-regular: update to version 0.3.4.2 --- pkgs/development/libraries/haskell/regular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index c37c54e8bfa..8a3e740491c 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "regular"; - version = "0.3.4"; - sha256 = "10gfid99xcqv3i9rp4x8hykk91qq3h7b7lxzsl7ii58vmifa4kgq"; + version = "0.3.4.2"; + sha256 = "0fshjpbgabdcsa9a4cjmvfrzy7db4s679rprdbrhhfwf5xiszs2s"; meta = { description = "Generic programming library for regular datatypes"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 17190945ff4e2702b460c84a4ae9333b93b2e365 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:19 +0200 Subject: [PATCH 0447/5607] haskell-vacuum: update to version 2.1.0.1 --- pkgs/development/libraries/haskell/vacuum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index 11f74432be6..8506e580502 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vacuum"; - version = "2.0.0.0"; - sha256 = "0a810ql4lp1pyvys9a5aw28gxn7h2p4hkc0by4pmpw5d7kdhn9y3"; + version = "2.1.0.1"; + sha256 = "0gzh5v9mr0mgz9hxjnm8n3jcl2702wad7qaqaar1zc95lkabpf65"; extraLibraries = [ ghcPaths ]; meta = { homepage = "http://thoughtpolice.github.com/vacuum"; -- GitLab From 86cdcbc56debeb40111ded6c7fd36bcffbe667c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:44:20 +0200 Subject: [PATCH 0448/5607] haskell-void: update to version 0.5.8 --- 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 581d2f8c9ae..e19a0450c02 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.7"; - sha256 = "1rkc32122mkyxl0a4spbcqz908wh49l5ab8gfvsy0y02d3lldfd4"; + version = "0.5.8"; + sha256 = "1iqwndpc77i4i1977z7lxj20viplr2f5pwxwa2kibyhy556bs27z"; buildDepends = [ semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; -- GitLab From f16a0e8c127f7f05e4caea342ce55bae1c215804 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:53:54 +0200 Subject: [PATCH 0449/5607] python-packages.nix: remove trace message The attribute builtins.trace "beatifulsoap is a typo" beautifulsoup; looked like it was checked in by accident. --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0354796f730..3c8e9cdf63b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -213,8 +213,6 @@ let pythonPackages = python.modules // rec { description = "Undemanding HTML/XML parser"; }; }); - beautifulsoap = builtins.trace "beatifulsoap is a typo" beautifulsoup; - # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. boto_1_9 = buildPythonPackage (rec { -- GitLab From da6db0dc1972ef2500ac94a9ace831987a9b1383 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:54:10 +0200 Subject: [PATCH 0450/5607] python-packages.nix: drop trailing whitespace --- pkgs/top-level/python-packages.nix | 66 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c8e9cdf63b..a55a869f88c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -367,8 +367,8 @@ let pythonPackages = python.modules // rec { md5 = "5f39727415b837abd02651eeb2721749"; }; - propagatedBuildInputs = [ stompclient distribute ]; - + propagatedBuildInputs = [ stompclient distribute ]; + doCheck = false; meta = { @@ -447,7 +447,7 @@ let pythonPackages = python.modules // rec { }; }); - + dateutil = buildPythonPackage (rec { name = "dateutil-1.5"; @@ -483,12 +483,12 @@ let pythonPackages = python.modules // rec { src = fetchurl { url = "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.26.tar.gz"; md5 = "841f4262a70107f85260362f5def8206"; #"ecd75ea629fee6d59d26f88c39b2d291"; - + }; buildInputs = [ pkgs.unzip ]; - - installCommand = + + installCommand = '' # ehm, YES, the --verbose flags needs to be there, otherwise it tries to patch setuptools! easy_install --verbose --prefix=$out . @@ -502,7 +502,7 @@ let pythonPackages = python.modules // rec { platforms = python.meta.platforms; }; }); - + distutils_extra = buildPythonPackage rec { name = "distutils-extra-2.26"; @@ -518,7 +518,7 @@ let pythonPackages = python.modules // rec { }; }; - + django = buildPythonPackage rec { name = "Django-${version}"; version = "1.4.1"; @@ -536,7 +536,7 @@ let pythonPackages = python.modules // rec { }; }; - + django_1_3 = buildPythonPackage rec { name = "Django-1.3.2"; @@ -553,7 +553,7 @@ let pythonPackages = python.modules // rec { }; }; - + django_evolution = buildPythonPackage rec { name = "django_evolution-0.6.7"; @@ -570,7 +570,7 @@ let pythonPackages = python.modules // rec { }; }; - + djblets = buildPythonPackage rec { name = "Djblets-0.6.19"; @@ -587,7 +587,7 @@ let pythonPackages = python.modules // rec { }; }; - + dulwich = buildPythonPackage rec { name = "dulwich-0.8.1"; @@ -608,7 +608,7 @@ let pythonPackages = python.modules // rec { }; }; - + hggit = buildPythonPackage rec { name = "hg-git-0.3.1"; @@ -625,7 +625,7 @@ let pythonPackages = python.modules // rec { }; }; - + docutils = buildPythonPackage rec { name = "docutils-0.8.1"; @@ -732,7 +732,7 @@ let pythonPackages = python.modules // rec { }; }); - + foolscap = buildPythonPackage (rec { name = "foolscap-0.6.1"; @@ -1136,7 +1136,7 @@ let pythonPackages = python.modules // rec { }; }); - + mechanize = buildPythonPackage (rec { name = "mechanize-0.1.11"; @@ -1171,7 +1171,7 @@ let pythonPackages = python.modules // rec { }; }; - + mock = buildPythonPackage (rec { name = "mock-0.7.0"; @@ -1478,7 +1478,7 @@ let pythonPackages = python.modules // rec { }; }); - + paramiko = buildPythonPackage rec { name = "paramiko-1.7.7.1"; @@ -1781,7 +1781,7 @@ let pythonPackages = python.modules // rec { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; md5 = "ef997066cc9ee7a47d01fb4f3da0b5ff"; }; - + meta = { homepage = http://pygments.org/; description = "A generic syntax highlighter"; @@ -1850,7 +1850,7 @@ let pythonPackages = python.modules // rec { }; }; - + ldap = buildPythonPackage rec { name = "python-ldap-2.4.3"; namePrefix = ""; @@ -1894,7 +1894,7 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [astng]; }; - + pymacs = pkgs.stdenv.mkDerivation rec { version = "v0.24-beta2"; name = "Pymacs-${version}"; @@ -1923,7 +1923,7 @@ let pythonPackages = python.modules // rec { }; }; - + pyopengl = let version = "3.0.0b5"; in @@ -1952,7 +1952,7 @@ let pythonPackages = python.modules // rec { }; }; - + pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; @@ -2088,7 +2088,7 @@ let pythonPackages = python.modules // rec { }; }; - + pyutil = buildPythonPackage (rec { name = "pyutil-1.7.9"; @@ -2160,7 +2160,7 @@ let pythonPackages = python.modules // rec { }; }); - + RBTools = buildPythonPackage rec { name = "rbtools-0.4.1"; namePrefix = ""; @@ -2173,7 +2173,7 @@ let pythonPackages = python.modules // rec { propagatedBuildInputs = [ setuptools ]; }; - + recaptcha_client = buildPythonPackage rec { name = "recaptcha-client-1.0.6"; @@ -2188,7 +2188,7 @@ let pythonPackages = python.modules // rec { }; }; - + reportlab = let freetype = pkgs.lib.overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); in buildPythonPackage rec { @@ -2208,7 +2208,7 @@ let pythonPackages = python.modules // rec { }; }; - + reviewboard = buildPythonPackage rec { name = "ReviewBoard-1.6.9"; @@ -2224,7 +2224,7 @@ let pythonPackages = python.modules // rec { ]; }; - + rdflib = buildPythonPackage (rec { name = "rdflib-3.0.0"; @@ -2398,7 +2398,7 @@ let pythonPackages = python.modules // rec { }; }; - + setuptoolsTrial = buildPythonPackage { name = "setuptools-trial-0.5.12"; @@ -2418,7 +2418,7 @@ let pythonPackages = python.modules // rec { }; }; - + simplejson = buildPythonPackage (rec { name = "simplejson-2.1.3"; @@ -2444,7 +2444,7 @@ let pythonPackages = python.modules // rec { }; }); - + six = buildPythonPackage rec { name = "six-1.1.0"; @@ -2461,7 +2461,7 @@ let pythonPackages = python.modules // rec { }; }; - + skype4py = buildPythonPackage (rec { name = "Skype4Py-1.0.32.0"; -- GitLab From 13be1ff86e578258bace81325a2b9ce28c607157 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:50:38 +0200 Subject: [PATCH 0451/5607] ghc-wrapper.nix: cosmetic --- pkgs/development/compilers/ghc/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index 4407f16c9e0..67850c68e19 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -1,4 +1,4 @@ -{stdenv, ghc, makeWrapper, coreutils}: +{ stdenv, ghc, makeWrapper, coreutils }: stdenv.mkDerivation { name = "ghc-${ghc.version}-wrapper"; -- GitLab From eb288cf12e79198da6ececdc18083a125e2ae080 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 14:51:27 +0200 Subject: [PATCH 0452/5607] ghc-wrapper: choose '-package-conf' or '-package-db' flag depending on the version of GHC that's being wrapped --- pkgs/development/compilers/ghc/wrapper.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index 67850c68e19..bc28fdc9131 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -1,6 +1,10 @@ { stdenv, ghc, makeWrapper, coreutils }: -stdenv.mkDerivation { +let + ghc761OrLater = !stdenv.lib.versionOlder ghc.version "7.6.1"; + packageDBFlag = if ghc761OrLater then "-package-db" else "-package-conf"; +in +stdenv.mkDerivation ({ name = "ghc-${ghc.version}-wrapper"; buildInputs = [makeWrapper]; @@ -15,10 +19,10 @@ stdenv.mkDerivation { makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\")" done for prg in runghc runhaskell; do - makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" \" -package-conf --ghc-arg=\")" + makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" \" ${packageDBFlag} --ghc-arg=\")" done for prg in ghc-pkg ghc-pkg-${ghc.version}; do - makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" --package-conf=)" + makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" -${packageDBFlag}=)" done for prg in hp2ps hpc hasktags hsc2hs; do test -x $ghc/bin/$prg && ln -s $ghc/bin/$prg $out/bin/$prg @@ -29,7 +33,7 @@ stdenv.mkDerivation { for arg in \$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\"); do case "\$arg" in - -package-conf) ;; + ${packageDBFlag}) ;; *) CANONICALIZED="\$(${stdenv.lib.optionalString stdenv.isDarwin "${coreutils}/bin/"}readlink -f "\$arg")" GHC_PACKAGES_HASH["\$CANONICALIZED"]= ;; @@ -50,4 +54,4 @@ stdenv.mkDerivation { inherit ghc; inherit (ghc) meta; ghcVersion = ghc.version; -} +} // (stdenv.lib.optionalAttrs ghc761OrLater { preFixup = "sed -i -e 's|-package-conf|${packageDBFlag}|' $out/bin/ghc-get-packages.sh"; })) -- GitLab From 52454d7593f385532f03bb040bd81370c73fcc33 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 15:48:48 +0200 Subject: [PATCH 0453/5607] ghc-7.4.2: add binary snapshot required for bootstrapping ghc 7.7.x --- .../compilers/ghc/7.4.2-binary.nix | 97 +++++++++++++++++++ pkgs/top-level/haskell-defaults.nix | 4 + 2 files changed, 101 insertions(+) create mode 100644 pkgs/development/compilers/ghc/7.4.2-binary.nix diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix new file mode 100644 index 00000000000..85e10d7090c --- /dev/null +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -0,0 +1,97 @@ +{stdenv, fetchurl, perl, ncurses, gmp}: + +let + supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; +in + +assert stdenv.lib.elem stdenv.system supportedPlatforms; + +stdenv.mkDerivation rec { + version = "7.4.2"; + + name = "ghc-${version}-binary"; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-unknown-linux.tar.bz2"; + sha256 = "0gny7knhss0w0d9r6jm1gghrcb8kqjvj94bb7hxf9syrk4fxlcxi"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-unknown-linux.tar.bz2"; + sha256 = "043jabd0lh6n1zlqhysngbpvlsdznsa2mmsj08jyqgahw9sjb5ns"; + } + else if stdenv.system == "i686-darwin" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-apple-darwin.tar.bz2"; + sha256 = "1vrbs3pzki37hzym1f1nh07lrqh066z3ypvm81fwlikfsvk4djc0"; + } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.bz2"; + sha256 = "1imzqc0slpg0r6p40n5a9m18cbcm0m86z8dgyhfxcckksw54mzwf"; + } + else throw "cannot bootstrap GHC on this platform"; + + buildInputs = [perl]; + + postUnpack = + # Strip is harmful, see also below. It's important that this happens + # first. The GHC Cabal build system makes use of strip by default and + # has hardcoded paths to /usr/bin/strip in many places. We replace + # those below, making them point to our dummy script. + '' + mkdir "$TMP/bin" + for i in strip; do + echo '#!/bin/sh' >> "$TMP/bin/$i" + chmod +x "$TMP/bin/$i" + PATH="$TMP/bin:$PATH" + done + '' + + # We have to patch the GMP paths for the integer-gmp package. + '' + find . -name integer-gmp.buildinfo \ + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \; + '' + + # On Linux, use patchelf to modify the executables so that they can + # find editline/gmp. + (if stdenv.isLinux then '' + find . -type f -perm +100 \ + -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; + sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 + for prog in ld ar gcc strip ranlib; do + find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; + done + '' else ""); + + configurePhase = '' + ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include + ''; + + # Stripping combined with patchelf breaks the executables (they die + # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) + dontStrip = true; + + # No building is necessary, but calling make without flags ironically + # calls install-strip ... + buildPhase = "true"; + + postInstall = + '' + # Sanity check, can ghc create executables? + cd $TMP + mkdir test-ghc; cd test-ghc + cat > main.hs << EOF + module Main where + main = putStrLn "yes" + EOF + $out/bin/ghc --make main.hs + echo compilation ok + [ $(./main) == "yes" ] + ''; + + meta.platforms = supportedPlatforms; +} diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index f33defcb809..20542debe76 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -173,6 +173,10 @@ gmp = pkgs.gmp4; }); + ghc742Binary = lowPrio (callPackage ../development/compilers/ghc/7.4.2-binary.nix { + gmp = pkgs.gmp4; + }); + ghc6101BinaryDarwin = if stdenv.isDarwin then ghc704Binary else ghc6101Binary; ghc6121BinaryDarwin = if stdenv.isDarwin then ghc704Binary else ghc6121Binary; -- GitLab From 33e67e8394f9b5c07eb208a0c9ec35d2c81ce4e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 15:50:15 +0200 Subject: [PATCH 0454/5607] ghc-head: update to version 7.7.20120912 --- pkgs/development/compilers/ghc/head.nix | 5 ++--- pkgs/top-level/haskell-defaults.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 566e7d80f86..5487b00cef2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.5.20120714"; - + version = "7.7.20120912"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "02jicyqqr18yixf970f1rfrn64bm528aig6s9566galji063p6ah"; + sha256 = "0dilndcfs1nhs48nhi361bpffmbbyjaq1i6qnzn24vg34wckyrjg"; }; buildInputs = [ ghc perl gmp ncurses ]; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 20542debe76..9f8f85b2df0 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -276,7 +276,7 @@ # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; - ghcBinary = ghc704Binary; + ghcBinary = ghc742Binary; prefFun = ghcHEADPrefs; }; -- GitLab From d9c0fc6a5141f866b9a0ac835a1ea22405a70887 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 09:56:19 -0400 Subject: [PATCH 0455/5607] Fix Nixpkgs evaluation http://hydra.nixos.org/build/3020333 --- pkgs/applications/misc/calibre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d902fe3ffa1..b9b14848370 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg fontconfig podofo qt4 pil chmlib icu pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil - pythonPackages.cssutils pythonPackages.beautifulsoap + pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.sqlite3 sqlite ]; -- GitLab From 947741de5ff36033d10b12d7d2e9cbc60ba835ea Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 16:39:38 +0400 Subject: [PATCH 0456/5607] Gajim: update to 0.15.1 --- .../networking/instant-messengers/gajim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index bca70d14c00..e0fee5d8284 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.14.1" a; + version = a.lib.attrByPath ["version"] "0.15.1" a; buildInputs = with a; [ python pyGtkGlade gtk perl intltool dbus gettext pkgconfig makeWrapper libglade pyopenssl libXScrnSaver @@ -13,8 +13,8 @@ let in rec { src = fetchurl { - url = "http://www.gajim.org/downloads/0.14/gajim-${version}.tar.gz"; - sha256 = "ef757572acf3f3d59408fd95b7ec99bc0e39c5b8c66bc61c78ba65e71c3d8e18"; + url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz"; + sha256 = "b315d4a600da0c5f8248e8f887a41ce2630c49995b36cbad8fb2cd81cc8d2e8b"; }; inherit buildInputs; -- GitLab From 8b7d12d0f5dc35e4b8e8e54db46d5c82960ba04a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 18:02:41 +0400 Subject: [PATCH 0457/5607] Gajim: make OpenSSL code work --- .../networking/instant-messengers/gajim/default.nix | 10 ++++++++-- pkgs/development/python-modules/pyopenssl/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index e0fee5d8284..c336e7e89ac 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -8,7 +8,7 @@ let pkgconfig makeWrapper libglade pyopenssl libXScrnSaver libXt xproto libXext xextproto libX11 gtkspell aspell scrnsaverproto pycrypto pythonDBus pythonSexy - docutils + docutils pyasn1 ]; in rec { @@ -37,8 +37,14 @@ rec { done '') ["wrapBinContentsPython"]; + deploySource = a.fullDepEntry ('' + mkdir -p "$out/share/gajim/src" + cp -r * "$out/share/gajim/src" + '') ["minInit"]; + /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" "wrapBinContentsPython" "fixScriptNames"]; + phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" + "wrapBinContentsPython" "fixScriptNames" "deploySource"]; name = "gajim-" + version; meta = { diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 0e282cf71f3..1d4fe53117c 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -2,15 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "0.10" a; + version = a.lib.attrByPath ["version"] "0.13" a; propagatedBuildInputs = with a; [ openssl python ]; in rec { src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.10.tar.gz"; - sha256 = "4514f8960389042ca2587f9cb801a13f7990387753fc678680b0c084719b5b60"; + url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; + sha256 = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b"; }; inherit propagatedBuildInputs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2473638634..6bf166f17f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8696,6 +8696,7 @@ let inherit (gnome) libglade; inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 scrnsaverproto; + inherit (pythonPackages) pyasn1; python = pythonFull; }; -- GitLab From 080c0a5c20bfe86a528e25e6033016b51aafdbf3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 10:08:10 -0400 Subject: [PATCH 0458/5607] linux: Update to 3.2.29 --- 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 bea68decf64..adac94e328b 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.28"; + version = "3.2.29"; 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 = "0v4mbqf0mgnshhkq3symlliaz1jwa7vx7195r3qls390plc9g0nl"; + sha256 = "1rnsfw59xwzf18s7z28f5qa74ndf0pc2jca42pdnysgq1wjq631p"; }; config = configWithPlatform stdenv.platform; -- GitLab From c20a9e4ac54af4649817562650ec9e89763ccd20 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 18:31:10 +0400 Subject: [PATCH 0459/5607] Make Gajim find speller --- .../networking/instant-messengers/gajim/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index c336e7e89ac..af4f0db0724 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -34,6 +34,8 @@ rec { name="''${name##*/.}" mv "$i" "$out/bin-wrapped/$name" sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" + sed -e "2aexport LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport NIX_LDFLAGS=\"$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" done '') ["wrapBinContentsPython"]; -- GitLab From 5df4c976947dc667710ae6c0f675903b0fbc7dc4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 18:53:09 +0400 Subject: [PATCH 0460/5607] Fix wrapping --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index af4f0db0724..228bc1b9750 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -34,8 +34,8 @@ rec { name="''${name##*/.}" mv "$i" "$out/bin-wrapped/$name" sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" - sed -e "2aexport LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" - sed -e "2aexport NIX_LDFLAGS=\"$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" done '') ["wrapBinContentsPython"]; -- GitLab From e12c0dbacedc7558a45cc5de24d2112c6fe6ac04 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 13 Sep 2012 19:24:25 +0400 Subject: [PATCH 0461/5607] LaTeX + Spelling work --- .../networking/instant-messengers/gajim/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 228bc1b9750..cfd89874f49 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -24,6 +24,7 @@ rec { export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0" sed -e '/-L[$]x_libraries/d' -i configure + sed -e 's@tmpfd.close()@os.close(tmpfd)@' -i src/common/latex.py '') ["addInputs" "doUnpack"]; fixScriptNames = a.fullDepEntry ('' @@ -34,19 +35,14 @@ rec { name="''${name##*/.}" mv "$i" "$out/bin-wrapped/$name" sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" - sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" done '') ["wrapBinContentsPython"]; - deploySource = a.fullDepEntry ('' - mkdir -p "$out/share/gajim/src" - cp -r * "$out/share/gajim/src" - '') ["minInit"]; - /* doConfigure should be removed if not needed */ phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" - "wrapBinContentsPython" "fixScriptNames" "deploySource"]; + "wrapBinContentsPython" "fixScriptNames"]; name = "gajim-" + version; meta = { -- GitLab From 696206c405a830841b2256f7a0f965a135cda433 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 10:13:16 -0400 Subject: [PATCH 0462/5607] Rename spiceProtocol -> spice_protocol --- pkgs/development/libraries/spice/default.nix | 4 ++-- pkgs/os-specific/linux/qemu-kvm/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index cba5d910783..52726f017ab 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pixman, celt, alsaLib, openssl , libXrandr, libXfixes, libXext, libXrender, libXinerama, libjpeg, zlib -, spiceProtocol }: +, spice_protocol }: with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { libXrandr libXfixes libXrender libXext libXinerama ]; - buildNativeInputs = [ pkgconfig spiceProtocol ]; + buildNativeInputs = [ pkgconfig spice_protocol ]; # NIX_CFLAGS_COMPILE = "-fno-stack-protector"; diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index 39b7074e299..032a35ece26 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, attr, zlib, SDL, alsaLib, pkgconfig, pciutils, libuuid, vde2 , libjpeg, libpng, ncurses, python, glib, libaio, mesa -, spice, spiceProtocol, spiceSupport ? false }: +, spice, spice_protocol, spiceSupport ? false }: assert stdenv.isLinux; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ attr zlib SDL alsaLib pkgconfig pciutils libuuid vde2 libjpeg libpng ncurses python glib libaio mesa - ] ++ stdenv.lib.optionals spiceSupport [ spiceProtocol spice ]; + ] ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bf166f17f5..13de3b9996e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4824,7 +4824,7 @@ let inherit (xlibs) libXrandr libXfixes libXext libXrender libXinerama; }; - spiceProtocol = callPackage ../development/libraries/spice-protocol { }; + spice_protocol = callPackage ../development/libraries/spice-protocol { }; sratom = callPackage ../development/libraries/audio/sratom { }; -- GitLab From c843abc1bcd185d3995f69429da5d45a7d37b4cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 10:23:34 -0400 Subject: [PATCH 0463/5607] nvidia-x11: Update to 304.43 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 8714c342f1a..94a48e0f179 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -8,23 +8,23 @@ with stdenv.lib; -let versionNumber = "304.37"; in +let versionNumber = "304.43"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - + builder = ./builder.sh; - + src = if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0dxka66vp15xgm7z9v6x01gdvyvj3l9c33sa7zyahdxbr6h78cdb"; + sha256 = "0k1csg547n6h3vb7phfhfcxnvqgqad55l7zgp0lai9d008rlhzvw"; } 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 = "1xjg91sh7zyn6djdm78wdfas8j7cqn96nyy5zavsnd9jh7v1i0gp"; + sha256 = "0m6dxlhpg6705qrg6czk98gn14zic3xgbxr02czwmhyppgsi3f9i"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; -- GitLab From fcb1d64322d8b323ce736f9df16f6dcefd7436d5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 11:32:03 -0400 Subject: [PATCH 0464/5607] curl: Update to 7.27.0 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4dcab442119..ad08065e2eb 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.26.0"; + name = "curl-7.27.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0snj41knvy4xbfirr88l9gq5zjzz0mwlmq0mxbfgqszb2qpjdvgw"; + sha256 = "164k2vw8v4ppsgqgk4gwhl26h70c8x3rgnl4c2s711626lhmi9db"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains -- GitLab From 14fe075e06b8a226bbd8274315e19ff9253b0509 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 13 Sep 2012 19:33:06 +0200 Subject: [PATCH 0465/5607] Make regex-compat and regex-posix compile with ghc-7.6.1. --- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9f8f85b2df0..01b4f2e75ab 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -20,6 +20,7 @@ haskellPlatform = null; binary = null; # now a core package extensibleExceptions = self.extensibleExceptions_0_1_1_4; + regexCompat = self.regexCompat_0_95_1.override { regexPosix = self.regexPosix_0_95_2; }; }; ghc741Prefs = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4aeb4bfb3c..b7c14710f5b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -135,8 +135,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 + regexCompat = self.regexCompat_0_95_1; # 7.6 ok + regexPosix = self.regexPosix_0_95_2; # 7.6 ok 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 -- GitLab From 40fe4cf682bfc2d9ff9364eb2fc95c8b866356ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2012 20:00:08 +0200 Subject: [PATCH 0466/5607] pmtools: add version 20071116 --- pkgs/os-specific/linux/pmtools/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/linux/pmtools/default.nix diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix new file mode 100644 index 00000000000..1cb2220a3bd --- /dev/null +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pmtools-20071116"; + + src = fetchurl { + url = "www.lesswatts.org/patches/linux_acpi/${name}.tar.gz"; + sha256 = "91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748"; + }; + + installPhase = '' + mkdir -p $out/bin $out/share/pmtools + cp acpidump/acpidump acpixtract/acpixtract madt/madt $out/bin/ + cp README $out/share/pmtools/ + ''; + + meta = { + homepage = "http://www.lesswatts.org/projects/acpi/utilities.php"; + description = "Linux ACPI utilities"; + 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 13de3b9996e..2a71f3e9041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6082,6 +6082,8 @@ let pmutils = callPackage ../os-specific/linux/pm-utils { }; + pmtools = callPackage ../os-specific/linux/pmtools { }; + policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; powertop = callPackage ../os-specific/linux/powertop { }; -- GitLab From 75ec7a07c2d9c094953061b9db2e18d6d05475af Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 12:20:56 -0400 Subject: [PATCH 0467/5607] geeqie: Update to 1.1 --- pkgs/applications/graphics/geeqie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index a166fc7010e..2506b26e238 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,11 +2,11 @@ , intltool, gettext, libchamplain_0_6, fbida }: stdenv.mkDerivation rec { - name = "geeqie-1.0"; + name = "geeqie-1.1"; src = fetchurl { url = "mirror://sourceforge/geeqie/${name}.tar.gz"; - sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi"; + sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m"; }; preConfigure = -- GitLab From fc35bed4701c9f29c9a4f15b70f162187b030aae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 17:06:52 -0400 Subject: [PATCH 0468/5607] Fix incorrect version of Ubuntu Maverick (10.10) --- pkgs/build-support/vm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 8781fbf2d10..684d493a1a8 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1193,8 +1193,8 @@ rec { }; ubuntu1010i386 = { - name = "ubuntu-10.04-maverick-i386"; - fullName = "Ubuntu 10.04 Maverick (i386)"; + name = "ubuntu-10.10-maverick-i386"; + fullName = "Ubuntu 10.10 Maverick (i386)"; packagesList = fetchurl { url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; @@ -1204,8 +1204,8 @@ rec { }; ubuntu1010x86_64 = { - name = "ubuntu-10.04-maverick-amd64"; - fullName = "Ubuntu 10.04 Maverick (amd64)"; + name = "ubuntu-10.10-maverick-amd64"; + fullName = "Ubuntu 10.10 Maverick (amd64)"; packagesList = fetchurl { url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; -- GitLab From 2ab46949cf913730e5fd2274cce5e1865c1e7053 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 13 Sep 2012 17:15:35 -0400 Subject: [PATCH 0469/5607] Add universe repo for older Ubuntu releases --- pkgs/build-support/vm/default.nix | 84 ++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 24 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 684d493a1a8..e8de915e788 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1173,10 +1173,16 @@ rec { ubuntu1004i386 = { name = "ubuntu-10.04-lucid-i386"; fullName = "Ubuntu 10.04 Lucid (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-i386/Packages.bz2; - sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/lucid/main/binary-i386/Packages.bz2; + sha256 = "0e46596202a68caa754dfe0883f46047525309880c492cdd5e2d0970fcf626aa"; + }) + (fetchurl { + url = mirror://ubuntu/dists/lucid/universe/binary-i386/Packages.bz2; + sha256 = "13nvsb7na9igps2fdbbfpq4y8ihccmcs6x35pfyfp6rkhjgpzigy"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; }; @@ -1184,10 +1190,16 @@ rec { ubuntu1004x86_64 = { name = "ubuntu-10.04-lucid-amd64"; fullName = "Ubuntu 10.04 Lucid (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/lucid/main/binary-amd64/Packages.bz2; - sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/lucid/main/binary-amd64/Packages.bz2; + sha256 = "74a8f3192b0eda397d65316e0fa6cd34d5358dced41639e07d9f1047971bfef0"; + }) + (fetchurl { + url = mirror://ubuntu/dists/lucid/universe/binary-amd64/Packages.bz2; + sha256 = "112lbnf8rcsbbh89aci4m6gwac0jy16838aij0av8n076zwkvlj9"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" "mktemp" ]; }; @@ -1195,10 +1207,16 @@ rec { ubuntu1010i386 = { name = "ubuntu-10.10-maverick-i386"; fullName = "Ubuntu 10.10 Maverick (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; - sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/maverick/main/binary-i386/Packages.bz2; + sha256 = "1qjs4042y03bxbxwjs3pgrs99ba6vqvjaaz6zhaxxaqj1r12dwa0"; + }) + (fetchurl { + url = mirror://ubuntu/dists/maverick/universe/binary-i386/Packages.bz2; + sha256 = "1g5pnhx730wj32221ic8p2q6zcka23knpyg190mvq9x7kflcbfzy"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -1206,10 +1224,16 @@ rec { ubuntu1010x86_64 = { name = "ubuntu-10.10-maverick-amd64"; fullName = "Ubuntu 10.10 Maverick (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; - sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/maverick/main/binary-amd64/Packages.bz2; + sha256 = "1p0i4gp1bxd3zvckgnh1hx4vfc23rfgzd19dk5rmi61lzbzzqbgc"; + }) + (fetchurl { + url = mirror://ubuntu/dists/maverick/universe/binary-amd64/Packages.bz2; + sha256 = "0m26viwah29gh47p8m3jpnx6l84dhpwnms29m9bvqn1vwcrgjh0s"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -1217,10 +1241,16 @@ rec { ubuntu1110i386 = { name = "ubuntu-11.10-oneiric-i386"; fullName = "Ubuntu 11.10 Oneiric (i386)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2; - sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a"; - }; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/oneiric/main/binary-i386/Packages.bz2; + sha256 = "11r1s76ppi7rwz08i20d7n4ndaj9lb9wsl9k8ww4s1c6agzpwv8a"; + }) + (fetchurl { + url = mirror://ubuntu/dists/oneiric/universe/binary-i386/Packages.bz2; + sha256 = "1dr59j8pjdhk07fpc0x73afcd9630kkdsbabx3bj92q71104yigz"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -1228,10 +1258,16 @@ rec { ubuntu1110x86_64 = { name = "ubuntu-11.10-oneiric-amd64"; fullName = "Ubuntu 11.10 Oneiric (amd64)"; - packagesList = fetchurl { - url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2; - sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s"; - }; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/oneiric/main/binary-amd64/Packages.bz2; + sha256 = "07k784gxwaqmyggmzczy9hjkgfp6p6dcs8rhkxw5hfzn0jaf8l2s"; + }) + (fetchurl { + url = mirror://ubuntu/dists/oneiric/universe/binary-amd64/Packages.bz2; + sha256 = "1v3ldxn5jnnfgs863ryd6wl3fsb3glainr1ma2zn2l5vpzhpi2h1"; + }) + ]; urlPrefix = mirror://ubuntu; packages = commonDebPackages ++ [ "diffutils" ]; }; -- GitLab From 7c43b041d9cf53cbeb59207138ac46b95ca4fdf0 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 14 Sep 2012 00:06:25 +0200 Subject: [PATCH 0470/5607] Add nss-pam-ldapd version 0.8.10 nss-pam-ldapd is a fork of nss_ldap that uses a daemon (nslcd) to connect to the LDAP server, instead of going directly from PAM/NSS. This improves performance and separation, and increases security if you connect to LDAP with a password, since only the nscd daemon needs to know the password, not every user of PAM/NSS. This commit will be followed by a commit to NixOS which enables the use of the nslcd daemon. --- .../networking/nss-pam-ldapd/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/networking/nss-pam-ldapd/default.nix diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix new file mode 100644 index 00000000000..9abfcbbe42a --- /dev/null +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pkgconfig, openldap, python, pam, makeWrapper }: + +stdenv.mkDerivation rec { + name = "nss-pam-ldapd-${version}"; + version = "0.8.10"; + + src = fetchurl { + url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz"; + sha256 = "673a5e235a40fd9aac74082bc64d2ac2280fc155fb00b21092650d2c963e79cc"; + }; + + buildInputs = [ makeWrapper pkgconfig python openldap pam ]; + + preConfigure = '' + substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: " + ''; + + configureFlags = [ + "--with-bindpw-file=/run/nslcd/bindpw" + "--with-nslcd-socket=/run/nslcd/socket" + "--with-nslcd-pidfile=/run/nslcd/nslcd.pid" + "--with-pam-seclib-dir=$(out)/lib/security" + ]; + + postInstall = '' + wrapProgram $out/sbin/nslcd --prefix LD_LIBRARY_PATH ":" $out/lib + ''; + + meta = { + description = "LDAP identity and authentication for NSS/PAM"; + homepage = http://arthurdejong.org/nss-pam-ldapd/; + license = [ "GPLv21" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a71f3e9041..930264707cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1167,6 +1167,8 @@ let inherit (pythonPackages) pysqlite; }; + nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; + ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; # ntfsprogs are merged into ntfs-3g -- GitLab From 4606b60dbfff27e474d5d4eb242f11351ebd4823 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Sep 2012 12:02:55 -0400 Subject: [PATCH 0471/5607] nixUnstable: Update to 1.2pre2910_b674665 --- pkgs/tools/package-management/nix/unstable.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 103d92a0ee9..dfe6e491c37 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.2pre2793_d950cfe"; + name = "nix-1.2pre2910_b674665"; src = fetchurl { - url = "http://hydra.nixos.org/build/2955697/download/4/${name}.tar.bz2"; - sha256 = "f91367d8e7ed795b2bc9a47fb3ecff00d005633f248ecaafa25e8e101a5dc682"; + url = "http://hydra.nixos.org/build/3031673/download/4/${name}.tar.bz2"; + sha256 = "fa9849f69a262547856190fe1a24e6d6bd15344fe2ef0a0e54c35ab172074a22"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl - --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl + --with-dbi=${perlPackages.DBI}/${perl.libPrefix} + --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} + --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 @@ -45,15 +46,16 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl - --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl + --with-dbi=${perlPackages.DBI}/${perl.libPrefix} + --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix} + --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix} --disable-init-state --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 '' + stdenv.lib.optionalString ( stdenv.cross ? nix && stdenv.cross.nix ? system ) ''--with-system=${stdenv.cross.nix.system}''; - + doInstallCheck = false; }; -- GitLab From 517612c2ca1d48d028afefeafffdcfd5932d1a6b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Sep 2012 13:16:47 -0400 Subject: [PATCH 0472/5607] sqlite: Update to 3.7.14 --- pkgs/development/libraries/sqlite/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index de154964fe5..6b3c5e498fe 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,15 +3,15 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.13"; + name = "sqlite-3.7.14"; src = fetchurl { - url = http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz; - sha1 = "d3833b6ad68db8505d1044f761dd962f415cd302"; + url = http://www.sqlite.org/sqlite-autoconf-3071400.tar.gz; + sha1 = "7b429809918201555f4c0fa639183a1c663d3fe0"; }; buildInputs = [ readline ncurses ]; - + configureFlags = "--enable-threadsafe"; CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; -- GitLab From cb94852ae311f616a0cdd18fe0f94bbf017f2270 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 14 Sep 2012 22:41:41 +0200 Subject: [PATCH 0473/5607] hexedit: New package, version 1.2.12. A typical three-pane style hex editor, which is somewhat similar than bvi, but smaller and without vi-like keybindings. (Don't ask me why I use both, I just can't tell why I'm sometimes in bvi and sometimes in hexedit mood... there simply is no rational explanation) Signed-off-by: aszlig --- pkgs/applications/editors/hexedit/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/editors/hexedit/default.nix diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix new file mode 100644 index 00000000000..07985dc214a --- /dev/null +++ b/pkgs/applications/editors/hexedit/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "hexedit-${version}"; + version = "1.2.12"; + + src = fetchurl { + url = "http://rigaux.org/${name}.src.tgz"; + sha256 = "bcffbf3d128516cc4e1da64485866fbb5f62754f2af8327e7a527855186ba10f"; + }; + + buildInputs = [ ncurses ]; + + meta = { + description = "View and edit files in hexadecimal or in ASCII"; + homepage = "http://prigaux.chez.com/hexedit.html"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 930264707cb..8428779016c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7109,6 +7109,8 @@ let hello = callPackage ../applications/misc/hello/ex-2 { }; + hexedit = callPackage ../applications/editors/hexedit { }; + homebank = callPackage ../applications/office/homebank { }; htmldoc = callPackage ../applications/misc/htmldoc { -- GitLab From b2392c09a05f314c69ce9ee022a66e7593a0f47a Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 14 Sep 2012 23:11:07 +0200 Subject: [PATCH 0474/5607] aewan: New package, version 1.0.01. This adds a small ASCII art drawing tool, which supports drawing with multiple layers. Might be especially helpful for larger "images", which become quite tedious to do using vim. Signed-off-by: aszlig --- pkgs/applications/editors/aewan/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/editors/aewan/default.nix diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix new file mode 100644 index 00000000000..3e11f78e402 --- /dev/null +++ b/pkgs/applications/editors/aewan/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, zlib, ncurses }: + +stdenv.mkDerivation rec { + name = "aewan-${version}"; + version = "1.0.01"; + + src = fetchurl { + url = "mirror://sourceforge/aewan/${name}.tar.gz"; + sha256 = "5266dec5e185e530b792522821c97dfa5f9e3892d0dca5e881d0c30ceac21817"; + }; + + buildInputs = [ zlib ncurses ]; + + meta = { + description = "Ascii-art Editor Without A Name"; + homepage = "http://aewan.sourceforge.net/"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8428779016c..54d50feb875 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6474,6 +6474,8 @@ let adobeReader = callPackage_i686 ../applications/misc/adobe-reader { }; + aewan = callPackage ../applications/editors/aewan { }; + amsn = callPackage ../applications/networking/instant-messengers/amsn { }; antiword = callPackage ../applications/office/antiword {}; -- GitLab From 6667ee858bd3d78038d3ea4be821fc343d948448 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 15 Sep 2012 07:41:47 +0200 Subject: [PATCH 0475/5607] chromium: Update dev/beta channels. beta: 22.0.1229.56 dev: 23.0.1262.0 Patch for http://crbug.com/143623 still applies and is still not fixed upstream. Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 7d03c397bdc..e4e72617bc4 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "23.0.1255.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1255.0.tar.bz2"; - sha256 = "12ks55mn6nahdzd5kgiwi9m2cfivb0pwj963g8d4kmdbw5bg017g"; + version = "23.0.1262.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1262.0.tar.bz2"; + sha256 = "19sqiv2vg9qy1kj6s12sq5aknvp3969yw26szwp54ipfv7lxqjh6"; }; beta = { - version = "22.0.1229.39"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.39.tar.bz2"; - sha256 = "0v0yz9lkr9xdzh6660y9n2z8m1075ls2r3svafcfa80pq18chzfd"; + version = "22.0.1229.56"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.56.tar.bz2"; + sha256 = "0wynq27yz1aslsnrjmf47dwbglblpfida2kmgv23l804mgdj19gv"; }; stable = { version = "21.0.1180.89"; -- GitLab From e678cd261120838cce11f06c71d5d5516ee5a395 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 15 Sep 2012 08:04:49 +0200 Subject: [PATCH 0476/5607] youtube-dl: Update to version 2012.02.27. In addition, we're now switching to using refs/tags from git rather than commit refs directly, which has the advantage, that we don't have to do bookkeeping twice, where people forget to increment the version in nixpkgs. This happened for the previous version, where `pkgver` had the value "2011.12.08", but in rg3/youtube-dl@661a807c65a154eccdddb875b45e4782ca86132c the version actually is "2012.01.08b". Signed-off-by: aszlig --- pkgs/tools/misc/youtube-dl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0422383ed3b..a810001d0cc 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, python}: let pkgname = "youtube-dl"; - pkgver = "2011.12.08"; + pkgver = "2012.02.27"; in stdenv.mkDerivation { @@ -9,8 +9,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/rg3/${pkgname}"; - rev = "661a807c65a154eccdddb875b45e4782ca86132c"; - sha256 = "32fd193b867b122400e9d5d32f6dfaf15704f837a9dc2ff809e1ce06712857ba"; + rev = "refs/tags/${pkgver}"; + sha256 = "17270ba14f42e8f2813bc6a0eb3674e51592eede69612e156e7d99a96fd147ce"; }; buildInputs = [python]; -- GitLab From b1f8a1b91616a9d7eb4e51d2297f06406f2e8a76 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 20:15:06 +0200 Subject: [PATCH 0477/5607] 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 00000000000..ad0df5c2cb0 --- /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 b7c14710f5b..547223ebcad 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1432,6 +1432,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 {}; -- GitLab From ba83178aed6a5af45ae4e453e62494312829183c Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 25 Aug 2012 20:16:55 +0200 Subject: [PATCH 0478/5607] 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 547223ebcad..902ab5050d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1811,6 +1811,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. -- GitLab From 12e71e4c224bdfe9cc566db97c554160d2e7fc76 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Sep 2012 12:32:19 +0200 Subject: [PATCH 0479/5607] v8: upgrade to 3.11.10.22 --- 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 af0e6426b81..5cd083a7e33 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -5,7 +5,7 @@ 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.11.10.15"; + version = "3.11.10.22"; in assert arch != ""; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "v8-${version}"; src = fetchsvn { url = "http://v8.googlecode.com/svn/tags/${version}"; - sha256 = "0pdw4r6crsb07gshww4kbfbavxgkal8yaxkaggnkz62lrwbcwrwi"; + sha256 = "1bm3hg4pa17xvs8s895bwklxpaihl3f3vzghdg55s1wd0y4dj96j"; }; configurePhase = '' -- GitLab From 68f6866ab66d952df4983b20d4f9ca51d6621102 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Sep 2012 12:32:34 +0200 Subject: [PATCH 0480/5607] node.js: upgrade to 0.8.9 - espipe patch no longer needed - linkV8 headers replaced by buildNodePackage's upcoming binary support --- pkgs/development/web/nodejs/default.nix | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 75e0df0e89e..af2fd780b61 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -1,21 +1,12 @@ -{ 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, fetchurl, openssl, python, zlib, v8, utillinux }: stdenv.mkDerivation rec { - version = "0.8.8"; + version = "0.8.9"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "0cri5r191l5pw8a8pf3gs7hfjm3rrz6kdnm3l8wghmp9p12p0aq9"; + sha256 = "1finh64yra4lqy5jzqif3hhq8hzjvkbc8xkw8364sjsygj3hc3rj"; }; configureFlags = [ @@ -30,15 +21,11 @@ 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 = '' + 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 ''; -- GitLab From 95fa07e1832e4deb05b8f50a05ee7853b9f3171d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 15 Sep 2012 21:57:05 +0200 Subject: [PATCH 0481/5607] linux-3.5: Updating to 3.5.4 --- 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 61d6b0aeba5..8eb4a1dec2c 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.3"; + version = "3.5.4"; 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 = "1p8imlvka3mjm74k09535lyqgdrl1jxrldzd7c8k4qlh5s8fz13w"; + sha256 = "09pi00sk55rpl4mbhd27mnfajgy22bm0zwcgi68iyilc5wir1m12"; }; config = configWithPlatform stdenv.platform; -- GitLab From c9b24ba210775f3d31481fdccb5f4a9cf9956ab0 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 16 Sep 2012 10:49:05 +0200 Subject: [PATCH 0482/5607] linux-3.0: upgrade to 3.0.43 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index e2ed7fc8c5d..f2a0c326ef8 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,15 +230,15 @@ in import ./generic.nix ( rec { - version = "3.0.31"; - + version = "3.0.43"; + preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1b5ix1fc55m6vsr28dh5xi89fphl3m3kmvaniq9div5rj8f6kv0f"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1mrsdqsphkixvd5x97nz465r490hr679rq6f98jbyr0g5m4fyc29"; }; config = configWithPlatform stdenv.platform; -- GitLab From 7b92af45f887e10cdf918ed9e3e9688d3a9c3a1e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 16 Sep 2012 10:49:25 +0200 Subject: [PATCH 0483/5607] linux-3.4: upgrade to 3.4.11 --- 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 8b0e3e0d8a2..9cf27901142 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.10"; + version = "3.4.11"; 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 = "03xfiyhv6zl3wn78bgm7a30w4hs2p328s447slilp0z2w09jqn4q"; + sha256 = "0fda9z5dxvn8sbgr1c143ly8ixm0grymwm4r94nryby9i03s03a2"; }; config = configWithPlatform stdenv.platform; -- GitLab From ce3e42df72a218a8b6c5e1cda847de79142fc2fd Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sun, 16 Sep 2012 10:52:22 +0200 Subject: [PATCH 0484/5607] linux aufs3: upgrade patch and utils to 20120827 for all 3.x kernels --- pkgs/os-specific/linux/kernel/patches.nix | 48 +++++++++++------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 7aa365a67de..a7f737d65e7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -107,13 +107,13 @@ rec { aufs3_0 = rec { name = "aufs3.0"; - version = "3.0"; - utilRev = "cabe3601001ab3838215116c32715c9de9412e62"; - utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f"; + version = "3.0.20120827"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "517b27621cdfb793959acac849dae9888338526a"; - sha256 = "8085200ac78d0c1e082d4c721a09f4a4c1d96ae86e307075836d09c3e7d502df"; + rev = "4bd8efe495832ec43c26cb31ddcab3bae56485da"; + sha256 = "496113f0eae1a24ae0c1998d1c73fc7c13961579c8e694b3651a8080eae7b74e"; }; features.aufsBase = true; features.aufs3 = true; @@ -121,13 +121,13 @@ rec { aufs3_1 = rec { name = "aufs3.1"; - version = "3.1"; - utilRev = "cabe3601001ab3838215116c32715c9de9412e62"; - utilHash = "7fc6cfe1e69a0b2438eaee056e15d42a2d6be396a637fcfb1b89858fcecc832f"; + version = "3.1.20120827"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "7386b57432ec5e73632a5375804239b02b6c00f0"; - sha256 = "af4e9ad890e1b72d14170c97d8ead53291f09e275db600932724e6181530be2d"; + rev = "9be47f1ff7c86976b0baa7847f22d75983e53922"; + sha256 = "0cd239b9aad396750a26a5cd7b0d54146f21db63fb13d3fa03c4f73b7ebce77e"; }; features.aufsBase = true; features.aufs3 = true; @@ -135,13 +135,13 @@ rec { aufs3_2 = rec { name = "aufs3.2"; - version = "3.2"; - utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f"; - utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4"; + version = "3.2.20120827"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033"; - sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea"; + rev = "267cb1138b4724ee028ec64ace556abdf993c9f4"; + sha256 = "61f69264806cf06a05548166e2bc8fd121de9a3e524385f725d76abab22b8a0d"; }; features.aufsBase = true; features.aufs3 = true; @@ -149,13 +149,13 @@ rec { aufs3_3 = rec { name = "aufs3.3"; - version = "3.3.20120730"; + version = "3.3.20120827"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "ff0c9f1c002ef564d7bd52dd56a9b72f4ee7ce0c"; - sha256 = "cfa1a06669c984e1b8755da649aac40152e8018ee87939c5f0825100e45e196e"; + rev = "ef302b8a8a2862b622cf4826d08b1e076ee6acb7"; + sha256 = "7f78783685cc3e4eb825cd5dd8dabc82bb16c275493a850e8b7955ac69048d98"; }; features.aufsBase = true; features.aufs3 = true; @@ -163,13 +163,13 @@ rec { aufs3_4 = rec { name = "aufs3.4"; - version = "3.4.20120730"; + version = "3.4.20120827"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "8d7338df43d5e5372424813679c7531cf96ec260"; - sha256 = "37880124df88791d51089277230df0816fc5545c9752be3fa5173385489362c6"; + rev = "79d8207b22c38420757adf7eec86ee2dcec7443c"; + sha256 = "bc148aa251c6e63edca70c516c0548dc9b3e48653039df4cf693aa2bcc1b9bb0"; }; features.aufsBase = true; features.aufs3 = true; @@ -177,13 +177,13 @@ rec { aufs3_5 = rec { name = "aufs3.5"; - version = "3.5.20120813"; + version = "3.5.20120827"; utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; patch = makeAufs3StandalonePatch { inherit version; - rev = "85b5f7059bc8a1759989408a13fc56f92e0d6d31"; - sha256 = "2be13407a2291c7e69658f10a6fb7672751c906a27ac700a2e5e05dbada97cc5"; + rev = "18e455787597579fe144cdb2f18aa6a0a32c46a4"; + sha256 = "9649a4cb00e41e2b2e3aa57c3869c33faf90ecbd845a3ac0119922655e80a030"; }; features.aufsBase = true; features.aufs3 = true; -- GitLab From 6a634798995424adf62e56e2f6e5e1fe3798e8db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 16 Sep 2012 22:36:43 +0200 Subject: [PATCH 0485/5607] amd-ucode: updating to 2012-09-10 --- pkgs/os-specific/linux/firmware/amd-ucode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/amd-ucode/default.nix b/pkgs/os-specific/linux/firmware/amd-ucode/default.nix index 685b44a1651..dc5959d400d 100644 --- a/pkgs/os-specific/linux/firmware/amd-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/amd-ucode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "amd-ucode-2012-01-17"; + name = "amd-ucode-2012-09-10"; src = fetchurl { url = "http://www.amd64.org/pub/microcode/${name}.tar"; - sha256 = "0mqnbs87khv6p874cbyf9nb8i4gc592ws67lyzhc4chmwvc9ln47"; + sha256 = "065phvhx5hx5ssdd1x2p5m1yv26ak7l5aaw6yk6h95x9mxn5r111"; }; installPhase = '' -- GitLab From 029aabe7f38a5a030c3568ce610f40cc63156e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 16 Sep 2012 22:41:32 +0200 Subject: [PATCH 0486/5607] mtdutils: updating, and making them build The previous 1.3.1 wasn't properly fetched by fetchgit, somehow. --- pkgs/tools/filesystems/mtdutils/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 9e7e3a16e01..4cb09d53adc 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -1,22 +1,19 @@ {stdenv, fetchgit, libuuid, lzo, zlib, acl}: let - version = "1.3.1"; + version = "1.5.0"; in stdenv.mkDerivation { name = "mtd-utils-${version}"; src = fetchgit { url = git://git.infradead.org/mtd-utils.git; - rev = "v" + version; - sha256 = "0pjjs9x03bgvphqwlw99c2cpkpjsx0vkqi79vjl7fcb9pyrghgd1"; + rev = "refs/tags/v" + version; + sha256 = "cc645c0ec28083431b11f3b38f9f7759378d89e11047a883529f703e1b6c1cce"; }; patchPhase = '' sed -i -e s,/usr/local,, -e s,/usr,$out, common.mk - - # gcc 4.5.1 issues a warning where 4.4.3 did not - sed -i -e s/-Werror// ubi-utils/old-utils/Makefile ''; buildInputs = [ libuuid lzo zlib acl ]; -- GitLab From 04f93115a30fbd7b605c8bbc7ed6e9b8472e7302 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 16 Sep 2012 22:42:15 +0200 Subject: [PATCH 0487/5607] sheevaplug: adding ubifs support to the kernel. --- pkgs/top-level/platforms.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 7a45492b032..1e2bb4b1ec7 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -99,6 +99,18 @@ rec { # nixos mounts some cgroup CGROUPS y + + # Latencytop + LATENCYTOP y + + # Ubi for the mtd + MTD_UBI y + UBIFS_FS y + UBIFS_FS_XATTR y + UBIFS_FS_ADVANCED_COMPR y + UBIFS_FS_LZO y + UBIFS_FS_ZLIB y + UBIFS_FS_DEBUG n ''; kernelTarget = "uImage"; uboot = "sheevaplug"; -- GitLab From 98b7228c06eb5c4ff16e2caed92e4531702a4d40 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Sep 2012 05:52:56 +0200 Subject: [PATCH 0488/5607] darcs-to-git: New package from upstream Git. This consists of just one single ruby script, which runs shell commands assuming that the current PATH has all dependencies set up correctly. Unfortunately, this somewhat breaks functional purity as the command won't work correctly in environments that do not contain git, darcs or diffutils. During the patchPhase we replace all those dependencies directly in the ruby source code, rather than creating a wrapper. Afterwards we run a checkPhase which not only checks whether we caught all the dependencies (PATH=) but also checks if the conversion has been done correctly. Signed-off-by: aszlig --- .../git-and-tools/darcs-to-git/default.nix | 81 +++++++++++++++++++ .../git-and-tools/default.nix | 2 + 2 files changed, 83 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix new file mode 100644 index 00000000000..8c8e4f9e5b4 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: + +stdenv.mkDerivation rec { + name = "darcs-to-git-${version}"; + version = "0.2git"; + + src = fetchgit { + url = "git://github.com/purcell/darcs-to-git.git"; + rev = "58a55936899c7e391df5ae1326c307fbd4617a25"; + sha256 = "366aa691920991e21cfeebd4cbd53a6c42d80e2bc46ff398af482d1d15bac4c3"; + }; + + patchPhase = let + matchExecution = ''(\<(output_of|system|run)\([^"%]*("|%w\()|^[^"`]*`)''; + in '' + sed -r -i \ + -e '1s|^#!.*|#!${ruby}/bin/ruby|' \ + -e 's!${matchExecution}git\>!\1${git}/bin/git!' \ + -e 's!${matchExecution}darcs\>!\1${darcs}/bin/darcs!' \ + -e 's!${matchExecution}diff\>!\1${diffutils}/bin/diff!' \ + -e 's!\!${gnugrep}/bin/egrep!g' \ + -e 's!%w\(darcs init\)!%w(${darcs}/bin/darcs init)!' \ + darcs-to-git + ''; + + propagatedBuildInputs = [ ruby ]; + + installPhase = '' + install -vD darcs-to-git "$out/bin/darcs-to-git" + ''; + + doCheck = true; + + checkPhase = '' + orig_dir="$(pwd)" + darcs_repos="$(pwd)/darcs_test_repos" + git_repos="$(pwd)/git_test_repos" + test_home="$(pwd)/test_home" + mkdir "$darcs_repos" "$git_repos" "$test_home" + cd "$darcs_repos" + ${darcs}/bin/darcs init + echo "this is a test file" > new_file1 + ${darcs}/bin/darcs add new_file1 + HOME="$test_home" ${darcs}/bin/darcs record -a -m c1 -A none + echo "testfile1" > new_file1 + echo "testfile2" > new_file2 + ${darcs}/bin/darcs add new_file2 + HOME="$test_home" ${darcs}/bin/darcs record -a -m c2 -A none + ${darcs}/bin/darcs mv new_file2 only_one_file + rm -f new_file1 + HOME="$test_home" ${darcs}/bin/darcs record -a -m c3 -A none + cd "$git_repos" + HOME="$test_home" PATH= "$orig_dir/darcs-to-git" "$darcs_repos" + assertFileContents() { + echo -n "File $1 contains '$2'..." >&2 + if [ "x$(cat "$1")" = "x$2" ]; then + echo " passed." >&2 + return 0 + else + echo " failed: '$(cat "$1")' != '$2'" >&2 + return 1 + fi + } + echo "Checking if converted repository matches original repository:" >&2 + assertFileContents only_one_file testfile2 + ${git}/bin/git reset --hard HEAD^ + assertFileContents new_file1 testfile1 + assertFileContents new_file2 testfile2 + ${git}/bin/git reset --hard HEAD^ + assertFileContents new_file1 "this is a test file" + echo "All checks passed." >&2 + cd "$orig_dir" + rm -rf "$darcs_repos" "$git_repos" "$test_home" + ''; + + meta = { + description = "Converts a Darcs repository into a Git repository"; + homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index efe4fcb2d7c..6ee19832750 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -91,4 +91,6 @@ rec { gitSubtree = import ./git-subtree { inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt; }; + + darcsToGit = callPackage ./darcs-to-git { }; } -- GitLab From 9ff9d85ef61089a5402dac91803c9c0fc3cc84cb Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Sep 2012 06:31:58 +0200 Subject: [PATCH 0489/5607] darcs-to-git: Remove propagatedBuildInputs. I missed this while checking the commit diffs before my last push. And it really doesn't make sense to propagate ruby all the way up to whatever in the universe may depend on this package. Signed-off-by: aszlig --- .../version-management/git-and-tools/darcs-to-git/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 8c8e4f9e5b4..115424ac69c 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { darcs-to-git ''; - propagatedBuildInputs = [ ruby ]; - installPhase = '' install -vD darcs-to-git "$out/bin/darcs-to-git" ''; -- GitLab From 9a65507b0fbf27f536eff0e0b4a8fac9ada4722d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Sep 2012 09:28:24 +0200 Subject: [PATCH 0490/5607] nss: Fix and add URL for security_load.patch. We now provide an additional URL from the Debian Git repository as well, just to be sure that the URL is available. And, well, of course fix the URL that has gone invalid. Signed-off-by: aszlig --- pkgs/development/libraries/nss/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 38e9d80d5b7..a9629def8a3 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,7 +11,11 @@ let }; secLoadPatch = fetchurl { - url = "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.5-1/85_security_load.patch"; + name = "security_load.patch"; + urls = [ + "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" + "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" + ]; sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; }; -- GitLab From baa62239046f4bd8162c0a03009faf48e8f606db Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Sep 2012 14:35:35 +0200 Subject: [PATCH 0491/5607] node-packages: ability to build npms that have native extensions --- .../web/nodejs/build-node-package.nix | 18 +++++++++++++++--- pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/node-packages.nix | 5 +++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 98136709170..b12e2669f06 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,7 +1,16 @@ -{ stdenv, nodejs }: +{ stdenv, runCommand, nodejs, neededNatives}: -args @ { src, deps, ... }: +args @ { src, deps ? [], nativeDeps ? [], flags ? [], ... }: +with stdenv.lib; + +let npmFlags = concatStringsSep " " (map (v: "--${v}") flags); + sources = runCommand "node-sources" {} '' + tar xf ${nodejs.src} + mv node-v${nodejs.version} $out + ''; + +in stdenv.mkDerivation ({ unpackPhase = "true"; @@ -17,10 +26,13 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - ${nodejs}/bin/npm --registry http://www.example.com install ${src} + ${nodejs}/bin/npm --registry http://www.example.com --nodedir=${sources} install ${src} ${npmFlags} runHook postBuild ''; + buildNativeInputs = neededNatives; + buildInputs = nativeDeps; + installPhase = '' runHook preInstall mkdir $out diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54d50feb875..cf6ad3172dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -990,6 +990,7 @@ let nodePackages = recurseIntoAttrs (import ./node-packages.nix { inherit pkgs stdenv nodejs fetchurl; + neededNatives = [python] ++ lib.optional (lib.elem system lib.platforms.linux) utillinux; }); ldns = callPackage ../development/libraries/ldns { }; diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 7c083c7e0ee..2d5f6ba3ed9 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -1,8 +1,9 @@ -{ pkgs, stdenv, nodejs, fetchurl }: +{ pkgs, stdenv, nodejs, fetchurl, neededNatives }: let self = { buildNodePackage = import ../development/web/nodejs/build-node-package.nix { - inherit stdenv nodejs; + inherit stdenv nodejs neededNatives; + inherit (pkgs) runCommand; }; patchLatest = srcAttrs: -- GitLab From e0d35483aabf6d44fadd72012fb070ee21f72fa5 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Sep 2012 14:36:41 +0200 Subject: [PATCH 0492/5607] node-packages: upgrade mongodb and bson (and build native module) --- pkgs/top-level/node-packages.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 2d5f6ba3ed9..3bcf63449f0 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -96,14 +96,15 @@ let self = { ]; }; - "bson" = self."bson-0.1.0"; + "bson" = self."bson-0.1.3"; - "bson-0.1.0" = self.buildNodePackage rec { - name = "bson-0.1.0"; + "bson-0.1.3" = self.buildNodePackage rec { + name = "bson-0.1.3"; src = fetchurl { url = "http://registry.npmjs.org/bson/-/${name}.tgz"; - sha256 = "32618266420f4d2688e957a6a145aab6a1402c950b7b7c7c1d0520cbd08251c9"; + sha256 = "86ed2b1465e30a4089c8c88dee3d97fafcd7deb60edc3819c00a0604c84d5040"; }; + flags = [ "mongodb:native" ]; deps = [ ]; @@ -477,16 +478,16 @@ let self = { ]; }; - "mongodb" = self."mongodb-1.1.0-beta"; + "mongodb" = self."mongodb-1.1.7"; - "mongodb-1.1.0-beta" = self.buildNodePackage rec { - name = "mongodb-1.1.0-beta"; + "mongodb-1.1.7" = self.buildNodePackage rec { + name = "mongodb-1.1.7"; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; - sha256 = "05e5a798d4c3a499af1e77a33eb13a31d4fb688a63e97b3fe970a3bccea39ab3"; + sha256 = "10ed2903b839907e854a4ae4508940207f260500bfaff028497e9df865ead475"; }; deps = [ - self."bson-0.1.0" + self."bson-0.1.3" ]; }; -- GitLab From 177a0d761a9b0efbdc62ef3ffbae5e938c4ed758 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 13 Sep 2012 23:58:28 +0200 Subject: [PATCH 0493/5607] node-packages: add 4 packages - faye-websocket - node-uuid - rbytes - sockjs --- pkgs/top-level/node-packages.nix | 60 +++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 3bcf63449f0..2d995c1ce30 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -285,6 +285,19 @@ let self = { ]; }; + "faye-websocket" = self."faye-websocket-0.4.0"; + + "faye-websocket-0.4.0" = self.buildNodePackage rec { + name = "faye-websocket-0.4.0"; + src = fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/${name}.tgz"; + sha256 = "853b8d2f4611013da89faf45b6c9f6e440ad6c46616e405b8cf59b4302e78e2f"; + }; + deps = [ + + ]; + }; + "formidable" = self."formidable-1.0.11"; "formidable-1.0.11" = self.buildNodePackage rec { @@ -529,6 +542,19 @@ let self = { ]; }; + "node-uuid" = self."node-uuid-1.3.3"; + + "node-uuid-1.3.3" = self.buildNodePackage rec { + name = "node-uuid-1.3.3"; + src = fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/${name}.tgz"; + sha256 = "a3fbccc904944a9c8eadc59e55aaac908cc458569f539b50077d9672a84587a8"; + }; + deps = [ + + ]; + }; + "nopt" = self."nopt-2"; "nopt-2" = self.buildNodePackage rec { @@ -659,6 +685,22 @@ let self = { ]; }; + "rbytes" = self."rbytes-0.0.2"; + + "rbytes-0.0.2" = self.buildNodePackage rec { + name = "rbytes-0.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/rbytes/-/${name}.tgz"; + sha256 = "0fd4697be996ee12c65f8fb13b2edc7a554d22c31d1a344539bc611ce73b69aa"; + }; + deps = [ + + ]; + nativeDeps = [ + pkgs.openssl + ]; + }; + "redis" = self."redis-0.7.2"; "redis-0.6.7" = self.buildNodePackage rec { @@ -793,6 +835,21 @@ let self = { ]; }; + "sockjs" = self."sockjs-0.3.1"; + + "sockjs-0.3.1" = self.buildNodePackage rec { + name = "sockjs-0.3.1"; + src = fetchurl { + url = "http://registry.npmjs.org/sockjs/-/${name}.tgz"; + sha256 = "056476f23dbe2e2182e5edea755108a8b6dbaea4b675b228172e876c8649efdf"; + }; + deps = [ + self."node-uuid-1.3.3" + self."faye-websocket-0.4.0" + self."rbytes-0.0.2" + ]; + }; + "tar" = self."tar-~0.1.12"; "tar-~0.1.12" = self.buildNodePackage rec { @@ -900,8 +957,9 @@ let self = { }; "ws" = self."ws-0.4.x"; + "ws-0.4.x" = self."ws-0.4.21"; - "ws-0.4.x" = self.buildNodePackage rec { + "ws-0.4.21" = self.buildNodePackage rec { name = "ws-0.4.21"; src = self.patchLatest { url = "http://registry.npmjs.org/ws/-/${name}.tgz"; -- GitLab From 51722e95267fffdfce6b06e4852fadbcaa357d71 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 15:49:41 +0200 Subject: [PATCH 0494/5607] haskell-split: delete version 0.1.x ... again Man, getting rid of split 0.1.x is more difficult than I would have thought. --- pkgs/development/libraries/haskell/split/0.1.nix | 13 ------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 15 deletions(-) delete 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 deleted file mode 100644 index ad0df5c2cb0..00000000000 --- 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/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 902ab5050d1..b7c14710f5b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1432,7 +1432,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 {}; @@ -1811,7 +1810,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. -- GitLab From 9a6c3c8f60cd075b796de61b0856acf177245bc0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 15:50:11 +0200 Subject: [PATCH 0495/5607] xmonad-extras: patch to allow building with split 0.2.x --- pkgs/applications/window-managers/xmonad/xmonad-extras.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index 42ffeae6f9c..eefc865b537 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -10,7 +10,10 @@ cabal.mkDerivation (self: { hint libmpd mtl network parsec random regexPosix split X11 xmonad xmonadContrib ]; - configureFlags = "-f-with_hlist"; + patchPhase = '' + sed -i xmonad-extras.cabal -e 's|split .*|split|' + ''; + configureFlags = "-f-with_hlist -fwith_split -fwith_parsec"; meta = { homepage = "http://projects.haskell.org/xmonad-extras"; description = "Third party extensions for xmonad with wacky dependencies"; -- GitLab From 097e1bfdbd9cb81f832318df43f3662c94196f8e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 15:51:00 +0200 Subject: [PATCH 0496/5607] haskell-pandoc: enable building with blaze-html 0.5 or later --- pkgs/development/libraries/haskell/pandoc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 85a8338e431..a3c1ce94d33 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,4 +1,4 @@ -{ cabal, base64Bytestring, blazeHtml, citeprocHs +{ cabal, base64Bytestring, blazeHtml, blazeMarkup, citeprocHs , extensibleExceptions, filepath, highlightingKate, HTTP, json, mtl , network, pandocTypes, parsec, random, syb, tagsoup, temporary , texmath, time, utf8String, xml, zipArchive, zlib @@ -11,10 +11,12 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml citeprocHs extensibleExceptions filepath - highlightingKate HTTP json mtl network pandocTypes parsec random - syb tagsoup temporary texmath time utf8String xml zipArchive zlib + base64Bytestring blazeHtml blazeMarkup citeprocHs + extensibleExceptions filepath highlightingKate HTTP json mtl + network pandocTypes parsec random syb tagsoup temporary texmath + time utf8String xml zipArchive zlib ]; + configureFlags = "-fblaze_html_0_5"; jailbreak = true; meta = { homepage = "http://johnmacfarlane.net/pandoc"; -- GitLab From e6d0852c2c237adb8f4a8fc7c8dd8a24fcda8cce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:04:00 +0200 Subject: [PATCH 0497/5607] haskell-GLUT: patch version 2.3.0.0 to build with GHC 7.6.1 --- pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix | 6 +++++- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix index 7725d1c8303..4c50197a6d7 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix @@ -1,5 +1,5 @@ { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor +, OpenGLRaw, StateVar, Tensor, fetchurl }: cabal.mkDerivation (self: { @@ -8,6 +8,10 @@ cabal.mkDerivation (self: { sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99"; buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; + patches = [ + (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/e962ebb7bed7e61e4591ae67f86199d557c7d54c.patch"; sha256 = "0s9xrkz1pkbkhsjzwbj4ayynmvzp5cckkl2lrizcjwcnqv83srmq"; }) + (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/fced812bc726c208064a2c48e411f4d609444abc.patch"; sha256 = "1kc7ic70lq43v8ikbcgbs5f2l4wzaz9vylhkmp38q26zs6qzbv07"; }) + ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b7c14710f5b..4c747fa60aa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -122,7 +122,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); inherit (self) cabal ghc; cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok - GLUT = self.GLUT_2_3_0_0; # 7.6 fail + GLUT = self.GLUT_2_3_0_0; # 7.6 ok 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 -- GitLab From 3f5e18dcd75a4a8e9bcf250a312e19f691700932 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:08:28 +0200 Subject: [PATCH 0498/5607] haskell-HTTP: add version 4000.2.5 --- .../libraries/haskell/HTTP/4000.2.5.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.5.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix new file mode 100644 index 00000000000..f345e7c98e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.5"; + sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; + 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 4c747fa60aa..7ccff24abeb 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_3_0_0; # 7.6 ok 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 + HTTP = self.HTTP_4000_2_5; # 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 @@ -858,8 +858,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_4000_2_4 = callPackage ../development/libraries/haskell/HTTP/4000.2.4.nix {}; - HTTP = self.HTTP_4000_2_4; + HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; + HTTP = self.HTTP_4000_2_5; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; -- GitLab From 27cffbd3cbe7fd4331bc27f8cc8ce471222d5ac6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:08:39 +0200 Subject: [PATCH 0499/5607] haskell-network: add version 2.4.0.0 --- .../libraries/haskell/network/{2.3.1.0.nix => 2.4.0.0.nix} | 6 +++--- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/network/{2.3.1.0.nix => 2.4.0.0.nix} (69%) diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.4.0.0.nix similarity index 69% rename from pkgs/development/libraries/haskell/network/2.3.1.0.nix rename to pkgs/development/libraries/haskell/network/2.4.0.0.nix index 28fa50d8342..421f023ab73 100644 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/network/2.4.0.0.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.3.1.0"; - sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; + version = "2.4.0.0"; + sha256 = "1l4gdhjac7nnl4zd03bndjbjm9fizmxhimz2bznjw19q6gbp3rp0"; buildDepends = [ parsec ]; meta = { - homepage = "http://github.com/haskell/network"; + homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; 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 7ccff24abeb..7b15c688c27 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_5; # 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 + network = self.network_2_4_0_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 @@ -1130,8 +1130,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_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; - network = self.network_2_3_1_0; + network_2_4_0_0 = callPackage ../development/libraries/haskell/network/2.4.0.0.nix {}; + network = self.network_2_4_0_0; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; -- GitLab From f766cd32ee1bf6be01f8a7962c478783d45cec54 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:09:09 +0200 Subject: [PATCH 0500/5607] haskell-HTTP: drop 4000.2.4 --- .../libraries/haskell/HTTP/4000.2.4.nix | 15 --------------- 1 file changed, 15 deletions(-) delete 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 deleted file mode 100644 index 6f7b57ba64c..00000000000 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.4.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ 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 ]; - }; -}) -- GitLab From 83635154311432eebf396838dd951cd938a5ebac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:55 +0200 Subject: [PATCH 0501/5607] haskell-idris: update to version 0.9.3 --- pkgs/development/compilers/idris/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index fe9ce209191..99b8cbb7337 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,15 +1,15 @@ -{ cabal, binary, Cabal, epic, filepath, happy, haskeline, mtl -, parsec, transformers +{ cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec +, transformers }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.2.1"; - sha256 = "16jbmyza57066s3wmkvgwn11kqn0nzkjrrvsinh9xd69a79h2iiy"; + version = "0.9.3"; + sha256 = "1g8mb5g4w6zgcfx2g7l5ksr0lsjfghznxgh684yzlg8pfzah0hqh"; isLibrary = false; isExecutable = true; buildDepends = [ - binary Cabal epic filepath haskeline mtl parsec transformers + binary Cabal filepath haskeline mtl parsec transformers ]; buildTools = [ happy ]; meta = { -- GitLab From 3c627e290c2711c35847c3d84d2e999bb1452cc8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:55 +0200 Subject: [PATCH 0502/5607] haskell-JuicyPixels: update to version 2.0 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index a99f8295c60..f6f37cb9692 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "1.3"; - sha256 = "07wljfag4ylw16wdi7znjb61pfihdik5d7p4h2lmz6xirm4mjzrm"; + version = "2.0"; + sha256 = "1qvdp0b2fn0cgp9vrm2p35jx8qcz1ikpvjzwkdkc8q84yr1x0457"; 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)"; + description = "Picture loading/serialization (in png, jpeg, bitmap and gif)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; -- GitLab From b581d13fefd26a9616cf656f80f39255e23d4284 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0503/5607] haskell-accelerate-cuda: update to version 0.12.1.2 --- .../libraries/haskell/accelerate-cuda/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 3772320b0c2..26f2c0a14c0 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -1,15 +1,15 @@ -{ cabal, accelerate, binary, blazeBuilder, cryptohash, cuda -, fclabels, filepath, hashable, hashtables, languageCQuote -, mainlandPretty, mtl, srcloc, transformers, unorderedContainers +{ cabal, accelerate, binary, cryptohash, cuda, fclabels, filepath +, hashable, hashtables, languageCQuote, mainlandPretty, mtl, srcloc +, text, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "accelerate-cuda"; - version = "0.12.1.1"; - sha256 = "1kj9i6djjb46ad3dnzk72mf33r8h1mjxljs7x5rf2d658hqk5yfv"; + version = "0.12.1.2"; + sha256 = "184rxdp9idvhrqa0k3fqcm3nrgjcs3f53dz7wrhhpfa3iqrr6vd4"; buildDepends = [ - accelerate binary blazeBuilder cryptohash cuda fclabels filepath - hashable hashtables languageCQuote mainlandPretty mtl srcloc + accelerate binary cryptohash cuda fclabels filepath hashable + hashtables languageCQuote mainlandPretty mtl srcloc text transformers unorderedContainers ]; meta = { -- GitLab From 24e100b38ad836fc12afb4291a0d48be0733df66 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0504/5607] haskell-binary: update to version 0.6.0.0 --- pkgs/development/libraries/haskell/binary/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index a8fefba0274..83ad3df7071 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -2,10 +2,10 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.5.1.1"; - sha256 = "0s62a92a2wwp8hdmkc6j6i9lh5mi6z1yd26fbhsbbm8bxah64pcl"; + version = "0.6.0.0"; + sha256 = "0p72w7f9nn19g2wggsh8x4z7y9s174f3drz9a5ln4x7h554swcxv"; meta = { - homepage = "http://code.haskell.org/binary/"; + homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From 1a64cbaf850822104818394973144ec3627e7528 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0505/5607] haskell-blaze-markup: update to version 0.5.1.1 --- pkgs/development/libraries/haskell/blaze-markup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index 7a5adbf1079..1f6a83894cc 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "blaze-markup"; - version = "0.5.1.0"; - sha256 = "0vq0xzwa13sjybg6zdi3ynsn6yxyl1q6rbalvb9r6f3plrmik37a"; + version = "0.5.1.1"; + sha256 = "14va7db8icf2xj7v4i5z0srgv74pf8z6w7046lxs3cyj5pcjl2r9"; buildDepends = [ blazeBuilder text ]; meta = { homepage = "http://jaspervdj.be/blaze"; -- GitLab From e6120ed7be97446730e0f203f9f3b437536bb3cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0506/5607] haskell-certificate: update to version 1.2.7 --- 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 d79f6faa3ef..91efd96e683 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.6"; - sha256 = "1li65r4zbff7r7p533p5xw2z3rd0xnlb2bbwqdldrnswy4mvlakx"; + version = "1.2.7"; + sha256 = "02fsip23k97p6wx94d867z5v37yfamrlxv4qvv9wcgjzmh2694ay"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; -- GitLab From ca5314f472bcb5427b1e740754fe45c2f71a0a77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0507/5607] haskell-cipher-aes: update to version 0.1.2 --- pkgs/development/libraries/haskell/cipher-aes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index e89fc1d6faf..42152bfb0d7 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.1.1"; - sha256 = "0pyiqsdvvq0qhlin17rijqjq0sc0i9nl9rdwbql01fr4pw46cwwg"; + version = "0.1.2"; + sha256 = "1c8drabfmx5wc519kxsr64bdvakfvxwzhfh7ym01kk1dpja0nlnq"; isLibrary = true; isExecutable = true; meta = { -- GitLab From a05489e7e8a58fd129ce57d396c5d055c6c957fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0508/5607] haskell-data-lens-template: update to version 2.1.7 --- .../libraries/haskell/data-lens-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix index fc058b92e54..7ba9e3f9da7 100644 --- a/pkgs/development/libraries/haskell/data-lens-template/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "data-lens-template"; - version = "2.1.5"; - sha256 = "09i9lby5jd2kcg0l7y4hkga7jxixcpqw4dc7h1kngqdz92a1ydxc"; + version = "2.1.7"; + sha256 = "108xvk5glsw016vdvjb1p3a9zh7rgbkjv5xashs1hj25f8k4cw49"; buildDepends = [ dataLens ]; meta = { - homepage = "http://github.com/ekmett/data-lens-template/"; + homepage = "http://github.com/roconnor/data-lens-template/"; description = "Utilities for Data.Lens"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From 27ab1bab7f248170ab95729d49002cd443daab12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0509/5607] haskell-generic-deriving: update to version 1.2.2 --- .../libraries/haskell/generic-deriving/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index ffc44542976..67a35960ac9 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.2.1"; - sha256 = "0ld4kh3p3lmavxi4y25fpxvq75qk7bd87yvwcbj63j6af1v60h2z"; + version = "1.2.2"; + sha256 = "1k64c3wqvgcvwarv55v8c303l959rs01znq443wynzi7kz7xcfl9"; meta = { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 0c11a13bd5089fba5d12a92ac6097b53f938bcbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0510/5607] haskell-hakyll: update to version 3.4.2.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 4224bfe1216..e0b7d4637d5 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.4.1.0"; - sha256 = "028wq61kvh2nkz8dxbpcnvic1vlqnz1a2l1xrvficmvk25qyqmvy"; + version = "3.4.2.0"; + sha256 = "18yqbiw75wjzc48s5v2aisdc5w2q1rkijxa5p4f4i17flif72j2n"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer -- GitLab From 6314bfdb4c6694baa99ecf0473d81015807bd09d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0511/5607] haskell-hashtables: update to version 1.0.1.7 --- pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 1f9e4b418e2..08f93355910 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.6"; - sha256 = "071msa15447rk2zc5jbpms8sc1ml8yi1n5pycycrcik8dhsm3slb"; + version = "1.0.1.7"; + sha256 = "0swk501whj08jj9q1d1lwg06nakimxnr7797zx8y8275f5mmisi7"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; -- GitLab From 17e6b25fb5850749ce1e7bd69ed84de65a48f4e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:56 +0200 Subject: [PATCH 0512/5607] haskell-language-c-quote: update to version 0.4.1 --- .../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 7cf0aae9596..3f835383831 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.1"; + sha256 = "1graq6nfmzd2lj6fh1rwyaikfrlzn05pgd347dzrfq5ch35fgg10"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol -- GitLab From 079ff819852dea17daa6f301bc8a731561a54e29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0513/5607] haskell-liblastfm: update to version 0.0.3.5 --- pkgs/development/libraries/haskell/liblastfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index c625fc44479..45cdfb09d66 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.0.3.4"; - sha256 = "1d8fypl9s64jpsr8hygyfqq6jzv1bvd22zq4f93xsffpvv7nqnyk"; + version = "0.0.3.5"; + sha256 = "185vk5648m2xf74fmv7ccrbzvqd5qmlfa9fnn0ywv3ikmf61y0fg"; buildDepends = [ aeson curl mtl pureMD5 urlencoded utf8String xml ]; -- GitLab From de5902e386b3e8e07637af120e06ab262d4b4c4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0514/5607] haskell-mainland-pretty: update to version 0.2.2 --- .../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 d64a6c76180..e22e0b053e6 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.2"; + sha256 = "0kvn67g2ic46ybgyxpgpzjapwiww9848m9dv8y3xkkl7jd8anpb2"; + buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Pretty printing designed for printing source code"; -- GitLab From 7830e23ea5481f2c5ff906f2eb547b5b748d264e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0515/5607] haskell-monads-tf: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/monads-tf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix index 53c0a2cad8e..f51fd8c840a 100644 --- a/pkgs/development/libraries/haskell/monads-tf/default.nix +++ b/pkgs/development/libraries/haskell/monads-tf/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monads-tf"; - version = "0.1.0.0"; - sha256 = "1d38rddm9h8crs96zhzj87a3ygix0ipyxy0qcyas88k60fgavg5i"; + version = "0.1.0.1"; + sha256 = "19za12iazwrbqwpxy6lkj01dwm921386ryxgdqvcqisn8cj6jm1v"; buildDepends = [ transformers ]; meta = { description = "Monad classes, using type families"; -- GitLab From 15d02d4a1d9a1cbc731b61aea87cf1c342668d05 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0516/5607] haskell-process-extras: update to version 0.2.0 --- .../libraries/haskell/process-extras/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix index ac2950d4927..1d9cb4f8062 100644 --- a/pkgs/development/libraries/haskell/process-extras/default.nix +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -1,10 +1,10 @@ -{ cabal, text }: +{ cabal, deepseq, text }: cabal.mkDerivation (self: { pname = "process-extras"; - version = "0.1.3"; - sha256 = "16hm1w34qnrpb6x8gaqv1bs1cd4p98kayf23275s6vd48kw9v0b0"; - buildDepends = [ text ]; + version = "0.2.0"; + sha256 = "0mr4f2v19qz6d6jhffz9gky0ykdqwl8c11adbdm04wm2a3xsvf7g"; + buildDepends = [ deepseq text ]; meta = { homepage = "https://github.com/davidlazar/process-extras"; description = "Process extras"; -- GitLab From 2379b71850cecf08a288929cd00dbac2d127389f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0517/5607] haskell-srcloc: update to version 0.2.1 --- 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 d76309bc795..2ca9e373101 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.1"; + sha256 = "03b0ra5g7mqcjjfnhm84mv4ph454j08pb9dwxrv9zfwk1kiqb2ss"; + buildDepends = [ syb ]; + noHaddock = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Data types for managing source code locations"; -- GitLab From 99859a9e6fc840fff8017adb2b27d06225f591fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0518/5607] haskell-stylish-haskell: update to version 0.5.0.2 --- .../libraries/haskell/stylish-haskell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index eca99a8c440..2f76c16a2a4 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,9 +4,9 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.4.0.0"; - sha256 = "1d5a7a5f1lbyf7if0sb9vhmnbi5ry28wakhsgh75hvgzd999vbhx"; - isLibrary = false; + version = "0.5.0.2"; + sha256 = "0am63hw24c1yja1sb2xsbi1bcyfxb1qsypszkpaylvks797czmc7"; + isLibrary = true; isExecutable = true; buildDepends = [ aeson cmdargs filepath haskellSrcExts mtl strict syb yaml -- GitLab From 38ab8228b27ac21d23bc9567f25f30122dfb72df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0519/5607] haskell-system-fileio: update to version 0.3.10 --- 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 7534ce4a1d1..7b1f7d7bcfd 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.9"; - sha256 = "0mfmijwnkp92s58jb51lk0p1p3418f6qskr95phc1zp40yrcw8nx"; + version = "0.3.10"; + sha256 = "1f8si6m62nxzj71jgyhxl38szmw8wr3frvgih596vfjxwdhqpkq4"; buildDepends = [ systemFilepath text time ]; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; -- GitLab From 03b1403c8d54f9a0c292dd44d4c129d1664c80dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0520/5607] haskell-tagged: update to version 0.4.4 --- pkgs/development/libraries/haskell/tagged/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index dde949686bd..e435671fe22 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.4.2.1"; - sha256 = "0acd0wyyl6nx8i6r5h6smb7apmnmic6kn7ks9pc8nfmhlzhgfk57"; + version = "0.4.4"; + sha256 = "0bc88q33pyz4sx429awhxmnjzvmsg7vwwsqi2w7yf8lrmz5ph08x"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; -- GitLab From 03ea8d67ad7279b6a035ef8a15af3bbcd8244835 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0521/5607] haskell-tagstream-conduit: update to version 0.5.3 --- .../libraries/haskell/tagstream-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index 2f22f8e905d..84187bb4c1f 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tagstream-conduit"; - version = "0.5.2"; - sha256 = "12hg9khc670499c3ymc0s4xd2sg71grlk21ykqmby972dva77vxr"; + version = "0.5.3"; + sha256 = "08g34dbb59mrpj0lym5a0zlygvj7in57nkhbk84kxvggrhl0jndl"; buildDepends = [ attoparsec blazeBuilder blazeBuilderConduit conduit text ]; -- GitLab From 866e6af90bab80db140a97444faa41ada7b2789d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:57 +0200 Subject: [PATCH 0522/5607] haskell-xmlhtml: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/xmlhtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index 654da2e76b5..adbf68655ca 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xmlhtml"; - version = "0.2.0.2"; - sha256 = "0dqlqx3cnrqap3ficdkmwm8661j8i7qknb8xhjqvfmnb9pwqdks2"; + version = "0.2.0.3"; + sha256 = "03bwsm3dazc01cwndlm92nr35a4fllsxx17rp72d2vnf1571a1vb"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup parsec text unorderedContainers ]; -- GitLab From 1a89d014976f65f9eb96e8900b67913958015c89 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Sep 2012 16:17:58 +0200 Subject: [PATCH 0523/5607] haskell-zlib-enum: update to version 0.2.3 --- pkgs/development/libraries/haskell/zlib-enum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index d4ec47410fc..f799194c0f6 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "zlib-enum"; - version = "0.2.2.1"; - sha256 = "02ava6h40bqfmby33683nxasfw5fmrgfvbx6kqgz1gqz5921gjx9"; + version = "0.2.3"; + sha256 = "0lr72h4wlclav0p0j5wwaxifq97lw7rh3612lva73fg45akl9di1"; isLibrary = true; isExecutable = true; buildDepends = [ enumerator transformers zlibBindings ]; -- GitLab From 0444a83417f8ae42d407c9470c207cac1e76aac5 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Tue, 18 Sep 2012 09:23:27 +0200 Subject: [PATCH 0524/5607] texlive-beamer: 3.07 -> 3.10 (works with texlive 2012 now) --- pkgs/tools/typesetting/tex/texlive/beamer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix index 851ad0707a1..bf9079ab104 100644 --- a/pkgs/tools/typesetting/tex/texlive/beamer.nix +++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix @@ -1,9 +1,9 @@ args: with args; rec { - name = "texlive-beamer-2007"; + name = "texlive-beamer-2012"; src = fetchurl { - url = mirror://debian/pool/main/l/latex-beamer/latex-beamer_3.07.orig.tar.gz; - sha256 = "07ldhg5f0hcnhjgzg5g8ailqacn8zhqc8nl2jkxc43c2qxbvswbv"; + url = mirror://debian/pool/main/l/latex-beamer/latex-beamer_3.10.orig.tar.gz; + sha256 = "1vk7nr1lxinyj941nz5xzcpzircd60s8sgmq7jd2gqmf5ynd27nx"; }; buildInputs = [texLive]; -- GitLab From 7a505d783071d5c4d2acbba3c80d68cbe999c2a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 11:57:13 +0200 Subject: [PATCH 0525/5607] haskell-strptime: add version 1.0.6 --- .../libraries/haskell/strptime/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/strptime/default.nix diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix new file mode 100644 index 00000000000..f0b9c638946 --- /dev/null +++ b/pkgs/development/libraries/haskell/strptime/default.nix @@ -0,0 +1,13 @@ +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "strptime"; + version = "1.0.6"; + sha256 = "1brzh22nrs2mg5h815vj8vlz0qn2jwm4y4sdp5zlszjxfsqc2hp7"; + buildDepends = [ time ]; + meta = { + description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)"; + 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 7b15c688c27..1cecf54c95d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1389,6 +1389,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); stringsearch = callPackage ../development/libraries/haskell/stringsearch {}; + strptime = callPackage ../development/libraries/haskell/strptime {}; + stylishHaskell = callPackage ../development/libraries/haskell/stylish-haskell {}; syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; -- GitLab From 6e0a1768786b20a6f8e3a2ba33fc1af40d61ba6f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 11:57:26 +0200 Subject: [PATCH 0526/5607] haskell-vcs-revision: add version 0.0.1 --- .../libraries/haskell/vcs-revision/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/vcs-revision/default.nix diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix new file mode 100644 index 00000000000..a1cd2783931 --- /dev/null +++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "vcs-revision"; + version = "0.0.1"; + sha256 = "1zfv9b02ml8622kz755azhi4ajyxrqniiachd92znfrry4n8z1mn"; + meta = { + description = "Facilities for accessing the version control revision of the current directory"; + 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 1cecf54c95d..bffb621c647 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1570,6 +1570,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vault = callPackage ../development/libraries/haskell/vault {}; + vcsRevision = callPackage ../development/libraries/haskell/vcs-revision {}; + Vec = callPackage ../development/libraries/haskell/Vec {}; vector = callPackage ../development/libraries/haskell/vector {}; -- GitLab From 3865d54f0f8a4bdf3265fbf5c38edb7eab46fafb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 11:57:56 +0200 Subject: [PATCH 0527/5607] haskell-timeplot: add version 1.0.11 --- .../tools/haskell/timeplot/default.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/haskell/timeplot/default.nix diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix new file mode 100644 index 00000000000..4e4834e2241 --- /dev/null +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -0,0 +1,23 @@ +{ cabal, bytestringLexing, cairo, Chart, colour, dataAccessor +, dataAccessorTemplate, regexTdfa, strptime, time, transformers +, vcsRevision +}: + +cabal.mkDerivation (self: { + pname = "timeplot"; + version = "1.0.11"; + sha256 = "08lgs96wi0issnjwb6w41v3z1bbb6g08hrlbkw7h60rjqkg48svs"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + bytestringLexing cairo Chart colour dataAccessor + dataAccessorTemplate regexTdfa strptime time transformers + vcsRevision + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Timeplot"; + description = "A tool for visualizing time series from log files"; + 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 bffb621c647..3e462e8872e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1835,6 +1835,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); myhasktags = callPackage ../tools/misc/myhasktags {}; + timeplot = callPackage ../development/tools/haskell/timeplot {}; + # Games. LambdaHack = callPackage ../games/LambdaHack {}; -- GitLab From 2460be6f6316ff8b14bf920f66628b2976b2ac80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 11:58:05 +0200 Subject: [PATCH 0528/5607] haskell-splot: add version 0.3.4 --- .../tools/haskell/splot/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/haskell/splot/default.nix diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix new file mode 100644 index 00000000000..4541bece004 --- /dev/null +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -0,0 +1,21 @@ +{ cabal, bytestringLexing, cairo, Chart, colour, HUnit, mtl +, strptime, time, vcsRevision +}: + +cabal.mkDerivation (self: { + pname = "splot"; + version = "0.3.4"; + sha256 = "1qfi8vqm4zliz0lmi6njicm8xha6w8w55il09k0d1w5akwi93x5j"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + bytestringLexing cairo Chart colour HUnit mtl strptime time + vcsRevision + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Splot"; + description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes"; + 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 3e462e8872e..b5e9e4506d6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1835,6 +1835,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); myhasktags = callPackage ../tools/misc/myhasktags {}; + splot = callPackage ../development/tools/haskell/splot {}; + timeplot = callPackage ../development/tools/haskell/timeplot {}; # Games. -- GitLab From 438e301c8718475dd84ed84f9137ed3689dc0518 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 12:04:01 +0200 Subject: [PATCH 0529/5607] haskell-hashed-storage: update to version 0.5.10 --- pkgs/development/libraries/haskell/hashed-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index 04f465bb9fe..161e81eb375 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hashed-storage"; - version = "0.5.9"; - sha256 = "1ycn0zwk5jqm6wwgs8nxpdg7fh5wx0i2058i0a924whj196kkhk2"; + version = "0.5.10"; + sha256 = "1k7drnk0y5apjvwsiw85032yvxllbi7ndg6h9x207gnjxm64m0h5"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 061118c665239ab616961e65c86f0b7790b4419b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 12:04:01 +0200 Subject: [PATCH 0530/5607] haskell-pwstore-fast: update to version 2.3 --- pkgs/development/libraries/haskell/pwstore-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index add66a0bed2..d75823d6025 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pwstore-fast"; - version = "2.2"; - sha256 = "03b9vr5j6cadvi6w3lr8b9km4jq6jh0vzcmkxzq9qvvly89lx96a"; + version = "2.3"; + sha256 = "014l4n00lpg5037fkdwnxnv7xjfc3vlz1dphr7hfbqnjwf1z9ibw"; buildDepends = [ base64Bytestring cryptohash random ]; meta = { homepage = "https://github.com/PeterScott/pwstore"; -- GitLab From 5940f10394845f33c768a2134282498e0eba3be6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 12:04:01 +0200 Subject: [PATCH 0531/5607] haskell-tagsoup: update to version 0.12.8 --- 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 78f52a3ad32..3258267f012 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.7"; - sha256 = "0f4f0552n9qkycvh01jyk52190nk4frlp9za8vyczayrm3vmw268"; + version = "0.12.8"; + sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3"; isLibrary = true; isExecutable = true; buildDepends = [ text ]; -- GitLab From aa2d8d1e0281e5a3969d421299958ebfc12c7b80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 15:08:28 +0200 Subject: [PATCH 0532/5607] dovecot: rename file for version 1.0.3 to improve consistency --- pkgs/servers/mail/dovecot/{default.nix => 1.0.3.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/servers/mail/dovecot/{default.nix => 1.0.3.nix} (100%) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/1.0.3.nix similarity index 100% rename from pkgs/servers/mail/dovecot/default.nix rename to pkgs/servers/mail/dovecot/1.0.3.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf6ad3172dc..c3cb86c598f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5272,7 +5272,7 @@ let inherit stdenv lib dict; }; - dovecot = callPackage ../servers/mail/dovecot { }; + dovecot = callPackage ../servers/mail/dovecot/1.0.3.nix { }; dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { }; dovecot_2 = callPackage ../servers/mail/dovecot/2.x.nix { }; dovecot_2_0 = pkgs.dovecot_2; # Actually, 2.1 -- GitLab From 1ab6957c69cf114d5180899039a3239526cb2bb8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 11:08:45 -0400 Subject: [PATCH 0533/5607] Remove duplicate attribute --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eee8d221dc6..b821e3a6ee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2959,8 +2959,6 @@ let bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; - bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; - buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted; }; -- GitLab From 0b900d21f4346f0aa0324f787291c8e859004e45 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 11:09:18 -0400 Subject: [PATCH 0534/5607] Remove unused files --- .../tools/parsing/bison/bison-2.3.nix | 38 ---------------- .../tools/parsing/bison/bison-2.4.nix | 40 ----------------- .../tools/parsing/bison/bison-2.5.nix | 44 ------------------- pkgs/top-level/all-packages.nix | 7 --- 4 files changed, 129 deletions(-) delete mode 100644 pkgs/development/tools/parsing/bison/bison-2.3.nix delete mode 100644 pkgs/development/tools/parsing/bison/bison-2.4.nix delete mode 100644 pkgs/development/tools/parsing/bison/bison-2.5.nix diff --git a/pkgs/development/tools/parsing/bison/bison-2.3.nix b/pkgs/development/tools/parsing/bison/bison-2.3.nix deleted file mode 100644 index fcf4ed10795..00000000000 --- a/pkgs/development/tools/parsing/bison/bison-2.3.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl, m4}: - -assert m4 != null; - -stdenv.mkDerivation { - name = "bison-2.3"; - src = fetchurl { - url = mirror://gnu/bison/bison-2.3.tar.bz2; - md5 = "c18640c6ec31a169d351e3117ecce3ec"; - }; - - buildNativeInputs = [m4]; - propagatedBuildInputs = [m4]; - - meta = { - description = "GNU Bison, a Yacc-compatible parser generator"; - - 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. - ''; - - homepage = http://www.gnu.org/software/bison/; - - license = "GPLv2+"; - }; - - passthru = { glrSupport = true; }; -} diff --git a/pkgs/development/tools/parsing/bison/bison-2.4.nix b/pkgs/development/tools/parsing/bison/bison-2.4.nix deleted file mode 100644 index a79a5e96381..00000000000 --- a/pkgs/development/tools/parsing/bison/bison-2.4.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, m4}: - -stdenv.mkDerivation rec { - name = "bison-2.4.3"; - - src = fetchurl { - url = "mirror://gnu/bison/${name}.tar.bz2"; - sha256 = "019s3pdzggb71g7p7dgajhh53gh0h6nfl4yrzrs0jzsc37ph4lwk"; - }; - - buildNativeInputs = [m4]; - - doCheck = true; - - meta = { - description = "GNU Bison, a Yacc-compatible parser generator"; - - 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. - ''; - - homepage = http://www.gnu.org/software/bison/; - - license = "GPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; - - passthru = { glrSupport = true; }; -} diff --git a/pkgs/development/tools/parsing/bison/bison-2.5.nix b/pkgs/development/tools/parsing/bison/bison-2.5.nix deleted file mode 100644 index ea50b859020..00000000000 --- a/pkgs/development/tools/parsing/bison/bison-2.5.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, m4, perl }: - -stdenv.mkDerivation rec { - name = "bison-2.5"; - - src = fetchurl { - url = "mirror://gnu/bison/${name}.tar.bz2"; - sha256 = "1f1rai3v6k6xjii94964iq0alhc2hxwapqa363nfj8rbxvv0sdqa"; - }; - - buildNativeInputs = [ m4 ] - ++ stdenv.lib.optional doCheck perl; - propagatedBuildInputs = [ m4 ]; - - M4 = "${m4}/bin/m4"; - - doCheck = true; - - meta = { - description = "GNU Bison, a Yacc-compatible parser generator"; - - 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. - ''; - - homepage = http://www.gnu.org/software/bison/; - - license = "GPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - }; - - passthru = { glrSupport = true; }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b821e3a6ee5..c7f63748658 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2950,13 +2950,6 @@ let bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { }; - # These attributes are unused and should be removed as well as the - # corresponding nix files: - # - # bison23 = callPackage ../development/tools/parsing/bison/bison-2.3.nix { }; - # bison24 = callPackage ../development/tools/parsing/bison/bison-2.4.nix { }; - # 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 { -- GitLab From 375341bd73fb01b7451af750c7e0e86e78fc2b08 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 11:13:54 -0400 Subject: [PATCH 0535/5607] Remove obsolete Glibc versions --- .../libraries/glibc/2.5/binutils-ld.patch | 27 - .../libraries/glibc/2.5/builder.sh | 57 - .../libraries/glibc/2.5/default.nix | 40 - .../glibc/2.5/glibc-getcwd-param-MAX.patch | 14 - .../libraries/glibc/2.5/glibc-inline.patch | 1822 ----------------- .../libraries/glibc/2.5/glibc-pwd.patch | 74 - .../libraries/glibc/2.5/make-3-82-fix.patch | 14 - .../libraries/glibc/2.5/x86-fnstsw.patch | 32 - .../libraries/glibc/2.7/builder.sh | 60 - .../libraries/glibc/2.7/default.nix | 57 - .../glibc/2.7/nss-skip-unavail.patch | 25 - .../libraries/glibc/2.9/binutils-2.20.patch | 42 - .../libraries/glibc/2.9/binutils-ld.patch | 33 - .../libraries/glibc/2.9/builder.sh | 85 - .../libraries/glibc/2.9/default.nix | 103 - .../libraries/glibc/2.9/headers.nix | 63 - .../libraries/glibc/2.9/headersbuilder.sh | 38 - pkgs/development/libraries/glibc/2.9/info.nix | 47 - .../libraries/glibc/2.9/locale-override.patch | 72 - .../libraries/glibc/2.9/locales.nix | 67 - .../libraries/glibc/2.9/localesbuilder.sh | 50 - .../glibc/2.9/nss-skip-unavail.patch | 25 - .../libraries/glibc/2.9/rpcgen-path.patch | 72 - pkgs/top-level/all-packages.nix | 22 - 24 files changed, 2941 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.5/binutils-ld.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.5/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/glibc-inline.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/glibc-pwd.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch delete mode 100644 pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch delete mode 100644 pkgs/development/libraries/glibc/2.7/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.7/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/binutils-2.20.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/binutils-ld.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.9/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/headers.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/headersbuilder.sh delete mode 100644 pkgs/development/libraries/glibc/2.9/info.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/locale-override.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/locales.nix delete mode 100644 pkgs/development/libraries/glibc/2.9/localesbuilder.sh delete mode 100644 pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.9/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc/2.5/binutils-ld.patch b/pkgs/development/libraries/glibc/2.5/binutils-ld.patch deleted file mode 100644 index 4cd7ab3cec3..00000000000 --- a/pkgs/development/libraries/glibc/2.5/binutils-ld.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001 -From: Ulrich Drepper -Date: Sat, 31 Jan 2009 00:21:15 +0000 -Subject: [PATCH] * elf/Makefile (ld.so): Adjust the sed script to insert _begin in to - - newer linker scripts. ---- - ChangeLog | 5 +++++ - elf/Makefile | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/elf/Makefile b/elf/Makefile -index 8079fe9..e44ff1d 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -304,7 +304,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) - $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ - LC_ALL=C \ - sed -e '/^=========/,/^=========/!d;/^=========/d' \ -- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ -+ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ - > $@.lds - $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ - $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ --- -1.6.4 - diff --git a/pkgs/development/libraries/glibc/2.5/builder.sh b/pkgs/development/libraries/glibc/2.5/builder.sh deleted file mode 100644 index bc80af83b92..00000000000 --- a/pkgs/development/libraries/glibc/2.5/builder.sh +++ /dev/null @@ -1,57 +0,0 @@ -# glibc cannot have itself in its rpath. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - - -postUnpack() { - cd $sourceRoot/.. -} - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - substituteInPlace "$i" \ - --replace "@PWD@" "pwd" - done - - # Fix shell code that tries to determine whether GNU ld is recent enough. - substituteInPlace configure --replace '2.1[3-9]*)' '2.1[3-9]*|2.[2-9][0-9]*)' - - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - export NIX_DONT_SET_RPATH=1 -} - - -postInstall() { - if test -n "$installLocales"; then - make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.5/default.nix b/pkgs/development/libraries/glibc/2.5/default.nix deleted file mode 100644 index 8b8c204a480..00000000000 --- a/pkgs/development/libraries/glibc/2.5/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation { - name = "glibc-2.5"; - builder = ./builder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2; - md5 = "1fb29764a6a650a4d5b409dda227ac9f"; - }; - - patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ./glibc-inline.patch - ./x86-fnstsw.patch ./binutils-ld.patch ./make-3-82-fix.patch ]; - - inherit kernelHeaders installLocales; - - inherit (stdenv) is64bit; - - configureFlags="--enable-add-ons - --with-headers=${kernelHeaders}/include - --disable-sanity-checks - ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; - - enableParallelBuilding = true; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch b/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch deleted file mode 100644 index 8543dbbf1d7..00000000000 --- a/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch +++ /dev/null @@ -1,14 +0,0 @@ -2006-06-18 Mike Frysinger - - * sysdeps/unix/sysv/linux/getcwd.c: Include sys/param.h. - ---- glibc-old/sysdeps/unix/sysv/linux/getcwd.c -+++ glibc-new/sysdeps/unix/sysv/linux/getcwd.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/pkgs/development/libraries/glibc/2.5/glibc-inline.patch b/pkgs/development/libraries/glibc/2.5/glibc-inline.patch deleted file mode 100644 index 19e400e0d50..00000000000 --- a/pkgs/development/libraries/glibc/2.5/glibc-inline.patch +++ /dev/null @@ -1,1822 +0,0 @@ ---- libc/mach/mach/mig_support.h.jj 2001-07-06 06:55:35.000000000 +0200 -+++ libc/mach/mach/mig_support.h 2006-11-07 11:18:32.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1993,94,97,99,2001 Free Software Foundation, Inc. -+/* Copyright (C) 1993,94,97,99,2001,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -67,12 +67,12 @@ extern void mig_reply_setup (const mach_ - /* Idiocy support function. */ - extern vm_size_t mig_strncpy (char *__dst, const char *__src, vm_size_t __len); - extern vm_size_t __mig_strncpy (char *__dst, const char *__src, vm_size_t); --extern __inline vm_size_t -+__extern_inline vm_size_t - __mig_strncpy (char *__dst, const char *__src, vm_size_t __len) - { - return __stpncpy (__dst, __src, __len) - __dst; - } --extern __inline vm_size_t -+__extern_inline vm_size_t - mig_strncpy (char *__dst, const char *__src, vm_size_t __len) - { - return __mig_strncpy (__dst, __src, __len); ---- libc/mach/lock-intern.h.jj 2001-07-06 06:55:34.000000000 +0200 -+++ libc/mach/lock-intern.h 2006-11-06 21:05:34.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1994, 1996 Free Software Foundation, Inc. -+/* Copyright (C) 1994, 1996, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -22,7 +22,7 @@ - #include - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - ---- libc/include/stdlib.h.jj 2006-01-14 13:08:56.000000000 +0100 -+++ libc/include/stdlib.h 2006-11-06 21:08:02.000000000 +0100 -@@ -139,43 +139,43 @@ libc_hidden_proto (____strtoll_l_interna - libc_hidden_proto (____strtoul_l_internal) - libc_hidden_proto (____strtoull_l_internal) - --extern __inline double -+__extern_inline double - __NTH (__strtod_l (__const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc)) - { - return ____strtod_l_internal (__nptr, __endptr, 0, __loc); - } --extern __inline long int -+__extern_inline long int - __NTH (__strtol_l (__const char *__restrict __nptr, char **__restrict __endptr, - int __base, __locale_t __loc)) - { - return ____strtol_l_internal (__nptr, __endptr, __base, 0, __loc); - } --extern __inline unsigned long int -+__extern_inline unsigned long int - __NTH (__strtoul_l (__const char *__restrict __nptr, - char **__restrict __endptr, int __base, __locale_t __loc)) - { - return ____strtoul_l_internal (__nptr, __endptr, __base, 0, __loc); - } --extern __inline float -+__extern_inline float - __NTH (__strtof_l (__const char *__restrict __nptr, char **__restrict __endptr, - __locale_t __loc)) - { - return ____strtof_l_internal (__nptr, __endptr, 0, __loc); - } --extern __inline long double -+__extern_inline long double - __NTH (__strtold_l (__const char *__restrict __nptr, - char **__restrict __endptr, __locale_t __loc)) - { - return ____strtold_l_internal (__nptr, __endptr, 0, __loc); - } --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (__strtoll_l (__const char *__restrict __nptr, - char **__restrict __endptr, int __base, __locale_t __loc)) - { - return ____strtoll_l_internal (__nptr, __endptr, __base, 0, __loc); - } --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (__strtoull_l (__const char * __restrict __nptr, - char **__restrict __endptr, int __base, __locale_t __loc)) - { ---- libc/include/ctype.h.jj 2004-03-16 11:09:04.000000000 +0100 -+++ libc/include/ctype.h 2006-11-06 21:06:24.000000000 +0100 -@@ -15,7 +15,7 @@ extern int __isctype (int __c, int __mas - # include - - # ifndef CTYPE_EXTERN_INLINE /* Used by ctype/ctype-info.c, which see. */ --# define CTYPE_EXTERN_INLINE extern inline -+# define CTYPE_EXTERN_INLINE __extern_inline - # endif - - __libc_tsd_define (extern, CTYPE_B) ---- libc/include/sys/stat.h.jj 2006-02-12 22:29:08.000000000 +0100 -+++ libc/include/sys/stat.h 2006-11-06 21:07:01.000000000 +0100 -@@ -19,13 +19,13 @@ hidden_proto (__lxstat64) - hidden_proto (__xstat) - hidden_proto (__xstat64) - #endif --extern __inline__ int __stat (__const char *__path, struct stat *__statbuf) -+__extern_inline int __stat (__const char *__path, struct stat *__statbuf) - { - return __xstat (_STAT_VER, __path, __statbuf); - } - libc_hidden_proto (__xmknod) --extern __inline__ int __mknod (__const char *__path, __mode_t __mode, -- __dev_t __dev) -+__extern_inline int __mknod (__const char *__path, __mode_t __mode, -+ __dev_t __dev) - { - return __xmknod (_MKNOD_VER, __path, __mode, &__dev); - } ---- libc/stdlib/stdlib.h.jj 2006-10-31 23:05:34.000000000 +0100 -+++ libc/stdlib/stdlib.h 2006-11-06 21:16:09.000000000 +0100 -@@ -324,18 +324,18 @@ extern unsigned long long int __strtoull - /* Define inline functions which call the internal entry points. */ - - __BEGIN_NAMESPACE_STD --extern __inline double -+__extern_inline double - __NTH (strtod (__const char *__restrict __nptr, char **__restrict __endptr)) - { - return __strtod_internal (__nptr, __endptr, 0); - } --extern __inline long int -+__extern_inline long int - __NTH (strtol (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { - return __strtol_internal (__nptr, __endptr, __base, 0); - } --extern __inline unsigned long int -+__extern_inline unsigned long int - __NTH (strtoul (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { -@@ -345,13 +345,13 @@ __END_NAMESPACE_STD - - # ifdef __USE_ISOC99 - __BEGIN_NAMESPACE_C99 --extern __inline float -+__extern_inline float - __NTH (strtof (__const char *__restrict __nptr, char **__restrict __endptr)) - { - return __strtof_internal (__nptr, __endptr, 0); - } - # ifndef __LDBL_COMPAT --extern __inline long double -+__extern_inline long double - __NTH (strtold (__const char *__restrict __nptr, char **__restrict __endptr)) - { - return __strtold_internal (__nptr, __endptr, 0); -@@ -361,13 +361,13 @@ __END_NAMESPACE_C99 - # endif - - # ifdef __USE_BSD --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (strtoq (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { - return __strtoll_internal (__nptr, __endptr, __base, 0); - } --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (strtouq (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { -@@ -377,13 +377,13 @@ __NTH (strtouq (__const char *__restrict - - # if defined __USE_MISC || defined __USE_ISOC99 - __BEGIN_NAMESPACE_C99 --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (strtoll (__const char *__restrict __nptr, char **__restrict __endptr, - int __base)) - { - return __strtoll_internal (__nptr, __endptr, __base, 0); - } --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (strtoull (__const char * __restrict __nptr, char **__restrict __endptr, - int __base)) - { -@@ -393,17 +393,17 @@ __END_NAMESPACE_C99 - # endif - - __BEGIN_NAMESPACE_STD --extern __inline double -+__extern_inline double - __NTH (atof (__const char *__nptr)) - { - return strtod (__nptr, (char **) NULL); - } --extern __inline int -+__extern_inline int - __NTH (atoi (__const char *__nptr)) - { - return (int) strtol (__nptr, (char **) NULL, 10); - } --extern __inline long int -+__extern_inline long int - __NTH (atol (__const char *__nptr)) - { - return strtol (__nptr, (char **) NULL, 10); -@@ -412,7 +412,7 @@ __END_NAMESPACE_STD - - # if defined __USE_MISC || defined __USE_ISOC99 - __BEGIN_NAMESPACE_C99 --__extension__ extern __inline long long int -+__extension__ __extern_inline long long int - __NTH (atoll (__const char *__nptr)) - { - return strtoll (__nptr, (char **) NULL, 10); ---- libc/stdlib/bits/stdlib.h.jj 2005-08-22 17:06:07.000000000 +0200 -+++ libc/stdlib/bits/stdlib.h 2006-11-07 11:18:39.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Checking macros for stdlib functions. -- Copyright (C) 2005 Free Software Foundation, Inc. -+ Copyright (C) 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -28,7 +28,7 @@ extern char *__REDIRECT_NTH (__realpath_ - (__const char *__restrict __name, - char *__restrict __resolved), realpath) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - __NTH (realpath (__const char *__restrict __name, char *__restrict __resolved)) - { - if (__bos (__resolved) != (size_t) -1) -@@ -44,7 +44,7 @@ extern int __REDIRECT_NTH (__ptsname_r_a - size_t __buflen), ptsname_r) - __nonnull ((2)); - --extern __always_inline int -+__extern_always_inline int - __NTH (ptsname_r (int __fd, char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 -@@ -59,7 +59,7 @@ extern int __wctomb_chk (char *__s, wcha - extern int __REDIRECT_NTH (__wctomb_alias, (char *__s, wchar_t __wchar), - wctomb) __wur; - --extern __always_inline __wur int -+__extern_always_inline __wur int - __NTH (wctomb (char *__s, wchar_t __wchar)) - { - /* We would have to include to get a definition of MB_LEN_MAX. -@@ -83,7 +83,7 @@ extern size_t __REDIRECT_NTH (__mbstowcs - __const char *__restrict __src, - size_t __len), mbstowcs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src, - size_t __len)) - { -@@ -104,7 +104,7 @@ extern size_t __REDIRECT_NTH (__wcstombs - __const wchar_t *__restrict __src, - size_t __len), wcstombs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (wcstombs (char *__restrict __dst, __const wchar_t *__restrict __src, - size_t __len)) - { - --- libc/stdlib/gmp.h.jj 2002-08-27 00:39:44.000000000 +0200 -+++ libc/stdlib/gmp.h 2006-11-07 15:02:06.000000000 +0100 -@@ -1,6 +1,6 @@ - /* gmp.h -- Definitions for GNU multiple precision functions. - --Copyright (C) 1991, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -+Copyright (C) 1991, 1993, 1994, 1995, 1996, 2006 Free Software Foundation, Inc. - - This file is part of the GNU MP Library. - -@@ -21,6 +21,8 @@ MA 02111-1307, USA. */ - - #ifndef __GMP_H__ - -+#include -+ - #ifndef __GNU_MP__ - #define __GNU_MP__ 2 - #define __need_size_t -@@ -41,7 +43,7 @@ MA 02111-1307, USA. */ - - #ifndef _EXTERN_INLINE - #ifdef __GNUC__ --#define _EXTERN_INLINE extern __inline__ -+#define _EXTERN_INLINE __extern_inline - #else - #define _EXTERN_INLINE static - #endif ---- libc/ctype/ctype.h.jj 2004-09-08 00:23:45.000000000 +0200 -+++ libc/ctype/ctype.h 2006-11-07 11:18:56.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004 -+/* Copyright (C) 1991,92,93,95,96,97,98,99,2001,2002,2004,2006 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -187,13 +187,13 @@ __exctype (_tolower); - # endif - - # ifdef __USE_EXTERN_INLINES --extern __inline int -+__extern_inline int - __NTH (tolower (int __c)) - { - return __c >= -128 && __c < 256 ? (*__ctype_tolower_loc ())[__c] : __c; - } - --extern __inline int -+__extern_inline int - __NTH (toupper (int __c)) - { - return __c >= -128 && __c < 256 ? (*__ctype_toupper_loc ())[__c] : __c; ---- libc/nptl/sysdeps/pthread/bits/libc-lock.h.jj 2006-10-24 10:14:03.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/bits/libc-lock.h 2006-11-07 10:45:52.000000000 +0100 -@@ -1,5 +1,6 @@ - /* libc-internal interface for mutex locks. NPTL version. -- Copyright (C) 1996-2001, 2002, 2003, 2005 Free Software Foundation, Inc. -+ Copyright (C) 1996-2001, 2002, 2003, 2005, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -408,7 +409,7 @@ extern void _pthread_cleanup_pop_restore - - - /* Normal cleanup handling, based on C cleanup attribute. */ --extern __inline void -+__extern_inline void - __libc_cleanup_routine (struct __pthread_cleanup_frame *f) - { - if (f->__do_it) ---- libc/nptl/sysdeps/pthread/pthread.h.jj 2006-06-05 01:59:07.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/pthread.h 2006-11-07 10:49:27.000000000 +0100 -@@ -572,7 +572,7 @@ class __pthread_cleanup_class - function the compiler is free to decide inlining the change when - needed or fall back on the copy which must exist somewhere - else. */ --extern __inline void -+__extern_inline void - __pthread_cleanup_routine (struct __pthread_cleanup_frame *__frame) - { - if (__frame->__do_it) -@@ -1103,7 +1103,7 @@ extern int pthread_atfork (void (*__prep - - #ifdef __USE_EXTERN_INLINES - /* Optimizations. */ --extern __inline int -+__extern_inline int - __NTH (pthread_equal (pthread_t __thread1, pthread_t __thread2)) - { - return __thread1 == __thread2; ---- libc/nptl/sysdeps/pthread/allocalim.h.jj 2006-05-02 08:16:07.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/allocalim.h 2006-11-07 10:46:28.000000000 +0100 -@@ -21,8 +21,7 @@ - #include - - --extern int --__always_inline -+__extern_always_inline int - __libc_use_alloca (size_t size) - { - return (__builtin_expect (size <= PTHREAD_STACK_MIN / 4, 1) ---- libc/nptl/sysdeps/pthread/gai_misc.h.jj 2006-09-05 17:23:12.000000000 +0200 -+++ libc/nptl/sysdeps/pthread/gai_misc.h 2006-11-06 21:17:39.000000000 +0100 -@@ -76,7 +76,7 @@ - #define gai_start_notify_thread __gai_start_notify_thread - #define gai_create_helper_thread __gai_create_helper_thread - --extern inline void -+__extern_inline void - __gai_start_notify_thread (void) - { - sigset_t ss; -@@ -85,7 +85,7 @@ __gai_start_notify_thread (void) - INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8); - } - --extern inline int -+__extern_inline int - __gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), - void *arg) - { ---- libc/nptl/sysdeps/unix/sysv/linux/aio_misc.h.jj 2006-03-02 18:32:45.000000000 +0100 -+++ libc/nptl/sysdeps/unix/sysv/linux/aio_misc.h 2006-11-06 21:18:34.000000000 +0100 -@@ -27,7 +27,7 @@ - # define aio_start_notify_thread __aio_start_notify_thread - # define aio_create_helper_thread __aio_create_helper_thread - --extern inline void -+__extern_inline void - __aio_start_notify_thread (void) - { - sigset_t ss; -@@ -36,7 +36,7 @@ __aio_start_notify_thread (void) - INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8); - } - --extern inline int -+__extern_inline int - __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), - void *arg) - { ---- libc/resolv/gai_misc.c.jj 2006-08-03 10:01:53.000000000 +0200 -+++ libc/resolv/gai_misc.c 2006-11-07 10:49:55.000000000 +0100 -@@ -30,7 +30,7 @@ - #ifndef gai_create_helper_thread - # define gai_create_helper_thread __gai_create_helper_thread - --extern inline int -+__extern_inline int - __gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), - void *arg) - { ---- libc/bits/mathinline.h.jj 1997-10-13 05:53:18.000000000 +0200 -+++ libc/bits/mathinline.h 2006-11-07 10:51:05.000000000 +0100 -@@ -1,6 +1,6 @@ - /* This file should provide inline versions of math functions. - -- Surround GCC-specific parts with #ifdef __GNUC__, and use `extern __inline'. -+ Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'. - - This file should define __MATH_INLINES if functions are actually defined as - inlines. */ ---- libc/bits/string.h.jj 1997-10-13 05:53:19.000000000 +0200 -+++ libc/bits/string.h 2006-11-07 10:50:54.000000000 +0100 -@@ -1,6 +1,6 @@ - /* This file should provide inline versions of string functions. - -- Surround GCC-specific parts with #ifdef __GNUC__, and use `extern __inline'. -+ Surround GCC-specific parts with #ifdef __GNUC__, and use `__extern_inline'. - - This file should define __STRING_INLINES if functions are actually defined - as inlines. */ ---- libc/bits/sigset.h.jj 2001-07-06 06:55:50.000000000 +0200 -+++ libc/bits/sigset.h 2006-11-07 11:19:08.000000000 +0100 -@@ -1,5 +1,6 @@ - /* __sig_atomic_t, __sigset_t, and related definitions. Generic/BSD version. -- Copyright (C) 1991, 1992, 1994, 1996, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1991, 1992, 1994, 1996, 1997, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -38,7 +39,7 @@ typedef unsigned long int __sigset_t; - #define _SIGSET_H_fns 1 - - #ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - #endif - - /* Return a mask that includes SIG only. The cast to `sigset_t' avoids ---- libc/misc/sys/cdefs.h.jj 2006-01-14 21:14:36.000000000 +0100 -+++ libc/misc/sys/cdefs.h 2006-11-06 21:00:45.000000000 +0100 -@@ -279,6 +279,18 @@ - # define __always_inline __inline - #endif - -+/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 -+ inline semantics. */ -+#if __GNUC_PREREQ (4,3) && defined (__STDC_VERSION__) \ -+ && __STDC_VERSION__ >= 199901L -+# define __extern_inline extern __inline __attribute__ ((__gnu_inline__)) -+# define __extern_always_inline \ -+ extern __always_inline __inline __attribute__ ((__gnu_inline__)) -+#else -+# define __extern_inline extern __inline -+# define __extern_always_inline extern __always_inline -+#endif -+ - /* It is possible to compile containing GCC extensions even if GCC is - run in pedantic mode if the uses are carefully marked using the - `__extension__' keyword. But this is not generally available before ---- libc/libio/bits/stdio.h.jj 2004-09-08 00:23:44.000000000 +0200 -+++ libc/libio/bits/stdio.h 2006-11-06 21:23:07.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Optimizing macros and inline functions for stdio functions. -- Copyright (C) 1998, 2000, 2001, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1998, 2000, 2001, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -24,7 +24,7 @@ - #ifdef __cplusplus - # define __STDIO_INLINE inline - #else --# define __STDIO_INLINE extern __inline -+# define __STDIO_INLINE __extern_inline - #endif - - ---- libc/libio/bits/stdio2.h.jj 2005-03-19 01:14:58.000000000 +0100 -+++ libc/libio/bits/stdio2.h 2006-11-06 21:22:33.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Checking macros for stdio functions. -- Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -75,7 +75,7 @@ extern int __vprintf_chk (int __flag, __ - extern char *__gets_chk (char *__str, size_t) __wur; - extern char *__REDIRECT (__gets_alias, (char *__str), gets) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - gets (char *__str) - { - if (__bos (__str) != (size_t) -1) -@@ -89,7 +89,7 @@ extern char *__REDIRECT (__fgets_alias, - (char *__restrict __s, int __n, - FILE *__restrict __stream), fgets) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - fgets (char *__restrict __s, int __n, FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 -@@ -105,7 +105,7 @@ extern char *__REDIRECT (__fgets_unlocke - (char *__restrict __s, int __n, - FILE *__restrict __stream), fgets_unlocked) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 ---- libc/argp/argp.h.jj 2006-04-22 17:08:26.000000000 +0200 -+++ libc/argp/argp.h 2006-11-06 21:24:08.000000000 +0100 -@@ -558,7 +558,7 @@ extern void *__argp_input (__const struc - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI __extern_inline - # endif - - ARGP_EI void ---- libc/argp/argp-fmtstream.h.jj 2005-09-27 23:45:41.000000000 +0200 -+++ libc/argp/argp-fmtstream.h 2006-11-07 11:19:12.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Word-wrapping and line-truncating streams. -- Copyright (C) 1997 Free Software Foundation, Inc. -+ Copyright (C) 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Written by Miles Bader . - -@@ -203,7 +203,7 @@ extern int __argp_fmtstream_ensure (argp - #endif - - #ifndef ARGP_FS_EI --#define ARGP_FS_EI extern inline -+#define ARGP_FS_EI __extern_inline - #endif - - ARGP_FS_EI size_t ---- libc/locale/programs/locfile.c.jj 2006-05-10 04:12:39.000000000 +0200 -+++ libc/locale/programs/locfile.c 2006-11-07 15:13:20.000000000 +0100 -@@ -33,6 +33,11 @@ - #include "locfile.h" - #include "simple-hash.h" - -+/* This prototype is needed to export locfile_hash from this object -+ when using ISO C99 inline semantics. */ -+struct keyword_t; -+const struct keyword_t *locfile_hash (const char *str, unsigned int len); -+ - #include "locfile-kw.h" - - ---- libc/locale/programs/charmap.c.jj 2006-08-19 19:50:52.000000000 +0200 -+++ libc/locale/programs/charmap.c 2006-11-07 15:11:05.000000000 +0100 -@@ -35,6 +35,10 @@ - - #include - -+/* This prototype is needed to export charmap_hash from this object -+ when using ISO C99 inline semantics. */ -+struct keyword_t; -+const struct keyword_t *charmap_hash (const char *str, unsigned int len); - - /* Define the lookup function. */ - #include "charmap-kw.h" ---- libc/io/sys/stat.h.jj 2006-01-06 13:14:05.000000000 +0100 -+++ libc/io/sys/stat.h 2006-11-06 21:27:03.000000000 +0100 -@@ -430,28 +430,28 @@ extern int __xmknodat (int __ver, int __ - #if defined __GNUC__ && __GNUC__ >= 2 - /* Inlined versions of the real stat and mknod functions. */ - --extern __inline__ int -+__extern_inline int - __NTH (stat (__const char *__path, struct stat *__statbuf)) - { - return __xstat (_STAT_VER, __path, __statbuf); - } - - # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED --extern __inline__ int -+__extern_inline int - __NTH (lstat (__const char *__path, struct stat *__statbuf)) - { - return __lxstat (_STAT_VER, __path, __statbuf); - } - # endif - --extern __inline__ int -+__extern_inline int - __NTH (fstat (int __fd, struct stat *__statbuf)) - { - return __fxstat (_STAT_VER, __fd, __statbuf); - } - - # ifdef __USE_ATFILE --extern __inline__ int -+__extern_inline int - __NTH (fstatat (int __fd, __const char *__filename, struct stat *__statbuf, - int __flag)) - { -@@ -460,7 +460,7 @@ __NTH (fstatat (int __fd, __const char * - # endif - - # if defined __USE_MISC || defined __USE_BSD --extern __inline__ int -+__extern_inline int - __NTH (mknod (__const char *__path, __mode_t __mode, __dev_t __dev)) - { - return __xmknod (_MKNOD_VER, __path, __mode, &__dev); -@@ -468,7 +468,7 @@ __NTH (mknod (__const char *__path, __mo - # endif - - # ifdef __USE_ATFILE --extern __inline__ int -+__extern_inline int - __NTH (mknodat (int __fd, __const char *__path, __mode_t __mode, - __dev_t __dev)) - { -@@ -479,28 +479,28 @@ __NTH (mknodat (int __fd, __const char * - # if defined __USE_LARGEFILE64 \ - && (! defined __USE_FILE_OFFSET64 \ - || (defined __REDIRECT_NTH && defined __OPTIMIZE__)) --extern __inline__ int -+__extern_inline int - __NTH (stat64 (__const char *__path, struct stat64 *__statbuf)) - { - return __xstat64 (_STAT_VER, __path, __statbuf); - } - - # if defined __USE_BSD || defined __USE_XOPEN_EXTENDED --extern __inline__ int -+__extern_inline int - __NTH (lstat64 (__const char *__path, struct stat64 *__statbuf)) - { - return __lxstat64 (_STAT_VER, __path, __statbuf); - } - # endif - --extern __inline__ int -+__extern_inline int - __NTH (fstat64 (int __fd, struct stat64 *__statbuf)) - { - return __fxstat64 (_STAT_VER, __fd, __statbuf); - } - - # ifdef __USE_GNU --extern __inline__ int -+__extern_inline int - __NTH (fstatat64 (int __fd, __const char *__filename, struct stat64 *__statbuf, - int __flag)) - { ---- libc/wcsmbs/wchar.h.jj 2006-09-27 17:56:30.000000000 +0200 -+++ libc/wcsmbs/wchar.h 2006-11-06 21:28:28.000000000 +0100 -@@ -326,19 +326,19 @@ __END_NAMESPACE_C99 - locales must use ASCII encoding for the values in the ASCII range - and because the wchar_t encoding is always ISO 10646. */ - extern wint_t __btowc_alias (int __c) __asm ("btowc"); --extern __inline wint_t -+__extern_inline wint_t - __NTH (btowc (int __c)) - { return (__builtin_constant_p (__c) && __c >= '\0' && __c <= '\x7f' - ? (wint_t) __c : __btowc_alias (__c)); } - - extern int __wctob_alias (wint_t __c) __asm ("wctob"); --extern __inline int -+__extern_inline int - __NTH (wctob (wint_t __wc)) - { return (__builtin_constant_p (__wc) && __wc >= L'\0' && __wc <= L'\x7f' - ? (int) __wc : __wctob_alias (__wc)); } - # endif - --extern __inline size_t -+__extern_inline size_t - __NTH (mbrlen (__const char *__restrict __s, size_t __n, - mbstate_t *__restrict __ps)) - { return (__ps != NULL -@@ -548,38 +548,38 @@ extern unsigned long long int __wcstoull - /* Define inline functions which call the internal entry points. */ - __BEGIN_NAMESPACE_C99 - --extern __inline double -+__extern_inline double - __NTH (wcstod (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr)) - { return __wcstod_internal (__nptr, __endptr, 0); } --extern __inline long int -+__extern_inline long int - __NTH (wcstol (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstol_internal (__nptr, __endptr, __base, 0); } --extern __inline unsigned long int -+__extern_inline unsigned long int - __NTH (wcstoul (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstoul_internal (__nptr, __endptr, __base, 0); } - __END_NAMESPACE_C99 - - # ifdef __USE_GNU --extern __inline float -+__extern_inline float - __NTH (wcstof (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr)) - { return __wcstof_internal (__nptr, __endptr, 0); } - # ifndef __LDBL_COMPAT --extern __inline long double -+__extern_inline long double - __NTH (wcstold (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr)) - { return __wcstold_internal (__nptr, __endptr, 0); } - # endif - __extension__ --extern __inline long long int -+__extern_inline long long int - __NTH (wcstoq (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstoll_internal (__nptr, __endptr, __base, 0); } - __extension__ --extern __inline unsigned long long int -+__extern_inline unsigned long long int - __NTH (wcstouq (__const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, int __base)) - { return __wcstoull_internal (__nptr, __endptr, __base, 0); } ---- libc/wcsmbs/bits/wchar2.h.jj 2006-01-14 13:09:47.000000000 +0100 -+++ libc/wcsmbs/bits/wchar2.h 2006-11-06 21:29:19.000000000 +0100 -@@ -30,7 +30,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemcp - __const wchar_t *__restrict __s2, size_t __n), - wmemcpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmemcpy (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, - size_t __n)) - { -@@ -46,7 +46,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemmo - __const wchar_t *__s2, - size_t __n), wmemmove); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmemmove (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, - size_t __n)) - { -@@ -65,7 +65,7 @@ extern wchar_t *__REDIRECT_NTH (__wmempc - __const wchar_t *__restrict __s2, - size_t __n), wmempcpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmempcpy (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2, - size_t __n)) - { -@@ -81,7 +81,7 @@ extern wchar_t *__wmemset_chk (wchar_t * - extern wchar_t *__REDIRECT_NTH (__wmemset_alias, (wchar_t *__s, wchar_t __c, - size_t __n), wmemset); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wmemset (wchar_t *__restrict __s, wchar_t __c, size_t __n)) - { - if (__bos0 (__s) != (size_t) -1) -@@ -97,7 +97,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscpy - (wchar_t *__restrict __dest, - __const wchar_t *__restrict __src), wcscpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcscpy (wchar_t *__dest, __const wchar_t *__src)) - { - if (__bos (__dest) != (size_t) -1) -@@ -112,7 +112,7 @@ extern wchar_t *__REDIRECT_NTH (__wcpcpy - __const wchar_t *__src), - wcpcpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcpcpy (wchar_t *__dest, __const wchar_t *__src)) - { - if (__bos (__dest) != (size_t) -1) -@@ -129,7 +129,7 @@ extern wchar_t *__REDIRECT_NTH (__wcsncp - __const wchar_t *__restrict __src, - size_t __n), wcsncpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcsncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1 -@@ -148,7 +148,7 @@ extern wchar_t *__REDIRECT_NTH (__wcpncp - __const wchar_t *__restrict __src, - size_t __n), wcpncpy); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1 -@@ -166,7 +166,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscat - (wchar_t *__restrict __dest, - __const wchar_t *__restrict __src), wcscat); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcscat (wchar_t *__dest, __const wchar_t *__src)) - { - if (__bos (__dest) != (size_t) -1) -@@ -183,7 +183,7 @@ extern wchar_t *__REDIRECT_NTH (__wcsnca - __const wchar_t *__restrict __src, - size_t __n), wcsncat); - --extern __always_inline wchar_t * -+__extern_always_inline wchar_t * - __NTH (wcsncat (wchar_t *__dest, __const wchar_t *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1) -@@ -246,7 +246,7 @@ extern wchar_t *__REDIRECT (__fgetws_ali - (wchar_t *__restrict __s, int __n, - __FILE *__restrict __stream), fgetws) __wur; - --extern __always_inline __wur wchar_t * -+__extern_always_inline __wur wchar_t * - fgetws (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 -@@ -264,7 +264,7 @@ extern wchar_t *__REDIRECT (__fgetws_unl - __FILE *__restrict __stream), fgetws_unlocked) - __wur; - --extern __always_inline __wur wchar_t * -+__extern_always_inline __wur wchar_t * - fgetws_unlocked (wchar_t *__restrict __s, int __n, __FILE *__restrict __stream) - { - if (__bos (__s) != (size_t) -1 -@@ -281,7 +281,7 @@ extern size_t __REDIRECT_NTH (__wcrtomb_ - (char *__restrict __s, wchar_t __wchar, - mbstate_t *__restrict __ps), wcrtomb) __wur; - --extern __always_inline __wur size_t -+__extern_always_inline __wur size_t - __NTH (wcrtomb (char *__s, wchar_t __wchar, mbstate_t *__ps)) - { - /* We would have to include to get a definition of MB_LEN_MAX. -@@ -307,7 +307,7 @@ extern size_t __REDIRECT_NTH (__mbsrtowc - size_t __len, mbstate_t *__restrict __ps), - mbsrtowcs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (mbsrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src, - size_t __len, mbstate_t *__restrict __ps)) - { -@@ -330,7 +330,7 @@ extern size_t __REDIRECT_NTH (__wcsrtomb - size_t __len, mbstate_t *__restrict __ps), - wcsrtombs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (wcsrtombs (char *__restrict __dst, __const wchar_t **__restrict __src, - size_t __len, mbstate_t *__restrict __ps)) - { -@@ -352,7 +352,7 @@ extern size_t __REDIRECT_NTH (__mbsnrtow - size_t __len, mbstate_t *__restrict __ps), - mbsnrtowcs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (mbsnrtowcs (wchar_t *__restrict __dst, __const char **__restrict __src, - size_t __nmc, size_t __len, mbstate_t *__restrict __ps)) - { -@@ -376,7 +376,7 @@ extern size_t __REDIRECT_NTH (__wcsnrtom - size_t __nwc, size_t __len, - mbstate_t *__restrict __ps), wcsnrtombs); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (wcsnrtombs (char *__restrict __dst, __const wchar_t **__restrict __src, - size_t __nwc, size_t __len, mbstate_t *__restrict __ps)) - { ---- libc/socket/bits/socket2.h.jj 2005-08-08 21:00:53.000000000 +0200 -+++ libc/socket/bits/socket2.h 2006-11-06 21:29:59.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Checking macros for socket functions. -- Copyright (C) 2005 Free Software Foundation, Inc. -+ Copyright (C) 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -26,7 +26,7 @@ extern ssize_t __recv_chk (int __fd, voi - extern ssize_t __REDIRECT (__recv_alias, (int __fd, void *__buf, size_t __n, - int __flags), recv); - --extern __always_inline ssize_t -+__extern_always_inline ssize_t - recv (int __fd, void *__buf, size_t __n, int __flags) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -44,7 +44,7 @@ extern ssize_t __REDIRECT (__recvfrom_al - int __flags, __SOCKADDR_ARG __addr, - socklen_t *__restrict __addr_len), recvfrom); - --extern __always_inline ssize_t -+__extern_always_inline ssize_t - recvfrom (int __fd, void *__restrict __buf, size_t __n, int __flags, - __SOCKADDR_ARG __addr, socklen_t *__restrict __addr_len) - { ---- libc/posix/bits/unistd.h.jj 2006-08-24 08:47:31.000000000 +0200 -+++ libc/posix/bits/unistd.h 2006-11-06 21:30:39.000000000 +0100 -@@ -26,7 +26,7 @@ extern ssize_t __read_chk (int __fd, voi - extern ssize_t __REDIRECT (__read_alias, (int __fd, void *__buf, - size_t __nbytes), read) __wur; - --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - read (int __fd, void *__buf, size_t __nbytes) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -48,7 +48,7 @@ extern ssize_t __REDIRECT (__pread64_ali - __off64_t __offset), pread64) __wur; - - # ifndef __USE_FILE_OFFSET64 --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -57,7 +57,7 @@ pread (int __fd, void *__buf, size_t __n - return __pread_alias (__fd, __buf, __nbytes, __offset); - } - # else --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - pread (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -68,7 +68,7 @@ pread (int __fd, void *__buf, size_t __n - # endif - - # ifdef __USE_LARGEFILE64 --extern __always_inline __wur ssize_t -+__extern_always_inline __wur ssize_t - pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) - { - if (__bos0 (__buf) != (size_t) -1 -@@ -89,7 +89,7 @@ extern ssize_t __REDIRECT_NTH (__readlin - char *__restrict __buf, size_t __len), readlink) - __nonnull ((1, 2)) __wur; - --extern __always_inline __nonnull ((1, 2)) __wur ssize_t -+__extern_always_inline __nonnull ((1, 2)) __wur ssize_t - __NTH (readlink (__const char *__restrict __path, char *__restrict __buf, - size_t __len)) - { -@@ -111,7 +111,7 @@ extern ssize_t __REDIRECT_NTH (__readlin - readlinkat) - __nonnull ((2, 3)) __wur; - --extern __always_inline __nonnull ((2, 3)) __wur ssize_t -+__extern_always_inline __nonnull ((2, 3)) __wur ssize_t - __NTH (readlinkat (int __fd, __const char *__restrict __path, - char *__restrict __buf, size_t __len)) - { -@@ -127,7 +127,7 @@ extern char *__getcwd_chk (char *__buf, - extern char *__REDIRECT_NTH (__getcwd_alias, - (char *__buf, size_t __size), getcwd) __wur; - --extern __always_inline __wur char * -+__extern_always_inline __wur char * - __NTH (getcwd (char *__buf, size_t __size)) - { - if (__bos (__buf) != (size_t) -1 -@@ -142,7 +142,7 @@ extern char *__getwd_chk (char *__buf, s - extern char *__REDIRECT_NTH (__getwd_alias, (char *__buf), getwd) - __nonnull ((1)) __wur; - --extern __always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * -+__extern_always_inline __nonnull ((1)) __attribute_deprecated__ __wur char * - __NTH (getwd (char *__buf)) - { - if (__bos (__buf) != (size_t) -1) -@@ -156,7 +156,7 @@ extern size_t __confstr_chk (int __name, - extern size_t __REDIRECT_NTH (__confstr_alias, (int __name, char *__buf, - size_t __len), confstr); - --extern __always_inline size_t -+__extern_always_inline size_t - __NTH (confstr (int __name, char *__buf, size_t __len)) - { - if (__bos (__buf) != (size_t) -1 -@@ -171,7 +171,7 @@ extern int __getgroups_chk (int __size, - extern int __REDIRECT_NTH (__getgroups_alias, (int __size, __gid_t __list[]), - getgroups) __wur; - --extern __always_inline int -+__extern_always_inline int - __NTH (getgroups (int __size, __gid_t __list[])) - { - if (__bos (__list) != (size_t) -1 -@@ -188,7 +188,7 @@ extern int __REDIRECT_NTH (__ttyname_r_a - size_t __buflen), ttyname_r) - __nonnull ((2)); - --extern __always_inline int -+__extern_always_inline int - __NTH (ttyname_r (int __fd, char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 -@@ -204,7 +204,7 @@ extern int __getlogin_r_chk (char *__buf - extern int __REDIRECT (__getlogin_r_alias, (char *__buf, size_t __buflen), - getlogin_r) __nonnull ((1)); - --extern __always_inline int -+__extern_always_inline int - getlogin_r (char *__buf, size_t __buflen) - { - if (__bos (__buf) != (size_t) -1 -@@ -221,7 +221,7 @@ extern int __gethostname_chk (char *__bu - extern int __REDIRECT_NTH (__gethostname_alias, (char *__buf, size_t __buflen), - gethostname) __nonnull ((1)); - --extern __always_inline int -+__extern_always_inline int - __NTH (gethostname (char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 -@@ -239,7 +239,7 @@ extern int __REDIRECT_NTH (__getdomainna - size_t __buflen), - getdomainname) __nonnull ((1)) __wur; - --extern __always_inline int -+__extern_always_inline int - __NTH (getdomainname (char *__buf, size_t __buflen)) - { - if (__bos (__buf) != (size_t) -1 ---- libc/string/bits/string3.h.jj 2005-08-08 21:02:31.000000000 +0200 -+++ libc/string/bits/string3.h 2006-11-07 11:19:17.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. -+/* Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -151,7 +151,7 @@ extern char *__REDIRECT_NTH (__stpncpy_a - __const char *__src, - size_t __n), stpncpy); - --extern __always_inline char * -+__extern_always_inline char * - __NTH (stpncpy (char *__dest, __const char *__src, size_t __n)) - { - if (__bos (__dest) != (size_t) -1 ---- libc/string/bits/string2.h.jj 2004-05-28 08:39:13.000000000 +0200 -+++ libc/string/bits/string2.h 2006-11-07 11:19:24.000000000 +0100 -@@ -0,0 +1,18 @@ -+/* DO NOT EDIT THIS FILE. -+ -+ It has been auto-edited by fixincludes from: -+ -+ "fixinc/tests/inc/bits/string2.h" -+ -+ This had to be done to correct non-standard usages in the -+ original, manufacturer supplied header file. */ -+ -+ -+ -+#if defined( GLIBC_C99_INLINE_3_CHECK ) -+# if defined(__cplusplus) || __STDC_VERSION__ >= 19901L -+# define __STRING_INLINE inline -+# else -+# define __STRING_INLINE extern __inline -+# endif -+#endif /* GLIBC_C99_INLINE_3_CHECK */ -@@ -1,5 +1,5 @@ - /* Machine-independant string function optimizations. -- Copyright (C) 1997-2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1997-2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - -@@ -43,7 +43,7 @@ - # ifdef __cplusplus - # define __STRING_INLINE inline - # else --# define __STRING_INLINE extern __inline -+# define __STRING_INLINE __extern_inline - # endif - #endif - ---- libc/string/argz.h.jj 2004-09-08 00:23:43.000000000 +0200 -+++ libc/string/argz.h 2006-11-07 11:19:33.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Routines for dealing with '\0' separated arg vectors. -- Copyright (C) 1995,96,97,98,99,2000,2004 Free Software Foundation, Inc. -+ Copyright (C) 1995,96,97,98,99,2000,2004,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -160,7 +160,7 @@ extern char *argz_next (__const char *__ - __const char *__restrict __entry) __THROW; - - #ifdef __USE_EXTERN_INLINES --extern inline char * -+__extern_inline char * - __NTH (__argz_next (__const char *__argz, size_t __argz_len, - __const char *__entry)) - { -@@ -174,7 +174,7 @@ __NTH (__argz_next (__const char *__argz - else - return __argz_len > 0 ? (char *) __argz : 0; - } --extern inline char * -+__extern_inline char * - __NTH (argz_next (__const char *__argz, size_t __argz_len, - __const char *__entry)) - { ---- libc/math/bits/cmathcalls.h.jj 2001-07-06 06:55:35.000000000 +0200 -+++ libc/math/bits/cmathcalls.h 2006-11-07 11:19:39.000000000 +0100 -@@ -1,6 +1,6 @@ - /* Prototype declarations for complex math functions; - helper file for . -- Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. -+ Copyright (C) 1997, 1998, 2001, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -135,21 +135,21 @@ __MATHDECL (_Mdouble_,creal, (_Mdouble_c - #if defined __GNUC__ && !__GNUC_PREREQ (2, 97) && defined __OPTIMIZE__ - - /* Imaginary part of Z. */ --extern __inline _Mdouble_ -+__extern_inline _Mdouble_ - __MATH_PRECNAME(cimag) (_Mdouble_complex_ __z) __THROW - { - return __imag__ __z; - } - - /* Real part of Z. */ --extern __inline _Mdouble_ -+__extern_inline _Mdouble_ - __MATH_PRECNAME(creal) (_Mdouble_complex_ __z) __THROW - { - return __real__ __z; - } - - /* Complex conjugate of Z. */ --extern __inline _Mdouble_complex_ -+__extern_inline _Mdouble_complex_ - __MATH_PRECNAME(conj) (_Mdouble_complex_ __z) __THROW - { - return __extension__ ~__z; ---- libc/math/math_private.h.jj 2005-11-21 16:43:03.000000000 +0100 -+++ libc/math/math_private.h 2006-11-06 21:33:45.000000000 +0100 -@@ -192,7 +192,7 @@ extern int __kernel_rem_pio2 (double* - extern double __copysign (double x, double __y); - - #if __GNUC_PREREQ (4, 0) --extern inline double __copysign (double x, double y) -+__extern_inline double __copysign (double x, double y) - { return __builtin_copysign (x, y); } - #endif - -@@ -239,7 +239,7 @@ extern int __kernel_rem_pio2f (float*, - extern float __copysignf (float x, float __y); - - #if __GNUC_PREREQ (4, 0) --extern inline float __copysignf (float x, float y) -+__extern_inline float __copysignf (float x, float y) - { return __builtin_copysignf (x, y); } - #endif - -@@ -307,7 +307,7 @@ extern long double __logbl (long double - extern long double __significandl (long double x); - - #if __GNUC_PREREQ (4, 0) --extern inline long double __copysignl (long double x, long double y) -+__extern_inline long double __copysignl (long double x, long double y) - { return __builtin_copysignl (x, y); } - #endif - ---- libc/hurd/hurd.h.jj 2002-01-02 10:52:20.000000000 +0100 -+++ libc/hurd/hurd.h 2006-11-07 11:19:51.000000000 +0100 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1993,94,95,96,97,98,99,2001,02 Free Software Foundation, Inc. -+/* Copyright (C) 1993,94,95,96,97,98,99,2001,2002,2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -44,7 +45,7 @@ - #include - - #ifndef _HURD_H_EXTERN_INLINE --#define _HURD_H_EXTERN_INLINE extern __inline -+#define _HURD_H_EXTERN_INLINE __extern_inline - #endif - - _HURD_H_EXTERN_INLINE int ---- libc/hurd/hurd/port.h.jj 2001-07-06 06:54:47.000000000 +0200 -+++ libc/hurd/hurd/port.h 2006-11-07 11:19:58.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Lightweight user references for ports. -- Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc. -+ Copyright (C) 1993, 1994, 1995, 1997, 1999, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -55,7 +56,7 @@ struct hurd_port - - - #ifndef _HURD_PORT_H_EXTERN_INLINE --#define _HURD_PORT_H_EXTERN_INLINE extern __inline -+#define _HURD_PORT_H_EXTERN_INLINE __extern_inline - #endif - - ---- libc/hurd/hurd/threadvar.h.jj 2002-09-02 09:08:53.000000000 +0200 -+++ libc/hurd/hurd/threadvar.h 2006-11-07 10:54:40.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Internal per-thread variables for the Hurd. -- Copyright (C) 1994,95,97,98,99,2001,02 Free Software Foundation, Inc. -+ Copyright (C) 1994,95,97,98,99,2001,02,06 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -74,7 +74,7 @@ enum __hurd_threadvar_index - - - #ifndef _HURD_THREADVAR_H_EXTERN_INLINE --#define _HURD_THREADVAR_H_EXTERN_INLINE extern __inline -+#define _HURD_THREADVAR_H_EXTERN_INLINE __extern_inline - #endif - - /* Return the location of the value for the per-thread variable with index ---- libc/hurd/hurd/fd.h.jj 2006-03-06 08:59:07.000000000 +0100 -+++ libc/hurd/hurd/fd.h 2006-11-07 10:53:18.000000000 +0100 -@@ -52,7 +52,7 @@ extern struct mutex _hurd_dtable_lock; / - #include - - #ifndef _HURD_FD_H_EXTERN_INLINE --#define _HURD_FD_H_EXTERN_INLINE extern __inline -+#define _HURD_FD_H_EXTERN_INLINE __extern_inline - #endif - - /* Returns the descriptor cell for FD. If FD is invalid or unused, return ---- libc/hurd/hurd/signal.h.jj 2002-02-18 21:57:11.000000000 +0100 -+++ libc/hurd/hurd/signal.h 2006-11-07 10:54:13.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Implementing POSIX.1 signals under the Hurd. -- Copyright (C) 1993,94,95,96,98,99,2002 Free Software Foundation, Inc. -+ Copyright (C) 1993,94,95,96,98,99,2002,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -126,7 +126,7 @@ extern struct hurd_sigstate *_hurd_self_ - __attribute__ ((__const__)); - - #ifndef _HURD_SIGNAL_H_EXTERN_INLINE --#define _HURD_SIGNAL_H_EXTERN_INLINE extern __inline -+#define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline - #endif - - _HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate * ---- libc/hurd/hurd/userlink.h.jj 2001-07-06 06:54:47.000000000 +0200 -+++ libc/hurd/hurd/userlink.h 2006-11-07 10:53:37.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Support for chains recording users of a resource; `struct hurd_userlink'. -- Copyright (C) 1994, 1995, 1997, 1999 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1995, 1997, 1999, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -71,7 +71,7 @@ struct hurd_userlink - - - #ifndef _HURD_USERLINK_H_EXTERN_INLINE --#define _HURD_USERLINK_H_EXTERN_INLINE extern __inline -+#define _HURD_USERLINK_H_EXTERN_INLINE __extern_inline - #endif - - ---- libc/sysdeps/mach/alpha/machine-sp.h.jj 2001-07-06 06:55:56.000000000 +0200 -+++ libc/sysdeps/mach/alpha/machine-sp.h 2006-11-07 10:55:42.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific function to return the stack pointer. Alpha version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,7 +23,7 @@ - /* Return the current stack pointer. */ - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - _EXTERN_INLINE void * ---- libc/sysdeps/mach/alpha/machine-lock.h.jj 2003-02-26 01:01:15.000000000 +0100 -+++ libc/sysdeps/mach/alpha/machine-lock.h 2006-11-07 11:20:04.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. Alpha version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef __volatile long int __spin_lock_ - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/mach/i386/machine-lock.h.jj 2001-07-06 06:56:00.000000000 +0200 -+++ libc/sysdeps/mach/i386/machine-lock.h 2006-11-07 10:56:10.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. i386 version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef __volatile int __spin_lock_t; - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/mach/powerpc/machine-sp.h.jj 2002-08-27 00:39:44.000000000 +0200 -+++ libc/sysdeps/mach/powerpc/machine-sp.h 2006-11-07 10:56:59.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific function to return the stack pointer. PowerPC version. -- Copyright (C) 2001 Free Software Foundation, Inc. -+ Copyright (C) 2001, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -27,7 +27,7 @@ - # ifdef _HURD_THREADVAR_H_EXTERN_INLINE - # define _EXTERN_INLINE _HURD_THREADVAR_H_EXTERN_INLINE - # else --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - #endif - ---- libc/sysdeps/mach/powerpc/machine-lock.h.jj 2002-02-17 08:13:25.000000000 +0100 -+++ libc/sysdeps/mach/powerpc/machine-lock.h 2006-11-07 10:56:40.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. PowerPC version. -- Copyright (C) 1994,97,2002 Free Software Foundation, Inc. -+ Copyright (C) 1994,97,2002,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef __volatile long int __spin_lock_ - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/alpha/fpu/bits/mathinline.h.jj 2005-02-08 05:37:48.000000000 +0100 -+++ libc/sysdeps/alpha/fpu/bits/mathinline.h 2006-11-07 10:59:08.000000000 +0100 -@@ -1,5 +1,6 @@ - /* Inline math functions for Alpha. -- Copyright (C) 1996, 1997, 1999-2001, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1999-2001, 2004, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David Mosberger-Tang. - -@@ -25,7 +26,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - #if defined __USE_ISOC99 && defined __GNUC__ && !__GNUC_PREREQ(3,0) ---- libc/sysdeps/ia64/fpu/bits/mathinline.h.jj 2004-09-08 23:44:02.000000000 +0200 -+++ libc/sysdeps/ia64/fpu/bits/mathinline.h 2006-11-07 10:59:49.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for ia64. -- Copyright (C) 2004 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -24,7 +24,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - #if defined __USE_ISOC99 && defined __GNUC__ && __GNUC__ >= 2 ---- libc/sysdeps/i386/fpu/bits/mathinline.h.jj 2004-09-08 00:23:42.000000000 +0200 -+++ libc/sysdeps/i386/fpu/bits/mathinline.h 2006-11-07 11:00:56.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for i387. -- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 -+ Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman , 1995. -@@ -26,7 +26,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - ---- libc/sysdeps/i386/i486/bits/string.h.jj 2004-12-15 21:30:16.000000000 +0100 -+++ libc/sysdeps/i386/i486/bits/string.h 2006-11-07 11:01:34.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Optimized, inlined string functions. i486 version. -- Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004 -+ Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004,2006 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -35,7 +35,7 @@ - # ifdef __cplusplus - # define __STRING_INLINE inline - # else --# define __STRING_INLINE extern __inline -+# define __STRING_INLINE __extern_inline - # endif - #endif - ---- libc/sysdeps/generic/inttypes.h.jj 2004-09-08 00:23:42.000000000 +0200 -+++ libc/sysdeps/generic/inttypes.h 2006-11-07 11:02:59.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1997-2001, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 1997-2001, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -330,7 +330,7 @@ extern long int __strtol_internal (__con - int __base, int __group) __THROW; - # define __strtol_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -345,7 +345,7 @@ extern unsigned long int __strtoul_inter - int __base, int __group) __THROW; - # define __strtoul_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -359,7 +359,7 @@ extern long int __wcstol_internal (__con - int __base, int __group) __THROW; - # define __wcstol_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (wcstoimax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { -@@ -376,7 +376,7 @@ extern unsigned long int __wcstoul_inter - int __base, int __group) __THROW; - # define __wcstoul_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (wcstoumax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { -@@ -393,7 +393,7 @@ extern long long int __strtoll_internal - int __base, int __group) __THROW; - # define __strtoll_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -411,7 +411,7 @@ extern unsigned long long int __strtoull - int __group) __THROW; - # define __strtoull_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, - int base)) - { -@@ -427,7 +427,7 @@ extern long long int __wcstoll_internal - int __base, int __group) __THROW; - # define __wcstoll_internal_defined 1 - # endif --extern __inline intmax_t -+__extern_inline intmax_t - __NTH (wcstoimax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { -@@ -446,7 +446,7 @@ extern unsigned long long int __wcstoull - int __group) __THROW; - # define __wcstoull_internal_defined 1 - # endif --extern __inline uintmax_t -+__extern_inline uintmax_t - __NTH (wcstoumax (__const __gwchar_t *__restrict nptr, - __gwchar_t **__restrict endptr, int base)) - { ---- libc/sysdeps/generic/machine-sp.h.jj 2001-07-06 06:55:49.000000000 +0200 -+++ libc/sysdeps/generic/machine-sp.h 2006-11-07 11:06:02.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific function to return the stack pointer. Stub version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,7 +23,7 @@ - /* Return the current stack pointer. */ - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - _EXTERN_INLINE void * ---- libc/sysdeps/generic/machine-lock.h.jj 2001-07-06 06:55:49.000000000 +0200 -+++ libc/sysdeps/generic/machine-lock.h 2006-11-07 11:02:08.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Machine-specific definition for spin locks. Stub version. -- Copyright (C) 1994, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1994, 1997, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,7 +30,7 @@ typedef volatile int __spin_lock_t; - - - #ifndef _EXTERN_INLINE --#define _EXTERN_INLINE extern __inline -+#define _EXTERN_INLINE __extern_inline - #endif - - /* Unlock LOCK. */ ---- libc/sysdeps/generic/allocalim.h.jj 2002-10-09 11:19:59.000000000 +0200 -+++ libc/sysdeps/generic/allocalim.h 2006-11-07 11:03:22.000000000 +0100 -@@ -1,4 +1,4 @@ --extern inline int __libc_use_alloca (size_t size) -+__extern_inline int __libc_use_alloca (size_t size) - { - return size <= __MAX_ALLOCA_CUTOFF; - } ---- libc/sysdeps/pthread/aio_misc.c.jj 2006-01-04 00:12:54.000000000 +0100 -+++ libc/sysdeps/pthread/aio_misc.c 2006-11-07 11:06:31.000000000 +0100 -@@ -33,7 +33,7 @@ - #ifndef aio_create_helper_thread - # define aio_create_helper_thread __aio_create_helper_thread - --extern inline int -+__extern_inline int - __aio_create_helper_thread (pthread_t *threadp, void *(*tf) (void *), void *arg) - { - pthread_attr_t attr; ---- libc/sysdeps/s390/bits/string.h.jj 2005-01-28 22:44:42.000000000 +0100 -+++ libc/sysdeps/s390/bits/string.h 2006-11-07 11:07:05.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Optimized, inlined string functions. S/390 version. -- Copyright (C) 2000, 2001 Free Software Foundation, Inc. -+ Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). - This file is part of the GNU C Library. - -@@ -34,7 +34,7 @@ - # ifdef __cplusplus - # define __STRING_INLINE inline - # else --# define __STRING_INLINE extern __inline -+# define __STRING_INLINE __extern_inline - # endif - #endif - ---- libc/sysdeps/s390/fpu/bits/mathinline.h.jj 2006-02-01 04:00:20.000000000 +0100 -+++ libc/sysdeps/s390/fpu/bits/mathinline.h 2006-11-07 11:07:37.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for s390. -- Copyright (C) 2004 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -24,7 +24,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - #if (!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \ ---- libc/sysdeps/powerpc/fpu/bits/mathinline.h.jj 2006-11-06 20:53:15.000000000 +0100 -+++ libc/sysdeps/powerpc/fpu/bits/mathinline.h 2006-11-07 11:08:04.000000000 +0100 -@@ -25,7 +25,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif /* __cplusplus */ - - #if defined __GNUC__ && !defined _SOFT_FLOAT ---- libc/sysdeps/x86_64/fpu/bits/mathinline.h.jj 2004-09-08 00:18:59.000000000 +0200 -+++ libc/sysdeps/x86_64/fpu/bits/mathinline.h 2006-11-07 11:10:33.000000000 +0100 -@@ -1,5 +1,5 @@ - /* Inline math functions for x86-64. -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 2002. - -@@ -25,7 +25,7 @@ - #ifdef __cplusplus - # define __MATH_INLINE __inline - #else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - #endif - - ---- libc/sysdeps/sparc/fpu/bits/mathinline.h.jj 2006-01-14 13:09:02.000000000 +0100 -+++ libc/sysdeps/sparc/fpu/bits/mathinline.h 2006-11-07 11:10:57.000000000 +0100 -@@ -131,7 +131,7 @@ - # ifdef __cplusplus - # define __MATH_INLINE __inline - # else --# define __MATH_INLINE extern __inline -+# define __MATH_INLINE __extern_inline - # endif /* __cplusplus */ - - /* The gcc, version 2.7 or below, has problems with all this inlining ---- libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h.jj 2004-09-11 18:28:10.000000000 +0200 -+++ libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h 2006-11-07 11:12:07.000000000 +0100 -@@ -1,5 +1,5 @@ - /* System-specific socket constants and types. 4.4 BSD version. -- Copyright (C) 1991,92,1994-2002,2004 Free Software Foundation, Inc. -+ Copyright (C) 1991,92,1994-2002,2004,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -227,7 +227,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st - struct cmsghdr *__cmsg) __THROW; - #ifdef __USE_EXTERN_INLINES - # ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - _EXTERN_INLINE struct cmsghdr * - __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) ---- libc/sysdeps/unix/sysv/linux/ia64/ioperm.c.jj 2004-03-18 00:17:58.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/ia64/ioperm.c 2006-11-07 11:13:23.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 1999, 2000, 2001, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David Mosberger-Tang . - -@@ -51,7 +51,7 @@ static struct - } - io; - --__inline__ unsigned long int -+static __always_inline unsigned long int - io_offset (unsigned long int port) - { - return ((port >> 2) << 12) | (port & 0xfff); ---- libc/sysdeps/unix/sysv/linux/bits/socket.h.jj 2006-04-02 19:25:37.000000000 +0200 -+++ libc/sysdeps/unix/sysv/linux/bits/socket.h 2006-11-07 11:15:04.000000000 +0100 -@@ -264,7 +264,7 @@ extern struct cmsghdr *__cmsg_nxthdr (st - struct cmsghdr *__cmsg) __THROW; - #ifdef __USE_EXTERN_INLINES - # ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - _EXTERN_INLINE struct cmsghdr * - __NTH (__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)) ---- libc/sysdeps/unix/sysv/linux/bits/sigset.h.jj 2001-07-06 06:56:14.000000000 +0200 -+++ libc/sysdeps/unix/sysv/linux/bits/sigset.h 2006-11-07 11:14:48.000000000 +0100 -@@ -1,5 +1,6 @@ - /* __sig_atomic_t, __sigset_t, and related definitions. Linux version. -- Copyright (C) 1991, 1992, 1994, 1996, 1997 Free Software Foundation, Inc. -+ Copyright (C) 1991, 1992, 1994, 1996, 1997, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -43,7 +44,7 @@ typedef struct - # define _SIGSET_H_fns 1 - - # ifndef _EXTERN_INLINE --# define _EXTERN_INLINE extern __inline -+# define _EXTERN_INLINE __extern_inline - # endif - - /* Return a mask that includes the bit for SIG only. */ ---- libc/sysdeps/unix/sysv/linux/sys/sysmacros.h.jj 2004-09-08 00:18:59.000000000 +0200 -+++ libc/sysdeps/unix/sysv/linux/sys/sysmacros.h 2006-11-07 11:15:53.000000000 +0100 -@@ -0,0 +1,18 @@ -+/* DO NOT EDIT THIS FILE. -+ -+ It has been auto-edited by fixincludes from: -+ -+ "fixinc/tests/inc/sys/sysmacros.h" -+ -+ This had to be done to correct non-standard usages in the -+ original, manufacturer supplied header file. */ -+ -+ -+ -+#if defined( GLIBC_C99_INLINE_4_CHECK ) -+__extension__ -+#if __STDC_VERSION__ < 19901L -+extern -+#endif -+ __inline unsigned int -+#endif /* GLIBC_C99_INLINE_4_CHECK */ -@@ -1,5 +1,6 @@ - /* Definitions of macros to access `dev_t' values. -- Copyright (C) 1996, 1997, 1999, 2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 1996, 1997, 1999, 2003, 2004, 2006 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -27,30 +28,30 @@ - they need. */ - #ifdef __GLIBC_HAVE_LONG_LONG - __extension__ --extern __inline unsigned int gnu_dev_major (unsigned long long int __dev) -+__extern_inline unsigned int gnu_dev_major (unsigned long long int __dev) - __THROW; - __extension__ --extern __inline unsigned int gnu_dev_minor (unsigned long long int __dev) -+__extern_inline unsigned int gnu_dev_minor (unsigned long long int __dev) - __THROW; - __extension__ --extern __inline unsigned long long int gnu_dev_makedev (unsigned int __major, -+__extern_inline unsigned long long int gnu_dev_makedev (unsigned int __major, - unsigned int __minor) - __THROW; - - # if defined __GNUC__ && __GNUC__ >= 2 --__extension__ extern __inline unsigned int -+__extension__ __extern_inline unsigned int - __NTH (gnu_dev_major (unsigned long long int __dev)) - { - return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff); - } - --__extension__ extern __inline unsigned int -+__extension__ __extern_inline unsigned int - __NTH (gnu_dev_minor (unsigned long long int __dev)) - { - return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff); - } - --__extension__ extern __inline unsigned long long int -+__extension__ __extern_inline unsigned long long int - __NTH (gnu_dev_makedev (unsigned int __major, unsigned int __minor)) - { - return ((__minor & 0xff) | ((__major & 0xfff) << 8) diff --git a/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch b/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch deleted file mode 100644 index 07039718477..00000000000 --- a/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ruN glibc-20050110/configure glibc-20050110.patched/configure ---- glibc-20050110/configure 2005-01-05 10:39:53.000000000 +0100 -+++ glibc-20050110.patched/configure 2005-01-18 13:33:01.000000000 +0100 -@@ -1393,7 +1393,7 @@ - ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - - --if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then -+if test "`cd $srcdir; @PWD@`" = "`@PWD@`"; then - { { echo "$as_me:$LINENO: error: you must configure in a separate build directory" >&5 - echo "$as_me: error: you must configure in a separate build directory" >&2;} - { (exit 1); exit 1; }; } -diff -ruN glibc-20050110/io/ftwtest-sh glibc-20050110.patched/io/ftwtest-sh ---- glibc-20050110/io/ftwtest-sh 2004-02-09 21:12:23.000000000 +0100 -+++ glibc-20050110.patched/io/ftwtest-sh 2005-01-18 13:33:15.000000000 +0100 -@@ -120,7 +120,7 @@ - sort > $testout - - # perhaps $tmp involves some symlinks... --tmpreal=`cd $tmp; /bin/pwd 2>/dev/null || /usr/bin/pwd` -+tmpreal=`cd $tmp; @PWD@ 2>/dev/null || /usr/bin/pwd` - - cat </dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d | - sort > $testout -@@ -160,7 +160,7 @@ - EOF - rm $testout - --curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/. | - sort > $testout -@@ -182,7 +182,7 @@ - EOF - rm $testout - --curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/foo/lvl1/link@1 | - sort > $testout -diff -ruN glibc-20050110/scripts/rellns-sh glibc-20050110.patched/scripts/rellns-sh ---- glibc-20050110/scripts/rellns-sh 1999-12-19 00:40:25.000000000 +0100 -+++ glibc-20050110.patched/scripts/rellns-sh 2005-01-18 13:35:53.245937423 +0100 -@@ -22,13 +22,13 @@ - exit 1 - fi - --if test -x /bin/pwd; then -- pwd=/bin/pwd --elif test -x /usr/bin/pwd; then -- pwd=/usr/bin/pwd --else -+#if test -x /bin/pwd; then -+# pwd=/bin/pwd -+#elif test -x /usr/bin/pwd; then -+# pwd=/usr/bin/pwd -+#else - pwd='pwd' --fi -+#fi - - # Make both paths absolute. - if test -d $1; then diff --git a/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch b/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch deleted file mode 100644 index 816e0aa528b..00000000000 --- a/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- glibc-2.5/manual/Makefile.orig 2011-01-26 17:03:14.000000000 +0100 -+++ glibc-2.5/manual/Makefile 2011-01-26 17:04:30.000000000 +0100 -@@ -232,7 +232,10 @@ - .PHONY: stubs - stubs: $(objpfx)stubs - endif --$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: -+$(objpfx)stubs ../po/manual.pot: -+ $(make-target-directory) -+ touch $@ -+$(objpfx)stamp%: - $(make-target-directory) - touch $@ - diff --git a/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch b/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch deleted file mode 100644 index 45deb1d2d71..00000000000 --- a/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch +++ /dev/null @@ -1,32 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../glibc/x86-fnstsw.patch -# Copyright (C) 2008 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - -Fix more strict checking in binutils since 2.18.50.0.3: - sysdeps/i386/fpu/ftestexcept.c:33: Error: suffix or operands invalid for `fnstsw' - - - Rene Rebe - ---- glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c.vanilla 2008-09-02 12:45:07.000000000 +0200 -+++ glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c 2008-09-02 12:46:37.000000000 +0200 -@@ -26,7 +26,7 @@ - int - fetestexcept (int excepts) - { -- int temp; -+ short temp; - int xtemp = 0; - - /* Get current exceptions. */ diff --git a/pkgs/development/libraries/glibc/2.7/builder.sh b/pkgs/development/libraries/glibc/2.7/builder.sh deleted file mode 100644 index d5a43229bfa..00000000000 --- a/pkgs/development/libraries/glibc/2.7/builder.sh +++ /dev/null @@ -1,60 +0,0 @@ -# glibc cannot have itself in its rpath. -export NIX_NO_SELF_RPATH=1 -export NIX_DONT_SET_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. -export BASH_SHELL=$SHELL - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= -} - - -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.7/default.nix b/pkgs/development/libraries/glibc/2.7/default.nix deleted file mode 100644 index 7eb34e88899..00000000000 --- a/pkgs/development/libraries/glibc/2.7/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation { - name = "glibc-2.7"; - builder = ./builder.sh; - - src = fetchurl { - url = mirror://gnu/glibc/glibc-2.7.tar.bz2; - sha256 = "06j5q20l11x8kcrl9bg15xgb1pw0w82pazikxf4zvq2fmhiaa922"; - }; - - inherit kernelHeaders installLocales; - - inherit (stdenv) is64bit; - - patches = [ - /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - ]; - - # `--with-tls --without-__thread' enables support for TLS but causes - # it not to be used. Required if we don't want to barf on 2.4 - # kernels. Or something. - configureFlags="--enable-add-ons - --with-headers=${kernelHeaders}/include - ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; -} diff --git a/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch deleted file mode 100644 index 4d29082f941..00000000000 --- a/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rc glibc-2.7-orig/sysdeps/posix/getaddrinfo.c glibc-2.7/sysdeps/posix/getaddrinfo.c -*** glibc-2.7-orig/sysdeps/posix/getaddrinfo.c 2007-10-17 18:05:12.000000000 +0200 ---- glibc-2.7/sysdeps/posix/getaddrinfo.c 2008-04-08 12:17:09.000000000 +0200 -*************** -*** 498,505 **** - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - ---- 498,503 ---- -*************** -*** 689,694 **** ---- 687,694 ---- - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - nss_gethostbyname3_r fct = NULL; - if (req->ai_flags & AI_CANONNAME) - /* No need to use this function if we do not look for diff --git a/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch b/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch deleted file mode 100644 index ab3d6144d6e..00000000000 --- a/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch +++ /dev/null @@ -1,42 +0,0 @@ -Support GNU Binutils 2.20 and beyond. Patch from -http://sourceware.org/ml/libc-alpha/2009-09/msg00009.html . - -diff --git a/configure b/configure -index 48e6952..b1d84d7 100755 ---- a/configure -+++ b/configure -@@ -4841,7 +4841,7 @@ $as_echo_n "checking version of $AS... " >&6; } - ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*) -+ 2.1[3-9]*|[2-9].[2-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -@@ -4904,7 +4904,7 @@ $as_echo_n "checking version of $LD... " >&6; } - ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; -- 2.1[3-9]*) -+ 2.1[3-9]*|[2-9].[2-9]*) - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - -diff --git a/configure.in b/configure.in -index 4584afe..7c4f71f 100644 ---- a/configure.in -+++ b/configure.in -@@ -897,10 +897,10 @@ AC_SUBST(MIG)dnl Needed by sysdeps/mach/configure.in - # Accept binutils 2.13 or newer. - AC_CHECK_PROG_VER(AS, $AS, --version, - [GNU assembler.* \([0-9]*\.[0-9.]*\)], -- [2.1[3-9]*], AS=: critic_missing="$critic_missing as") -+ [2.1[3-9]*|[2-9].[2-9]*], AS=: critic_missing="$critic_missing as") - AC_CHECK_PROG_VER(LD, $LD, --version, - [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)], -- [2.1[3-9]*], LD=: critic_missing="$critic_missing ld") -+ [2.1[3-9]*|[2-9].[2-9]*], LD=: critic_missing="$critic_missing ld") - - # We need the physical current working directory. We cannot use the - # "pwd -P" shell builtin since that's not portable. Instead we try to diff --git a/pkgs/development/libraries/glibc/2.9/binutils-ld.patch b/pkgs/development/libraries/glibc/2.9/binutils-ld.patch deleted file mode 100644 index ae70f145ce0..00000000000 --- a/pkgs/development/libraries/glibc/2.9/binutils-ld.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7c8a67320e26b8c11108bf0a3410d3aef9cf3486 Mon Sep 17 00:00:00 2001 -From: Ulrich Drepper -Date: Sat, 31 Jan 2009 00:21:15 +0000 -Subject: [PATCH] * elf/Makefile (ld.so): Adjust the sed script to insert _begin in to - - newer linker scripts. ---- - ChangeLog | 5 +++++ - elf/Makefile | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/elf/Makefile b/elf/Makefile -index 8079fe9..e44ff1d 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -1,4 +1,4 @@ --# Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc. -+# Copyright (C) 1995-2007, 2008, 2009 Free Software Foundation, Inc. - # This file is part of the GNU C Library. - - # The GNU C Library is free software; you can redistribute it and/or -@@ -304,7 +304,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) - $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ - LC_ALL=C \ - sed -e '/^=========/,/^=========/!d;/^=========/d' \ -- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ -+ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ - > $@.lds - $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ - $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ --- -1.6.4 - diff --git a/pkgs/development/libraries/glibc/2.9/builder.sh b/pkgs/development/libraries/glibc/2.9/builder.sh deleted file mode 100644 index c81a3ac2a9e..00000000000 --- a/pkgs/development/libraries/glibc/2.9/builder.sh +++ /dev/null @@ -1,85 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - tar xvjf "$srcPorts" - - if test -n "$crossConfig"; then - sed -i s/-lgcc_eh//g Makeconfig - fi - - mkdir build - cd build - - configureScript=../configure - if test -n "$crossConfig"; then - cat > config.cache << "EOF" -libc_cv_forced_unwind=yes -libc_cv_c_cleanup=yes -libc_cv_gnu89_inline=yes -EOF - export BUILD_CC=gcc - export CC="${crossConfig}-gcc" - export AR="${crossConfig}-ar" - export RANLIB="${crossConfig}-ranlib" - configureFlags="${configureFlags} --cache-file=config.cache" - - # Disable the native stripping, because it breaks libc_nonshared.a - dontStrip=1 - fi -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix deleted file mode 100644 index 7d42825206e..00000000000 --- a/pkgs/development/libraries/glibc/2.9/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -, gccCross ? null -}: -let - cross = if gccCross != null then gccCross.target else null; -in -stdenv.mkDerivation rec { - name = "glibc-2.9" + - stdenv.lib.optionalString (cross != null) "-${cross.config}"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.9.tar.bz2; - sha256 = "0v53m7flx6qcx7cvrvvw6a4dx4x3y6k8nvpc4wfv5xaaqy2am2q9"; - }; - - srcPorts = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-ports-2.9.tar.bz2; - sha256 = "0r2sn527wxqifi63di7ns9wbjh1cainxn978w178khhy7yw9fk42"; - }; - - inherit kernelHeaders installLocales; - crossConfig = if (cross != null) then cross.config else null; - - inherit (stdenv) is64bit; - - patches = [ - /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - - /* Make it possible to override the locale-archive in NixOS. */ - ./locale-override.patch - - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - - ./binutils-ld.patch - ]; - - configureFlags = [ - "--enable-add-ons" - "--with-headers=${kernelHeaders}/include" - (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ stdenv.lib.optionals (cross != null) [ - "--with-tls" - "--enable-kernel=2.6.0" - "--without-fp" - "--with-__thread" - ] ++ (if stdenv.isArm then [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - ] else []); - - buildNativeInputs = stdenv.lib.optionals (cross != null) [ gccCross ]; - - preInstall = if (cross != null) then '' - mkdir -p $out/lib - ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 - '' else ""; - - postInstall = if (cross != null) then '' - rm $out/lib/libgcc_s.so.1 - '' else ""; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix deleted file mode 100644 index 7adeb11c8bc..00000000000 --- a/pkgs/development/libraries/glibc/2.9/headers.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, profilingLibraries ? false -}: - -stdenv.mkDerivation rec { - name = "glibc-headers-2.9"; - - builder = ./headersbuilder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.9.tar.bz2; - sha256 = "0v53m7flx6qcx7cvrvvw6a4dx4x3y6k8nvpc4wfv5xaaqy2am2q9"; - }; - - srcPorts = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-ports-2.9.tar.bz2; - sha256 = "0r2sn527wxqifi63di7ns9wbjh1cainxn978w178khhy7yw9fk42"; - }; - - inherit kernelHeaders; - - inherit (stdenv) is64bit; - - patches = [ - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - ]; - - configureFlags = [ - "--enable-add-ons" - "--with-headers=${kernelHeaders}/include" - "--disable-sanity-checks" - "--enable-hacker-mode" - (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ (if stdenv.isArm then [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - ] else []); - - buildPhase = "true"; - - # I took some tricks from crosstool-0.43 - installPhase = '' - make cross-compiling=yes CFLAGS=-DBOOTSTRAP_GCC install-headers - mkdir -p $out/include/gnu - touch $out/include/gnu/stubs.h - cp ../include/features.h $out/include/features.h - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - ''; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = "-U__i686"; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/headersbuilder.sh b/pkgs/development/libraries/glibc/2.9/headersbuilder.sh deleted file mode 100644 index 23f4bd4cc61..00000000000 --- a/pkgs/development/libraries/glibc/2.9/headersbuilder.sh +++ /dev/null @@ -1,38 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - tar xvjf "$srcPorts" - - mkdir build - cd build - - configureScript=../configure -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.9/info.nix b/pkgs/development/libraries/glibc/2.9/info.nix deleted file mode 100644 index cc79bbece3d..00000000000 --- a/pkgs/development/libraries/glibc/2.9/info.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, texinfo, perl }: - -stdenv.mkDerivation rec { - name = "glibc-info-2.9"; - - src = fetchurl { - url = http://nixos.org/tarballs/glibc-2.9-20081208.tar.bz2; - sha256 = "0zhxbgcsl97pf349m0lz8d5ljvvzrcqc23yf08d888xlk4ms8m3h"; - }; - - patches = [ - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - ]; - - preConfigure = '' - export PWD_P=$(type -tP pwd) - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure - ''; - - configureFlags = [ "--enable-add-ons" ]; - - buildInputs = [ texinfo perl ]; - - buildPhase = "make info"; - - # I don't know why the info is not generated in 'build' - # Somehow building the info still does not work, because the final - # libc.info hasn't a Top node. - installPhase = '' - mkdir -p $out/share/info - cp ../$sourceRoot/manual/*.info $out/share/info - ''; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "Locale information for the GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/locale-override.patch b/pkgs/development/libraries/glibc/2.9/locale-override.patch deleted file mode 100644 index 108d0e35dac..00000000000 --- a/pkgs/development/libraries/glibc/2.9/locale-override.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -rc glibc-2.9-20081208-orig/locale/loadarchive.c glibc-2.9-20081208/locale/loadarchive.c -*** glibc-2.9-20081208-orig/locale/loadarchive.c 2005-09-09 18:56:52.000000000 +0200 ---- glibc-2.9-20081208/locale/loadarchive.c 2009-04-19 13:54:26.000000000 +0200 -*************** -*** 124,129 **** ---- 124,142 ---- - } - - -+ static int -+ open_locale_archive () -+ { -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); -+ if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ return fd; -+ } -+ -+ - /* Find the locale *NAMEP in the locale archive, and return the - internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -*************** -*** 203,209 **** - archmapped = &headmap; - - /* The archive has never been opened. */ -! fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; ---- 216,222 ---- - archmapped = &headmap; - - /* The archive has never been opened. */ -! fd = open_locale_archive (); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; -*************** -*** 394,400 **** - if (fd == -1) - { - struct stat64 st; -! fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; ---- 407,413 ---- - if (fd == -1) - { - struct stat64 st; -! fd = open_locale_archive (); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; -diff -rc glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h glibc-2.9-20081208/sysdeps/generic/unsecvars.h -*** glibc-2.9-20081208-orig/sysdeps/generic/unsecvars.h 2006-10-11 18:24:05.000000000 +0200 ---- glibc-2.9-20081208/sysdeps/generic/unsecvars.h 2009-04-19 13:55:34.000000000 +0200 -*************** -*** 16,21 **** ---- 16,22 ---- - "LD_SHOW_AUXV\0" \ - "LD_USE_LOAD_BIAS\0" \ - "LOCALDOMAIN\0" \ -+ "LOCALE_ARCHIVE\0" \ - "LOCPATH\0" \ - "MALLOC_TRACE\0" \ - "NIS_PATH\0" \ diff --git a/pkgs/development/libraries/glibc/2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix deleted file mode 100644 index a1fe9f82f14..00000000000 --- a/pkgs/development/libraries/glibc/2.9/locales.nix +++ /dev/null @@ -1,67 +0,0 @@ -/* This function builds just the `lib/locale/locale-archive' file from - Glibc and nothing else. If `allLocales' is true, all supported - locales are included; otherwise, just the locales listed in - `locales'. See localedata/SUPPORTED in the Glibc source tree for - the list of all supported locales: - http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc -*/ - -{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: - -stdenv.mkDerivation rec { - name = "glibc-locales-2.9"; - - builder = ./localesbuilder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.9.tar.bz2; - sha256 = "0v53m7flx6qcx7cvrvvw6a4dx4x3y6k8nvpc4wfv5xaaqy2am2q9"; - }; - - srcPorts = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-ports-2.9.tar.bz2; - sha256 = "0r2sn527wxqifi63di7ns9wbjh1cainxn978w178khhy7yw9fk42"; - }; - - inherit (stdenv) is64bit; - - configureFlags = [ - "--enable-add-ons" - "--without-headers" - "--disable-profile" - ] ++ (if stdenv.isArm then [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - ] else []); - - patches = [ - /* Support GNU Binutils 2.20 and above. */ - ./binutils-2.20.patch - ]; - - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - buildPhase = - '' - mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" - make localedata/install-locales \ - LOCALEDEF="localedef --prefix=$TMPDIR" \ - localedir=$out/lib/locale \ - ${if allLocales then "" else "SUPPORTED-LOCALES=\"${toString locales}\""} - ''; - - installPhase = - '' - mkdir -p $out/lib/locale - cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/ - ''; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "Locale information for the GNU C Library"; - }; -} diff --git a/pkgs/development/libraries/glibc/2.9/localesbuilder.sh b/pkgs/development/libraries/glibc/2.9/localesbuilder.sh deleted file mode 100644 index a28f6bcbaeb..00000000000 --- a/pkgs/development/libraries/glibc/2.9/localesbuilder.sh +++ /dev/null @@ -1,50 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - -# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to -# prevent a retained dependency on the bootstrap tools in the -# stdenv-linux bootstrap. -export BASH_SHELL=/bin/sh - - -preConfigure() { - - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - # In the glibc 2.6/2.7 tarballs C-translit.h is a little bit older - # than C-translit.h.in, forcing Make to rebuild it unnecessarily. - # This wouldn't be problem except that it requires Perl, which we - # don't want as a dependency in the Nixpkgs bootstrap. So force - # the output file to be newer. - touch locale/C-translit.h - - tar xvjf "$srcPorts" - - mkdir build - cd build - - configureScript=../configure -} - - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch deleted file mode 100644 index dc09b509870..00000000000 --- a/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -rc glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c -*** glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c 2008-07-30 21:14:22.000000000 +0200 ---- glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c 2008-12-10 11:39:32.000000000 +0100 -*************** -*** 505,512 **** - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - ---- 505,510 ---- -*************** -*** 702,707 **** ---- 700,707 ---- - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); - if (fct4 != NULL) diff --git a/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch deleted file mode 100644 index fbb03dd5fad..00000000000 --- a/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch +++ /dev/null @@ -1,72 +0,0 @@ -By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths -(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This -patch makes it run any `cpp' command found in $PATH. - ---- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 -+++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 -@@ -79,7 +79,7 @@ static const char *cmdname; - - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; -+static const char *CPP = "cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -108,7 +108,6 @@ static char *extendfile (const char *fil - static void open_output (const char *infile, const char *outfile); - static void add_warning (void); - static void clear_args (void); --static void find_cpp (void); - static void open_input (const char *infile, const char *define); - static int check_nettype (const char *name, const char *list_to_check[]); - static void c_output (const char *infile, const char *define, -@@ -327,31 +326,6 @@ clear_args (void) - argcount = FIXEDARGS; - } - --/* make sure that a CPP exists */ --static void --find_cpp (void) --{ -- struct stat buf; -- -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } -- } --} -- - /* - * Open input file with given define for C-preprocessor - */ -@@ -370,7 +344,6 @@ open_input (const char *infile, const ch - switch (cpp_pid) - { - case 0: -- find_cpp (); - putarg (0, CPP); - putarg (1, CPPFLAGS); - addarg (define); -@@ -380,7 +353,7 @@ open_input (const char *infile, const ch - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -+ execvp (arglist[0], (char **) arglist); - perror ("execv"); - exit (1); - case -1: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7f63748658..b120cebd882 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3586,28 +3586,6 @@ let glibcCross = glibc213Cross; - glibc25 = callPackage ../development/libraries/glibc/2.5 { - kernelHeaders = linuxHeaders_2_6_28; - installLocales = false; - }; - - glibc27 = callPackage ../development/libraries/glibc/2.7 { - kernelHeaders = linuxHeaders; - #installLocales = false; - }; - - glibc29 = callPackage ../development/libraries/glibc/2.9 { - kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; - }; - - glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.9) { - inherit stdenv fetchurl; - gccCross = gccCrossStageStatic; - kernelHeaders = linuxHeadersCross; - installLocales = getConfig [ "glibc" "locales" ] false; - }); - glibc213 = (callPackage ../development/libraries/glibc/2.13 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; -- GitLab From 7d5bb08534e4f6a2eda1ff0d762c4922d17b25c7 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 18 Sep 2012 12:08:16 -0400 Subject: [PATCH 0536/5607] Add cipher-block-size node package and remove the nativeDeps argument to build-node-package (buildInputs can just be specified directly) --- .../web/nodejs/build-node-package.nix | 3 +- pkgs/top-level/node-packages.nix | 32 ++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index b12e2669f06..41550a72529 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,6 +1,6 @@ { stdenv, runCommand, nodejs, neededNatives}: -args @ { src, deps ? [], nativeDeps ? [], flags ? [], ... }: +args @ { src, deps ? [], flags ? [], ... }: with stdenv.lib; @@ -31,7 +31,6 @@ stdenv.mkDerivation ({ ''; buildNativeInputs = neededNatives; - buildInputs = nativeDeps; installPhase = '' runHook preInstall diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 2d995c1ce30..8bcabbdf595 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -66,6 +66,19 @@ let self = { ]; }; + "bindings" = self."bindings-1"; + + "bindings-1" = self.buildNodePackage rec { + name = "bindings-1.0.0"; + src = fetchurl { + url = "http://registry.npmjs.org/bindings/-/${name}.tgz"; + sha256 = "cb211ac856d135af5ee864762fae9e554225a613ea1fd815c20b8fdd1679c9ed"; + }; + deps = [ + + ]; + }; + "block-stream" = self."block-stream-*"; "block-stream-*" = self.buildNodePackage rec { @@ -123,6 +136,23 @@ let self = { ]; }; + "cipher-block-size" = self."cipher-block-size-0.0.0"; + + "cipher-block-size-0.0.0" = self.buildNodePackage rec { + name = "cipher-block-size-0.0.0"; + src = fetchurl { + url = https://bitbucket.org/shlevy/node-cipher-block-size/get/0.0.0.tar.gz; + sha256 = "0j4i19ckb9ab9aqd4w3j0vrvcw7c6icq279x4fx8xs1h9massxng"; + name = "${name}.tgz"; + }; + deps = [ + self."bindings-1" + ]; + buildInputs = [ + pkgs.openssl + ]; + }; + "coffee-script" = self."coffee-script-1.3.3"; "coffee-script-~1" = self."coffee-script-1.3.3"; @@ -696,7 +726,7 @@ let self = { deps = [ ]; - nativeDeps = [ + buildInputs = [ pkgs.openssl ]; }; -- GitLab From aa34058205434abff09fba1875a34482866850e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 12:38:43 -0400 Subject: [PATCH 0537/5607] glibc: Update to 2.16 --- .../libraries/glibc/2.16/builder.sh | 54 +++++ .../libraries/glibc/2.16/common.nix | 209 ++++++++++++++++++ .../libraries/glibc/2.16/default.nix | 99 +++++++++ .../2.16/dont-use-system-ld-so-cache.patch | 45 ++++ .../glibc/2.16/glibc-elf-localscope.patch | 82 +++++++ .../development/libraries/glibc/2.16/info.nix | 26 +++ .../libraries/glibc/2.16/locales-builder.sh | 17 ++ .../libraries/glibc/2.16/locales.nix | 47 ++++ .../glibc/2.16/nix-locale-archive.patch | 114 ++++++++++ .../glibc/2.16/nss-skip-unavail.patch | 21 ++ .../libraries/glibc/2.16/rpcgen-path.patch | 72 ++++++ pkgs/top-level/all-packages.nix | 11 +- 12 files changed, 796 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/glibc/2.16/builder.sh create mode 100644 pkgs/development/libraries/glibc/2.16/common.nix create mode 100644 pkgs/development/libraries/glibc/2.16/default.nix create mode 100644 pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch create mode 100644 pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch create mode 100644 pkgs/development/libraries/glibc/2.16/info.nix create mode 100644 pkgs/development/libraries/glibc/2.16/locales-builder.sh create mode 100644 pkgs/development/libraries/glibc/2.16/locales.nix create mode 100644 pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch create mode 100644 pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch create mode 100644 pkgs/development/libraries/glibc/2.16/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc/2.16/builder.sh b/pkgs/development/libraries/glibc/2.16/builder.sh new file mode 100644 index 00000000000..e68e13f9bec --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/builder.sh @@ -0,0 +1,54 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + + +postInstall() { + if test -n "$installLocales"; then + make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales + fi + + test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache + + # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been + # renamed. + if test -z "$hurdHeaders"; then + # Include the Linux kernel headers in Glibc, except the `scsi' + # subdirectory, which Glibc provides itself. + (cd $out/include && \ + ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) + fi + + if test -f "$out/lib/libhurduser.so"; then + # libc.so, libhurduser.so, and libmachuser.so depend on each + # other, so add them to libc.so (a RUNPATH on libc.so.0.3 + # would be ignored by the cross-linker.) + echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." + sed -i "$out/lib/libc.so" \ + -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" + fi + + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink + # "lib64" to "lib". + if test -n "$is64bit"; then + ln -s lib $out/lib64 + fi + + # This file, that should not remain in the glibc derivation, + # may have not been created during the preInstall + rm -f $out/lib/libgcc_s.so.1 +} + +genericBuild diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix new file mode 100644 index 00000000000..5624be5b549 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -0,0 +1,209 @@ +/* Build configuration used to build glibc, Info files, and locale + information. */ + +cross: + +{ name, fetchurl, stdenv, installLocales ? false +, gccCross ? null, kernelHeaders ? null +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null +, profilingLibraries ? false, meta +, preConfigure ? "", ... }@args: + +let + version = "2.16.0"; + + needsPortsNative = stdenv.isMips || stdenv.isArm; + needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; + needsPorts = + if stdenv.cross or null != null && hurdHeaders == null then true + else if cross == null then needsPortsNative + else needsPortsCross; + + srcPorts = fetchurl { + url = "mirror://gnu/glibc/glibc-ports-${version}.tar.bz2"; + sha256 = "0qw4n71rqykl83ybq0c92w1n8afsx079sw3hn5nyib5nw6iphrfm"; + }; + +in + +assert cross != null -> gccCross != null; + +assert mig != null -> machHeaders != null; +assert machHeaders != null -> hurdHeaders != null; +assert hurdHeaders != null -> libpthreadHeaders != null; + +stdenv.mkDerivation ({ + inherit kernelHeaders installLocales; + + # The host/target system. + crossConfig = if cross != null then cross.config else null; + + inherit (stdenv) is64bit; + + enableParallelBuilding = true; + + patches = + [ /* Fix for NIXPKGS-79: when doing host name lookups, when + nsswitch.conf contains a line like + + hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 + + don't return an error when mdns4_minimal can't be found. This + is a bug in Glibc: when a service can't be found, NSS should + continue to the next service unless "UNAVAIL=return" is set. + ("NOTFOUND=return" refers to the service returning a NOTFOUND + error, not the service itself not being found.) The reason is + that the "status" variable (while initialised to UNAVAIL) is + outside of the loop that iterates over the services, the + "files" service sets status to NOTFOUND. So when the call to + find "mdns4_minimal" fails, "status" will still be NOTFOUND, + and it will return instead of continuing to "dns". Thus, the + line + + hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 + + does work because "status" will contain UNAVAIL after the + failure to find mdns4_minimal. */ + ./nss-skip-unavail.patch + + /* Have rpcgen(1) look for cpp(1) in $PATH. */ + ./rpcgen-path.patch + + /* Allow NixOS and Nix to handle the locale-archive. */ + ./nix-locale-archive.patch + + /* Don't use /etc/ld.so.cache, for non-NixOS systems. Currently + disabled on GNU/Hurd, which uses a more recent libc snapshot. */ + ./dont-use-system-ld-so-cache.patch + + /* Without this patch many KDE binaries crash. */ + ./glibc-elf-localscope.patch + ]; + + postPatch = '' + # Needed for glibc to build with the gnumake 3.82 + # http://comments.gmane.org/gmane.linux.lfs.support/31227 + sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile + + # nscd needs libgcc, and we don't want it dynamically linked + # because we don't want it to depend on bootstrap-tools libs. + echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + ''; + + configureFlags = + [ "-C" + "--enable-add-ons" + "--enable-obsolete-rpc" + "--sysconfdir=/etc" + "--localedir=/var/run/current-system/sw/lib/locale" + "libc_cv_ssp=no" + (if kernelHeaders != null + then "--with-headers=${kernelHeaders}/include" + else "--without-headers") + (if profilingLibraries + then "--enable-profile" + else "--disable-profile") + ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ + "--enable-kernel=${kernelHeaders.versionForGlibc}" + ] ++ stdenv.lib.optionals (cross != null) [ + (if cross.withTLS then "--with-tls" else "--without-tls") + (if cross.float == "soft" then "--without-fp" else "--with-fp") + ] ++ stdenv.lib.optionals (cross != null + && cross.platform ? kernelMajor + && cross.platform.kernelMajor == "2.6") [ + "--enable-kernel=2.6.0" + "--with-__thread" + ] ++ stdenv.lib.optionals stdenv.isArm [ + "--host=arm-linux-gnueabi" + "--build=arm-linux-gnueabi" + "--without-fp" + # To avoid linking with -lgcc_s (dynamic link) + # so the glibc does not depend on its compiler store path + "libc_cv_as_needed=no" + ]; + + installFlags = [ "sysconfdir=$(out)/etc" ]; + + buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] + ++ stdenv.lib.optional (mig != null) mig; + + # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to + # prevent a retained dependency on the bootstrap tools in the stdenv-linux + # bootstrap. + BASH_SHELL = "/bin/sh"; + + # Workaround for this bug: + # http://sourceware.org/bugzilla/show_bug.cgi?id=411 + # I.e. when gcc is compiled with --with-arch=i686, then the + # preprocessor symbol `__i686' will be defined to `1'. This causes + # the symbol __i686.get_pc_thunk.dx to be mangled. + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; +} + +# Remove the `gccCross' attribute so that the *native* glibc store path +# doesn't depend on whether `gccCross' is null or not. +// (removeAttrs args [ "gccCross" "fetchurl" ]) // + +{ + name = name + "-${version}" + + stdenv.lib.optionalString (cross != null) "-${cross.config}"; + + src = fetchurl { + url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; + sha256 = "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7"; + }; + + # Remove absolute paths from `configure' & co.; build out-of-tree. + preConfigure = '' + export PWD_P=$(type -tP pwd) + for i in configure io/ftwtest-sh; do + # Can't use substituteInPlace here because replace hasn't been + # built yet in the bootstrap. + sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" + done + + ${if needsPorts then "tar xvf ${srcPorts}" else ""} + + mkdir ../build + cd ../build + + configureScript="`pwd`/../$sourceRoot/configure" + + # Needed to build rpcgen. + export LD_LIBRARY_PATH=${stdenv.gcc.libc}/lib + + ${preConfigure} + ''; + + meta = { + homepage = http://www.gnu.org/software/libc/; + description = "The GNU C Library" + + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd"; + + longDescription = + '' Any Unix-like operating system needs a C library: the library which + defines the "system calls" and other basic facilities such as + open, malloc, printf, exit... + + The GNU C library is used as the C library in the GNU system and + most systems with the Linux kernel. + ''; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + #platforms = stdenv.lib.platforms.linux; + } // meta; +} + +// stdenv.lib.optionalAttrs (hurdHeaders != null) { + # Work around the fact that the configure snippet that looks for + # does not honor `--with-headers=$sysheaders' and that + # glibc expects Mach, Hurd, and pthread headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; + + # Install NSS stuff in the right place. + # XXX: This will be needed for all new glibcs and isn't Hurd-specific. + makeFlags = ''vardbdir="$out/var/db"''; +}) diff --git a/pkgs/development/libraries/glibc/2.16/default.nix b/pkgs/development/libraries/glibc/2.16/default.nix new file mode 100644 index 00000000000..0a0752570f3 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/default.nix @@ -0,0 +1,99 @@ +{ stdenv, fetchurl, kernelHeaders +, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null +, mig ? null +, installLocales ? true +, profilingLibraries ? false +, gccCross ? null +, debugSymbols ? false +}: + +assert stdenv.gcc.gcc != null; + +let + build = import ./common.nix; + cross = if gccCross != null then gccCross.target else null; +in + build cross ({ + name = "glibc" + + stdenv.lib.optionalString (hurdHeaders != null) "-hurd" + + stdenv.lib.optionalString debugSymbols "-debug"; + + inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries + gccCross; + + builder = ./builder.sh; + + # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for + # any program we run, because the gcc will have been placed at a new + # store path than that determined when built (as a source for the + # bootstrap-tools tarball) + # Building from a proper gcc staying in the path where it was installed, + # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without + # any special hack. + preInstall = '' + if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then + mkdir -p $out/lib + ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + fi + ''; + + meta.description = "The GNU C Library"; + } + + // + + (if debugSymbols + then { + # Build with debugging symbols, but leave optimizations on and don't + # attempt to keep the build tree. + dontStrip = true; + dontCrossStrip = true; + NIX_STRIP_DEBUG = 0; + } + else {}) + + // + + (if hurdHeaders != null + then rec { + inherit machHeaders hurdHeaders libpthreadHeaders mig; + + propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; + + passthru = { + # When building GCC itself `propagatedBuildInputs' above is not + # honored, so we pass it here so that the GCC builder can do the right + # thing. + inherit propagatedBuildInputs; + }; + } + else { }) + + // + + (if cross != null + then { + preConfigure = '' + sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" + + cat > config.cache << "EOF" + libc_cv_forced_unwind=yes + libc_cv_c_cleanup=yes + libc_cv_gnu89_inline=yes + # Only due to a problem in gcc configure scripts: + libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} + EOF + export BUILD_CC=gcc + export CC="$crossConfig-gcc" + export AR="$crossConfig-ar" + export RANLIB="$crossConfig-ranlib" + + dontStrip=1 + ''; + + # To avoid a dependency on the build system 'bash'. + preFixup = '' + rm $out/bin/{ldd,tzselect,catchsegv,xtrace} + ''; + } + else {})) diff --git a/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch new file mode 100644 index 00000000000..95f53773320 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch @@ -0,0 +1,45 @@ +diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c +--- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400 +@@ -50,7 +50,7 @@ + #endif + + #ifndef LD_SO_CONF +-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" ++# define LD_SO_CONF PREFIX "/etc/ld.so.conf" + #endif + + /* Get libc version number. */ +diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile +--- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400 +@@ -415,12 +415,12 @@ + + $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o) + +-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' +-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ ++PREFIX-FLAGS := -D'PREFIX="$(prefix)"' ++CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ + -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 +-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) +-CFLAGS-cache.c = $(SYSCONF-FLAGS) +-CFLAGS-rtld.c = $(SYSCONF-FLAGS) ++CFLAGS-dl-cache.c = $(PREFIX-FLAGS) ++CFLAGS-cache.c = $(PREFIX-FLAGS) ++CFLAGS-rtld.c = $(PREFIX-FLAGS) + + CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\ + -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld) +diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h +--- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400 +@@ -28,7 +28,7 @@ + #endif + + #ifndef LD_SO_CACHE +-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" ++# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" + #endif + + #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch new file mode 100644 index 00000000000..98f7f81087b --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch @@ -0,0 +1,82 @@ +diff -ru a/elf/dl-close.c b/elf/dl-close.c +--- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 ++++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 +@@ -180,24 +186,28 @@ + /* Signal the object is still needed. */ + l->l_idx = IDX_STILL_USED; + ++#define mark_used(dmap) \ ++ do { \ ++ if ((dmap)->l_idx != IDX_STILL_USED) \ ++ { \ ++ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ ++ \ ++ if (!used[(dmap)->l_idx]) \ ++ { \ ++ used[(dmap)->l_idx] = 1; \ ++ if ((dmap)->l_idx - 1 < done_index) \ ++ done_index = (dmap)->l_idx - 1; \ ++ } \ ++ } \ ++ } while (0) ++ + /* Mark all dependencies as used. */ + if (l->l_initfini != NULL) + { + struct link_map **lp = &l->l_initfini[1]; + while (*lp != NULL) + { +- if ((*lp)->l_idx != IDX_STILL_USED) +- { +- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); +- +- if (!used[(*lp)->l_idx]) +- { +- used[(*lp)->l_idx] = 1; +- if ((*lp)->l_idx - 1 < done_index) +- done_index = (*lp)->l_idx - 1; +- } +- } +- ++ mark_used(*lp); + ++lp; + } + } +@@ -206,19 +216,25 @@ + for (unsigned int j = 0; j < l->l_reldeps->act; ++j) + { + struct link_map *jmap = l->l_reldeps->list[j]; +- +- if (jmap->l_idx != IDX_STILL_USED) +- { +- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); +- +- if (!used[jmap->l_idx]) +- { +- used[jmap->l_idx] = 1; +- if (jmap->l_idx - 1 < done_index) +- done_index = jmap->l_idx - 1; +- } +- } ++ mark_used(jmap); + } ++ /* And the same for owners of our scopes; normally, our last ++ scope provider would render us unused, but this can be ++ prevented by the NODELETE flag. */ ++ if (__builtin_expect(l->l_type == lt_loaded ++ && (l->l_flags_1 & DF_1_NODELETE), 0)) ++ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) ++ /* This relies on l_scope[] entries being always set either ++ to its own l_symbolic_searchlist address, or some map's ++ l_searchlist address. */ ++ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) ++ { ++ struct link_map *ls = (struct link_map *) ++ ((char *) l->l_scope[cnt] ++ - offsetof (struct link_map, l_searchlist)); ++ assert (ls->l_ns == nsid); ++ mark_used(ls); ++ } + } + + /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc/2.16/info.nix b/pkgs/development/libraries/glibc/2.16/info.nix new file mode 100644 index 00000000000..322f07f0236 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/info.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, texinfo, perl }: + +let build = import ./common.nix; in + +/* null cross builder */ +build null { + name = "glibc-info"; + + inherit fetchurl stdenv; + + configureFlags = [ "--enable-add-ons" ]; + + buildInputs = [ texinfo perl ]; + + buildPhase = "make info"; + + # I don't know why the info is not generated in 'build' + # Somehow building the info still does not work, because the final + # libc.info hasn't a Top node. + installPhase = '' + mkdir -p "$out/share/info" + cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" + ''; + + meta.description = "GNU Info manual of the GNU C Library"; +} diff --git a/pkgs/development/libraries/glibc/2.16/locales-builder.sh b/pkgs/development/libraries/glibc/2.16/locales-builder.sh new file mode 100644 index 00000000000..d732e208fa2 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/locales-builder.sh @@ -0,0 +1,17 @@ +# Glibc cannot have itself in its RPATH. +export NIX_NO_SELF_RPATH=1 + +source $stdenv/setup + +postConfigure() { + # Hack: get rid of the `-static' flag set by the bootstrap stdenv. + # This has to be done *after* `configure' because it builds some + # test binaries. + export NIX_CFLAGS_LINK= + export NIX_LDFLAGS_BEFORE= + + export NIX_DONT_SET_RPATH=1 + unset CFLAGS +} + +genericBuild diff --git a/pkgs/development/libraries/glibc/2.16/locales.nix b/pkgs/development/libraries/glibc/2.16/locales.nix new file mode 100644 index 00000000000..b7eae50ca38 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/locales.nix @@ -0,0 +1,47 @@ +/* This function builds just the `lib/locale/locale-archive' file from + Glibc and nothing else. If `allLocales' is true, all supported + locales are included; otherwise, just the locales listed in + `locales'. See localedata/SUPPORTED in the Glibc source tree for + the list of all supported locales: + http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc +*/ + +{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: + +let build = import ./common.nix; +in + build null { + name = "glibc-locales"; + + inherit fetchurl stdenv; + installLocales = true; + + builder = ./locales-builder.sh; + + # Awful hack: `localedef' doesn't allow the path to `locale-archive' + # to be overriden, but you *can* specify a prefix, i.e. it will use + # //lib/locale/locale-archive. So we use + # $TMPDIR as a prefix, meaning that the locale-archive is placed in + # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. + buildPhase = + '' + mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" + + # Hack to allow building of the locales (needed since glibc-2.12) + sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ + /library-path/d ../glibc-2*/localedata/Makefile + ${if allLocales then "" else + "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} + + make localedata/install-locales \ + localedir=$out/lib/locale \ + ''; + + installPhase = + '' + mkdir -p "$out/lib/locale" + cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" + ''; + + meta.description = "Locale information for the GNU C Library"; + } diff --git a/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch new file mode 100644 index 00000000000..88c8adef922 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch @@ -0,0 +1,114 @@ +diff -ru glibc-2.16.0-orig/locale/loadarchive.c glibc-2.16.0/locale/loadarchive.c +--- glibc-2.16.0-orig/locale/loadarchive.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/loadarchive.c 2012-09-18 11:57:57.277515212 -0400 +@@ -123,6 +123,25 @@ + } + + ++static int ++open_locale_archive () ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ const char *usualpath = "/usr/lib/locale/locale-archive"; ++ if (path) ++ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (path2 && fd < 0) ++ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (fd < 0) ++ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ if (fd < 0) ++ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ return fd; ++} ++ ++ + /* Find the locale *NAMEP in the locale archive, and return the + internalized data structure for its CATEGORY data. If this locale has + already been loaded from the archive, just returns the existing data +@@ -202,7 +221,7 @@ + archmapped = &headmap; + + /* The archive has never been opened. */ +- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = open_locale_archive (); + if (fd < 0) + /* Cannot open the archive, for whatever reason. */ + return NULL; +@@ -393,8 +412,7 @@ + if (fd == -1) + { + struct stat64 st; +- fd = open_not_cancel_2 (archfname, +- O_RDONLY|O_LARGEFILE|O_CLOEXEC); ++ fd = open_locale_archive (); + if (fd == -1) + /* Cannot open the archive, for whatever reason. */ + return NULL; +diff -ru glibc-2.16.0-orig/locale/programs/locale.c glibc-2.16.0/locale/programs/locale.c +--- glibc-2.16.0-orig/locale/programs/locale.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/programs/locale.c 2012-09-18 11:53:03.719920947 -0400 +@@ -628,6 +628,20 @@ + ((const struct nameent *) b)->name); + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + static int + write_archive_locales (void **all_datap, char *linebuf) +@@ -641,7 +655,7 @@ + int fd, ret = 0; + uint32_t cnt; + +- fd = open64 (ARCHIVE_NAME, O_RDONLY); ++ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); + if (fd < 0) + return 0; + +diff -ru glibc-2.16.0-orig/locale/programs/locarchive.c glibc-2.16.0/locale/programs/locarchive.c +--- glibc-2.16.0-orig/locale/programs/locarchive.c 2012-06-30 15:12:34.000000000 -0400 ++++ glibc-2.16.0/locale/programs/locarchive.c 2012-09-18 11:53:03.720920942 -0400 +@@ -509,6 +509,20 @@ + *ah = new_ah; + } + ++static int ++open_nix_locale_archive (const char * fname, int access) ++{ ++ int fd = -1; ++ char *path = getenv ("LOCALE_ARCHIVE_2_11"); ++ char *path2 = getenv ("LOCALE_ARCHIVE"); ++ if (path) ++ fd = open64 (path, access); ++ if (path2 && fd < 0) ++ fd = open64 (path2, access); ++ if (fd < 0) ++ fd = open64 (fname, access); ++ return fd; ++} + + void + open_archive (struct locarhandle *ah, bool readonly) +@@ -528,7 +542,7 @@ + while (1) + { + /* Open the archive. We must have exclusive write access. */ +- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); ++ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); + if (fd == -1) + { + /* Maybe the file does not yet exist. */ diff --git a/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch new file mode 100644 index 00000000000..e48dc2bc0a6 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch @@ -0,0 +1,21 @@ +diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c +--- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 ++++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 +@@ -505,8 +505,6 @@ + int no_data = 0; + int no_inet6_data = 0; + service_user *nip = NULL; +- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; +- enum nss_status status = NSS_STATUS_UNAVAIL; + int no_more; + int old_res_options; + +@@ -702,6 +700,8 @@ + + while (!no_more) + { ++ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; ++ enum nss_status status = NSS_STATUS_UNAVAIL; + no_data = 0; + nss_gethostbyname4_r fct4 + = __nss_lookup_function (nip, "gethostbyname4_r"); diff --git a/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch new file mode 100644 index 00000000000..fbb03dd5fad --- /dev/null +++ b/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch @@ -0,0 +1,72 @@ +By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths +(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This +patch makes it run any `cpp' command found in $PATH. + +--- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 ++++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 +@@ -79,7 +79,7 @@ static const char *cmdname; + + static const char *svcclosetime = "120"; + static int cppDefined; /* explicit path for C preprocessor */ +-static const char *CPP = SUNOS_CPP; ++static const char *CPP = "cpp"; + static const char CPPFLAGS[] = "-C"; + static char *pathbuf; + static int cpp_pid; +@@ -108,7 +108,6 @@ static char *extendfile (const char *fil + static void open_output (const char *infile, const char *outfile); + static void add_warning (void); + static void clear_args (void); +-static void find_cpp (void); + static void open_input (const char *infile, const char *define); + static int check_nettype (const char *name, const char *list_to_check[]); + static void c_output (const char *infile, const char *define, +@@ -327,31 +326,6 @@ clear_args (void) + argcount = FIXEDARGS; + } + +-/* make sure that a CPP exists */ +-static void +-find_cpp (void) +-{ +- struct stat buf; +- +- if (stat (CPP, &buf) < 0) +- { /* /lib/cpp or explicit cpp does not exist */ +- if (cppDefined) +- { +- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); +- crash (); +- } +- else +- { /* try the other one */ +- CPP = SVR4_CPP; +- if (stat (CPP, &buf) < 0) +- { /* can't find any cpp */ +- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); +- crash (); +- } +- } +- } +-} +- + /* + * Open input file with given define for C-preprocessor + */ +@@ -370,7 +344,6 @@ open_input (const char *infile, const ch + switch (cpp_pid) + { + case 0: +- find_cpp (); + putarg (0, CPP); + putarg (1, CPPFLAGS); + addarg (define); +@@ -380,7 +353,7 @@ open_input (const char *infile, const ch + close (1); + dup2 (pd[1], 1); + close (pd[0]); +- execv (arglist[0], (char **) arglist); ++ execvp (arglist[0], (char **) arglist); + perror ("execv"); + exit (1); + case -1: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b120cebd882..da9451b465f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3555,6 +3555,7 @@ let 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 { @@ -3582,7 +3583,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc213; + glibc = glibc216; glibcCross = glibc213Cross; @@ -3628,6 +3629,14 @@ let inherit fetchgit; })); + glibc216 = callPackage ../development/libraries/glibc/2.16 { + kernelHeaders = linuxHeaders; + installLocales = config.glibc.locales or false; + machHeaders = null; + hurdHeaders = null; + gccCross = null; + }; + # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross else if (name == "uclibc") then uclibcCross -- GitLab From 570dcf67887b306f210ab22a04020523ac952c23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2012 19:33:12 +0200 Subject: [PATCH 0538/5607] smartmontools: update drivedb.h to latest version --- pkgs/tools/system/smartmontools/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index eee0b0de571..b79e92b5237 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -1,5 +1,11 @@ { stdenv, fetchurl }: +let + driverdb = fetchurl { + url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/branches/RELEASE_5_43_DRIVEDB/smartmontools/drivedb.h?revision=3605"; + sha256 = "1kibx5aal903hcpy6mjmfik6n9j142i3q3vvrcp1wmz10mfsqj8f"; + }; +in stdenv.mkDerivation rec { name = "smartmontools-5.43"; @@ -8,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e"; }; + patchPhase = "cp ${driverdb} drivedb.h"; + meta = { description = "Tools for monitoring the health of hard drivers"; homepage = "http://smartmontools.sourceforge.net/"; -- GitLab From 167df7ad320dea50082d467dc9f0f205aa0b8b16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 13:14:22 -0400 Subject: [PATCH 0539/5607] Add tzdata Glibc 2.16 no longer contains timezone data (yay!) so provide tzdata instead. --- pkgs/data/misc/tzdata/default.nix | 33 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/misc/tzdata/default.nix diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix new file mode 100644 index 00000000000..c49430935ae --- /dev/null +++ b/pkgs/data/misc/tzdata/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl }: + +let version = "2012f"; in + +stdenv.mkDerivation rec { + name = "tzdata-${version}"; + + srcs = + [ (fetchurl { + url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; + sha256 = "1k165i8g23rr0z26k02x1l4immp69g6yqjrd3lwmbvj5li4mmsdg"; + }) + (fetchurl { + url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; + sha256 = "1m6rg9003mkjyvpv5gg5lcia9fzhy7ndwgs68qlpbipnw5p0k2pk"; + }) + ]; + + sourceRoot = "."; + + makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(TMPDIR)/lib MANDIR=$(TMPDIR)/man AWK=awk"; + + postInstall = + '' + mv $out/share/zoneinfo-posix $out/share/zoneinfo/posix + mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right + ''; + + meta = { + homepage = http://www.iana.org/time-zones; + description = "Database of current and historical time zones"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3cb86c598f..b00b1de4098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6434,6 +6434,8 @@ let ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; + tzdata = callPackage ../data/misc/tzdata { }; + ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; ucsFonts = callPackage ../data/fonts/ucs-fonts { }; -- GitLab From fcc18aad0a3f24c281a3b046e946378b303dd3fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:05:23 -0400 Subject: [PATCH 0540/5607] Fix some packages that referred to gets() Glibc no longer defines gets() if _GNU_SOURCE is defined. --- .../development/libraries/gettext/default.nix | 2 + .../libraries/gettext/no-gets.patch | 42 +++++++++++++++++++ pkgs/development/tools/misc/gnum4/default.nix | 2 +- .../tools/misc/gnum4/no-gets.patch | 26 ++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/gettext/no-gets.patch create mode 100644 pkgs/development/tools/misc/gnum4/no-gets.patch diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 73366b2bdc9..9947cf580a0 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation (rec { sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k"; }; + patches = [ ./no-gets.patch ]; + configureFlags = [ "--disable-csharp" ] ++ (stdenv.lib.optionals stdenv.isCygwin [ # We have a static libiconv, so we can only build the static lib. diff --git a/pkgs/development/libraries/gettext/no-gets.patch b/pkgs/development/libraries/gettext/no-gets.patch new file mode 100644 index 00000000000..9daa48eae64 --- /dev/null +++ b/pkgs/development/libraries/gettext/no-gets.patch @@ -0,0 +1,42 @@ +hack until gzip pulls a newer gnulib version + +From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 29 Mar 2012 13:30:41 -0600 +Subject: [PATCH] stdio: don't assume gets any more + +Gnulib intentionally does not have a gets module, and now that C11 +and glibc have dropped it, we should be more proactive about warning +any user on a platform that still has a declaration of this dangerous +interface. + +--- a/gettext-tools/libgettextpo/stdio.in.h ++++ b/gettext-tools/libgettextpo/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +--- a/gettext-tools/gnulib-lib/stdio.in.h ++++ b/gettext-tools/gnulib-lib/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ +--- a/gettext-runtime/gnulib-lib/stdio.in.h ++++ b/gettext-runtime/gnulib-lib/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 1f026f12f52..d1b0d0e376e 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { && !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ]; + patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ./no-gets.patch ]; meta = { homepage = http://www.gnu.org/software/m4/; diff --git a/pkgs/development/tools/misc/gnum4/no-gets.patch b/pkgs/development/tools/misc/gnum4/no-gets.patch new file mode 100644 index 00000000000..456c08b56c3 --- /dev/null +++ b/pkgs/development/tools/misc/gnum4/no-gets.patch @@ -0,0 +1,26 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-devel/m4/files/m4-1.4.16-no-gets.patch?revision=1.1 + +https://bugs.gentoo.org/424978 + +hack until m4 pulls a newer gnulib version + +From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 +From: Eric Blake +Date: Thu, 29 Mar 2012 13:30:41 -0600 +Subject: [PATCH] stdio: don't assume gets any more + +Gnulib intentionally does not have a gets module, and now that C11 +and glibc have dropped it, we should be more proactive about warning +any user on a platform that still has a declaration of this dangerous +interface. + +--- a/lib/stdio.in.h ++++ b/lib/stdio.in.h +@@ -125,7 +125,6 @@ + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets +-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ -- GitLab From 51a6b27cc7bd70819927337e0b5505b446ad19b3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:30:19 -0400 Subject: [PATCH 0541/5607] gzip: Update to 1.5 This fixes the gets() problem in gzip. Also disabled "make check" because it depends on Perl and more/less, which is undesirable in the stdenv bootstrap. --- pkgs/tools/compression/gzip/default.nix | 22 ++++------------ .../compression/gzip/gets-undeclared.patch | 26 ------------------- 2 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 pkgs/tools/compression/gzip/gets-undeclared.patch diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index e1d6d75da51..d15b26f48b6 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,15 +1,13 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation (rec { - name = "gzip-1.4"; +stdenv.mkDerivation rec { + name = "gzip-1.5"; src = fetchurl { - url = "mirror://gnu/gzip/${name}.tar.gz"; - sha256 = "1vhiyzls60fws48scw48wvwn8mpv1f4yhcsnafys239qvb9wyrni"; + url = "mirror://gnu/gzip/${name}.tar.xz"; + sha256 = "0wx1nqk709kx75cwp2axachnbxryp4gyl06qxn5nl95184w0mhls"; }; - doCheck = true; - meta = { homepage = http://www.gnu.org/software/gzip/; description = "Gzip, the GNU zip compression program"; @@ -31,13 +29,3 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } - -// - -{ - crossAttrs = - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ./gets-undeclared.patch ]; - }); -}) diff --git a/pkgs/tools/compression/gzip/gets-undeclared.patch b/pkgs/tools/compression/gzip/gets-undeclared.patch deleted file mode 100644 index a09f59b122a..00000000000 --- a/pkgs/tools/compression/gzip/gets-undeclared.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - -This is a backport of this patch: - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - ---- gzip/lib/stdio.in.h 2012-07-02 14:28:45.000000000 +0200 -+++ gzip/lib/stdio.in.h 2012-07-02 14:28:50.000000000 +0200 -@@ -160,12 +160,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not - "use gnulib module fflush for portable POSIX compliance"); - #endif - --/* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ --#undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -- - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -- GitLab From 6d3ce2e3478438feb06a35d0be4bf583935fed4b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:48:01 -0400 Subject: [PATCH 0542/5607] ed: Update to 1.6 --- pkgs/applications/editors/ed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 1b3e4e27f5b..aa1a5b91a82 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ed-1.5"; + name = "ed-1.6"; src = fetchurl { url = "mirror://gnu/ed/${name}.tar.gz"; - sha256 = "18gvhyhwpabmgv4lh21lg8vl3z7acdyhh2mr2kj9g75wksj39pcp"; + sha256 = "0rcay0wci2kiwil2h505b674cblmn4nq8pqw9g9pgqmaqjq6f711"; }; doCheck = true; -- GitLab From 37b44ed6902b5ae3c6a50ec11b87764045004dc7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:48:31 -0400 Subject: [PATCH 0543/5607] patch: Update to 2.7 --- pkgs/tools/text/gnupatch/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index a7a166c95c3..0495134d112 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, ed }: -stdenv.mkDerivation (rec { - name = "patch-2.6.1"; +stdenv.mkDerivation rec { + name = "patch-2.7"; src = fetchurl { url = "mirror://gnu/patch/${name}.tar.gz"; - sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni"; + sha256 = "0j10lq37ywcc4qiakan6wpm00abfrnnccq3ags129ad0z9b9zhjr"; }; - buildInputs = (stdenv.lib.optional doCheck ed); + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; + + buildInputs = stdenv.lib.optional doCheck ed; crossAttrs = { configureFlags = [ "ac_cv_func_strnlen_working=yes" ]; @@ -33,9 +35,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - -// - -(stdenv.lib.optionalAttrs stdenv.isDarwin { - patches = [ ./darwin-fix.patch ]; -})) -- GitLab From db5c495d9897f56f8fa5ad0ec8d0cd794de664b9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:48:48 -0400 Subject: [PATCH 0544/5607] coreutils: Update to 8.19 --- pkgs/tools/misc/coreutils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9d9ea52f3f5..0fc04d567fd 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -4,14 +4,14 @@ }: assert aclSupport -> acl != null; -assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) ); +assert selinuxSupport -> libselinux != null && libsepol != null; stdenv.mkDerivation rec { - name = "coreutils-8.15"; + name = "coreutils-8.19"; src = fetchurl { url = "mirror://gnu/coreutils/${name}.tar.xz"; - sha256 = "176lgw810xw84c6fz5xwhydxggkndmzggl0pxqzldbjf85vv6zl3"; + sha256 = "1rx9x3fp848w4nny7irdkcpkan9fcx24d99v5dkwgkyq7wc76f5d"; }; buildNativeInputs = [ perl ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. - doCheck = (stdenv ? glibc); + doCheck = stdenv ? glibc; enableParallelBuilding = true; -- GitLab From 23deea257d6faab404836ae239c216ccc5a5d2cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:49:03 -0400 Subject: [PATCH 0545/5607] gnugrep: Update to 2.14 --- pkgs/tools/text/gnugrep/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 8368edef656..98a737339d2 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, pcre, libiconv ? null }: -let version = "2.10"; in +let version = "2.14"; in -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc"; + sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7"; }; buildInputs = [ pcre ] - ++ (stdenv.lib.optional (libiconv != null) libiconv); + ++ stdenv.lib.optional (libiconv != null) libiconv; - doCheck = if stdenv.isDarwin then false else true; + NIX_LDFLAGS = stdenv.lib.optionalString (libiconv != null) "-L${libiconv}/lib -liconv"; + + doCheck = !stdenv.isDarwin; # On Mac OS X, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken. @@ -38,4 +40,4 @@ stdenv.mkDerivation ({ }; passthru = {inherit pcre;}; -} // (if libiconv != null then { NIX_LDFLAGS="-L${libiconv}/lib -liconv"; } else {}) ) +} -- GitLab From 80be1c60d5b3691ba2fdb97e8aaf82d3282cdc3a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:50:35 -0400 Subject: [PATCH 0546/5607] gawk: Update to 4.0.1 --- pkgs/tools/text/gawk/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index bb6e4e20d24..401f5e80768 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, libsigsegv }: -stdenv.mkDerivation (rec { - name = "gawk-4.0.0"; +stdenv.mkDerivation rec { + name = "gawk-4.0.1"; src = fetchurl { - url = "mirror://gnu/gawk/${name}.tar.bz2"; - sha256 = "0sss7rhpvizi2a88h6giv0i7w5h07s2fxkw3s6n1hqvcnhrfgbb0"; + url = "mirror://gnu/gawk/${name}.tar.xz"; + sha256 = "0iyb5qpj27qwa4h3617ymjhbc7vxvb82dlgw2vrnss40mjhbj35f"; }; - doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 + patches = stdenv.lib.optional stdenv.isCygwin [ ./cygwin-identifiers.patch ]; + + doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1 buildInputs = [ libsigsegv ]; @@ -37,9 +39,3 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; }; } - -// - -stdenv.lib.optionalAttrs stdenv.isCygwin { - patches = [ ./cygwin-identifiers.patch ]; -}) -- GitLab From a893399776f49f6bbfa425d5ce3d5b54efbe635c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:51:15 -0400 Subject: [PATCH 0547/5607] Fix more gets() problems --- pkgs/tools/archivers/gnutar/default.nix | 23 +++++++---------------- pkgs/tools/text/diffutils/default.nix | 22 +++++++--------------- 2 files changed, 14 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 4ef973bd56a..51d5d35fe80 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "gnutar-1.26"; src = fetchurl { @@ -8,6 +8,12 @@ stdenv.mkDerivation (rec { sha256 = "0hbdkzmchq9ycr2x1pxqdcgdbaxksh8c6ac0jf75jajhcks6jlss"; }; + patches = [ ./gets-undeclared.patch ]; + + # May have some issues with root compilation because the bootstrap tool + # cannot be used as a login shell for now. + FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux") "1"; + meta = { homepage = http://www.gnu.org/software/tar/; description = "GNU implementation of the `tar' archiver"; @@ -33,18 +39,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - # May have some issues with root compilation because the bootstrap tool - # cannot be used as a login shell for now. -// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") { - FORCE_UNSAFE_CONFIGURE = 1; -} - -// - -{ - crossAttrs = - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ./gets-undeclared.patch ]; - }); -}) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 086a44675a9..18c97e92ac7 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,28 +1,20 @@ -{stdenv, fetchurl, coreutils ? null}: +{ stdenv, fetchurl, coreutils ? null }: -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "diffutils-3.2"; - + src = fetchurl { url = mirror://gnu/diffutils/diffutils-3.2.tar.gz; sha256 = "1lsf0ln0h3mnm2y0mwgrfk0lyfi7bnm4r886acvdrrsvc7pypaia"; }; - + + patches = [ ../../misc/coreutils/gets-undeclared.patch ]; + /* If no explicit coreutils is given, use the one from stdenv. */ - buildNativeInputs = [coreutils]; + buildNativeInputs = [ coreutils ]; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; description = "Commands for showing the differences between files (diff, cmp, etc.)"; }; } - -// - -{ - crossAttrs = - # XXX: Temporary workaround to allow GNU/Hurd builds with newer libcs. - (stdenv.lib.optionalAttrs (stdenv.cross.config == "i586-pc-gnu") { - patches = [ ../../misc/coreutils/gets-undeclared.patch ]; - }); -}) -- GitLab From 68da39a63f6f26137f6db47ab4b9e6620f62380a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:52:41 -0400 Subject: [PATCH 0548/5607] xz: Update to 5.0.4 --- pkgs/tools/compression/xz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 78a8ed95a4e..6b74ba41eca 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xz-5.0.3"; + name = "xz-5.0.4"; src = fetchurl { url = "http://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1sgaq4gdh8llz3gnlgvd65x610fwc8h4m32skhqn5npwgghvj4as"; + sha256 = "14nf55b47335aakswqk0kqv1qsh4269rnb757dmkkbd1sdhb1naw"; }; doCheck = true; -- GitLab From 9b0ed02f9be2bc0b08c56ab71da90fa784a15a44 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 14:59:26 -0400 Subject: [PATCH 0549/5607] Remove Glibc 2.14 --- .../libraries/glibc/2.14/builder.sh | 54 ----- .../libraries/glibc/2.14/common.nix | 223 ------------------ .../libraries/glibc/2.14/default.nix | 97 -------- .../2.14/dont_use_system_ld_so_cache.patch | 43 ---- .../glibc/2.14/glibc-elf-localscope.patch | 82 ------- .../development/libraries/glibc/2.14/info.nix | 26 -- .../libraries/glibc/2.14/locales-builder.sh | 17 -- .../libraries/glibc/2.14/locales.nix | 47 ---- .../glibc/2.14/nix-locale-archive.patch | 116 --------- .../glibc/2.14/nss-skip-unavail.patch | 21 -- .../libraries/glibc/2.14/rpcgen-path.patch | 72 ------ pkgs/top-level/all-packages.nix | 21 -- 12 files changed, 819 deletions(-) delete mode 100644 pkgs/development/libraries/glibc/2.14/builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.14/common.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/default.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/info.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/locales-builder.sh delete mode 100644 pkgs/development/libraries/glibc/2.14/locales.nix delete mode 100644 pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch delete mode 100644 pkgs/development/libraries/glibc/2.14/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc/2.14/builder.sh b/pkgs/development/libraries/glibc/2.14/builder.sh deleted file mode 100644 index e68e13f9bec..00000000000 --- a/pkgs/development/libraries/glibc/2.14/builder.sh +++ /dev/null @@ -1,54 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - - -postInstall() { - if test -n "$installLocales"; then - make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales - fi - - test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache - - # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been - # renamed. - if test -z "$hurdHeaders"; then - # Include the Linux kernel headers in Glibc, except the `scsi' - # subdirectory, which Glibc provides itself. - (cd $out/include && \ - ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) - fi - - if test -f "$out/lib/libhurduser.so"; then - # libc.so, libhurduser.so, and libmachuser.so depend on each - # other, so add them to libc.so (a RUNPATH on libc.so.0.3 - # would be ignored by the cross-linker.) - echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." - sed -i "$out/lib/libc.so" \ - -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" - fi - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi - - # This file, that should not remain in the glibc derivation, - # may have not been created during the preInstall - rm -f $out/lib/libgcc_s.so.1 -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix deleted file mode 100644 index ab3ef7c42f4..00000000000 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ /dev/null @@ -1,223 +0,0 @@ -/* Build configuration used to build glibc, Info files, and locale - information. */ - -cross : - -{ name, fetchurl, stdenv, installLocales ? false -, gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null -, mig ? null, fetchgit ? null -, profilingLibraries ? false, meta -, preConfigure ? "", ... }@args : - -let - # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20111025" else "2.14.1"; - - needsPortsNative = stdenv.isMips || stdenv.isArm; - needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; - needsPorts = if (stdenv ? cross) && stdenv.cross != null then true - else if cross == null then needsPortsNative - else needsPortsCross; - - srcPorts = fetchurl { - url = "mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2"; - sha256 = "1acs4sd5mjzmssmd0md6dfqwnziph2am7v09mbnnd8aadpxhm0qw"; - }; - -in - -assert (cross != null) -> (gccCross != null); - -assert (mig != null) -> (machHeaders != null); -assert (machHeaders != null) -> (hurdHeaders != null); -assert (hurdHeaders != null) -> (libpthreadHeaders != null); -assert (hurdHeaders != null) -> (fetchgit != null); - -stdenv.mkDerivation ({ - inherit kernelHeaders installLocales; - - # The host/target system. - crossConfig = if (cross != null) then cross.config else null; - - inherit (stdenv) is64bit; - - enableParallelBuilding = true; - - patches = - stdenv.lib.optional (fetchgit == null) - /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - ++ [ - /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch - - /* Allow nixos and nix handle the locale-archive. */ - ./nix-locale-archive.patch - - /* don't use /etc/ld.so.cache, for non-nixos systems */ - ./dont_use_system_ld_so_cache.patch - - /* Without this patch many KDE binaries crash. */ - ./glibc-elf-localscope.patch - ]; - - postPatch = '' - # Needed for glibc to build with the gnumake 3.82 - # http://comments.gmane.org/gmane.linux.lfs.support/31227 - sed -i 's/ot \$/ot:\n\ttouch $@\n$/' manual/Makefile - - # nscd needs libgcc, and we don't want it dynamically linked - # because we don't want it to depend on bootstrap-tools libs. - echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile - ''; - - configureFlags = [ - "-C" - "--enable-add-ons" - "--sysconfdir=/etc" - "--localedir=/var/run/current-system/sw/lib/locale" - "libc_cv_ssp=no" - (if kernelHeaders != null - then "--with-headers=${kernelHeaders}/include" - else "--without-headers") - (if profilingLibraries - then "--enable-profile" - else "--disable-profile") - ] ++ stdenv.lib.optionals (cross != null) [ - (if cross.withTLS then "--with-tls" else "--without-tls") - (if cross.float == "soft" then "--without-fp" else "--with-fp") - "--enable-kernel=2.6.0" - "--with-__thread" - ] ++ stdenv.lib.optionals stdenv.isArm [ - "--host=arm-linux-gnueabi" - "--build=arm-linux-gnueabi" - "--without-fp" - - # To avoid linking with -lgcc_s (dynamic link) - # so the glibc does not depend on its compiler store path - "libc_cv_as_needed=no" - ]; - - installFlags = [ "sysconfdir=$(out)/etc" ]; - - buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] - ++ stdenv.lib.optional (mig != null) mig; - - # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to - # prevent a retained dependency on the bootstrap tools in the stdenv-linux - # bootstrap. - BASH_SHELL = "/bin/sh"; - - # Workaround for this bug: - # http://sourceware.org/bugzilla/show_bug.cgi?id=411 - # I.e. when gcc is compiled with --with-arch=i686, then the - # preprocessor symbol `__i686' will be defined to `1'. This causes - # the symbol __i686.get_pc_thunk.dx to be mangled. - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"; -} - -# Remove the `gccCross' attribute so that the *native* glibc store path -# doesn't depend on whether `gccCross' is null or not. -// (removeAttrs args [ "gccCross" ]) // - -{ - name = name + "-${version}" + - stdenv.lib.optionalString (cross != null) "-${cross.config}"; - - src = - if hurdHeaders != null - then fetchgit { - # Shamefully the "official" glibc won't build on GNU, so use the one - # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. - # See . - url = "git://git.sv.gnu.org/hurd/glibc.git"; - sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca"; - rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793"; - } - else fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "0fsvf5d6sib483rp7asdy8hs0dysxqkrvw316c82hsxy7vxa51bf"; - }; - - # `fetchurl' is a function and thus should not be passed to the - # `derivation' primitive. - fetchurl = null; - - # Remove absolute paths from `configure' & co.; build out-of-tree. - preConfigure = '' - export PWD_P=$(type -tP pwd) - for i in configure io/ftwtest-sh; do - # Can't use substituteInPlace here because replace hasn't been - # built yet in the bootstrap. - sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" - done - - ${if needsPorts then "tar xvf ${srcPorts}" else ""} - - mkdir ../build - cd ../build - - configureScript="`pwd`/../$sourceRoot/configure" - - ${preConfigure} - ''; - - meta = { - homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; - - longDescription = - '' Any Unix-like operating system needs a C library: the library which - defines the "system calls" and other basic facilities such as - open, malloc, printf, exit... - - The GNU C library is used as the C library in the GNU system and - most systems with the Linux kernel. - ''; - - license = "LGPLv2+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - #platforms = stdenv.lib.platforms.linux; - } // meta; -} - -// - -(if hurdHeaders != null - then { - # Work around the fact that the configure snippet that looks for - # does not honor `--with-headers=$sysheaders' and that - # glibc expects Mach, Hurd, and pthread headers to be in the same place. - CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include"; - - # `fetchgit' is a function and thus should not be passed to the - # `derivation' primitive. - fetchgit = null; - - # Install NSS stuff in the right place. - # XXX: This will be needed for all new glibcs and isn't Hurd-specific. - makeFlags = ''vardbdir="$out/var/db"''; - } - else { })) diff --git a/pkgs/development/libraries/glibc/2.14/default.nix b/pkgs/development/libraries/glibc/2.14/default.nix deleted file mode 100644 index 1b4e43b1013..00000000000 --- a/pkgs/development/libraries/glibc/2.14/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null -, mig ? null, fetchgit ? null -, installLocales ? true -, profilingLibraries ? false -, gccCross ? null -, debugSymbols ? false -}: - -assert stdenv.gcc.gcc != null; - -let - build = import ./common.nix; - cross = if gccCross != null then gccCross.target else null; -in - build cross ({ - name = "glibc${if debugSymbols then "-debug" else ""}"; - - inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries - gccCross; - - builder = ./builder.sh; - - # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for - # any program we run, because the gcc will have been placed at a new - # store path than that determined when built (as a source for the - # bootstrap-tools tarball) - # Building from a proper gcc staying in the path where it was installed, - # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without - # any special hack. - preInstall = '' - if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - mkdir -p $out/lib - ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 - fi - ''; - - meta.description = "The GNU C Library"; - } - - // - - (if debugSymbols - then { - # Build with debugging symbols, but leave optimizations on and don't - # attempt to keep the build tree. - dontStrip = true; - dontCrossStrip = true; - NIX_STRIP_DEBUG = 0; - } - else {}) - - // - - (if hurdHeaders != null - then rec { - inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit; - - propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ]; - - passthru = { - # When building GCC itself `propagatedBuildInputs' above is not - # honored, so we pass it here so that the GCC builder can do the right - # thing. - inherit propagatedBuildInputs; - }; - } - else { }) - - // - - (if cross != null - then { - preConfigure = '' - sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig" - - cat > config.cache << "EOF" - libc_cv_forced_unwind=yes - libc_cv_c_cleanup=yes - libc_cv_gnu89_inline=yes - # Only due to a problem in gcc configure scripts: - libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} - EOF - export BUILD_CC=gcc - export CC="$crossConfig-gcc" - export AR="$crossConfig-ar" - export RANLIB="$crossConfig-ranlib" - - dontStrip=1 - ''; - - # To avoid a dependency on the build system 'bash'. - preFixup = '' - rm $out/bin/{ldd,tzselect,catchsegv,xtrace} - ''; - } - else {})) diff --git a/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch b/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch deleted file mode 100644 index 444eb8251e4..00000000000 --- a/pkgs/development/libraries/glibc/2.14/dont_use_system_ld_so_cache.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Naur glibc-2.13-orig/elf/ldconfig.c glibc-2.13/elf/ldconfig.c ---- glibc-2.13-orig/elf/ldconfig.c 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/elf/ldconfig.c 2012-04-10 23:28:45.957492340 -0400 -@@ -51,7 +51,7 @@ - #endif - - #ifndef LD_SO_CONF --# define LD_SO_CONF SYSCONFDIR "/ld.so.conf" -+# define LD_SO_CONF PREFIX "/etc/ld.so.conf" - #endif - - /* Get libc version number. */ -diff -Naur glibc-2.13-orig/elf/Makefile glibc-2.13/elf/Makefile ---- glibc-2.13-orig/elf/Makefile 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/elf/Makefile 2012-04-10 23:27:05.666477442 -0400 -@@ -459,11 +459,11 @@ - $(objpfx)sprof: $(libdl) - - $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) --SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' --CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ -+PREFIX-FLAGS := -D'PREFIX="$(prefix)"' -+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 --CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) --CFLAGS-cache.c = $(SYSCONF-FLAGS) -+CFLAGS-dl-cache.c = $(PREFIX-FLAGS) -+CFLAGS-cache.c = $(PREFIX-FLAGS) - - CPPFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),-DNOT_IN_libc=1 -DIS_IN_rtld=1) - -diff -Naur glibc-2.13-orig/sysdeps/generic/dl-cache.h glibc-2.13/sysdeps/generic/dl-cache.h ---- glibc-2.13-orig/sysdeps/generic/dl-cache.h 2011-01-17 23:34:07.000000000 -0500 -+++ glibc-2.13/sysdeps/generic/dl-cache.h 2012-04-10 23:28:20.077488815 -0400 -@@ -29,7 +29,7 @@ - #endif - - #ifndef LD_SO_CACHE --# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache" -+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache" - #endif - - #ifndef add_system_dir diff --git a/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch deleted file mode 100644 index 98f7f81087b..00000000000 --- a/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -ru a/elf/dl-close.c b/elf/dl-close.c ---- a/elf/dl-close.c 2011-02-04 00:35:03.000000000 +0100 -+++ b/elf/dl-close.c 2011-02-22 02:16:12.367883000 +0100 -@@ -180,24 +186,28 @@ - /* Signal the object is still needed. */ - l->l_idx = IDX_STILL_USED; - -+#define mark_used(dmap) \ -+ do { \ -+ if ((dmap)->l_idx != IDX_STILL_USED) \ -+ { \ -+ assert ((dmap)->l_idx >= 0 && (dmap)->l_idx < nloaded); \ -+ \ -+ if (!used[(dmap)->l_idx]) \ -+ { \ -+ used[(dmap)->l_idx] = 1; \ -+ if ((dmap)->l_idx - 1 < done_index) \ -+ done_index = (dmap)->l_idx - 1; \ -+ } \ -+ } \ -+ } while (0) -+ - /* Mark all dependencies as used. */ - if (l->l_initfini != NULL) - { - struct link_map **lp = &l->l_initfini[1]; - while (*lp != NULL) - { -- if ((*lp)->l_idx != IDX_STILL_USED) -- { -- assert ((*lp)->l_idx >= 0 && (*lp)->l_idx < nloaded); -- -- if (!used[(*lp)->l_idx]) -- { -- used[(*lp)->l_idx] = 1; -- if ((*lp)->l_idx - 1 < done_index) -- done_index = (*lp)->l_idx - 1; -- } -- } -- -+ mark_used(*lp); - ++lp; - } - } -@@ -206,19 +216,25 @@ - for (unsigned int j = 0; j < l->l_reldeps->act; ++j) - { - struct link_map *jmap = l->l_reldeps->list[j]; -- -- if (jmap->l_idx != IDX_STILL_USED) -- { -- assert (jmap->l_idx >= 0 && jmap->l_idx < nloaded); -- -- if (!used[jmap->l_idx]) -- { -- used[jmap->l_idx] = 1; -- if (jmap->l_idx - 1 < done_index) -- done_index = jmap->l_idx - 1; -- } -- } -+ mark_used(jmap); - } -+ /* And the same for owners of our scopes; normally, our last -+ scope provider would render us unused, but this can be -+ prevented by the NODELETE flag. */ -+ if (__builtin_expect(l->l_type == lt_loaded -+ && (l->l_flags_1 & DF_1_NODELETE), 0)) -+ for (size_t cnt = 0; l->l_scope[cnt] != NULL; ++cnt) -+ /* This relies on l_scope[] entries being always set either -+ to its own l_symbolic_searchlist address, or some map's -+ l_searchlist address. */ -+ if (l->l_scope[cnt] != &l->l_symbolic_searchlist) -+ { -+ struct link_map *ls = (struct link_map *) -+ ((char *) l->l_scope[cnt] -+ - offsetof (struct link_map, l_searchlist)); -+ assert (ls->l_ns == nsid); -+ mark_used(ls); -+ } - } - - /* Sort the entries. */ diff --git a/pkgs/development/libraries/glibc/2.14/info.nix b/pkgs/development/libraries/glibc/2.14/info.nix deleted file mode 100644 index 75bd996d9bc..00000000000 --- a/pkgs/development/libraries/glibc/2.14/info.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, texinfo, perl }: - -let build = import ./common.nix; -in - /* null cross builder */ - build null { - name = "glibc-info"; - - inherit fetchurl stdenv; - - configureFlags = [ "--enable-add-ons" ]; - - buildInputs = [ texinfo perl ]; - - buildPhase = "make info"; - - # I don't know why the info is not generated in 'build' - # Somehow building the info still does not work, because the final - # libc.info hasn't a Top node. - installPhase = '' - mkdir -p "$out/share/info" - cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" - ''; - - meta.description = "GNU Info manual of the GNU C Library"; - } diff --git a/pkgs/development/libraries/glibc/2.14/locales-builder.sh b/pkgs/development/libraries/glibc/2.14/locales-builder.sh deleted file mode 100644 index d732e208fa2..00000000000 --- a/pkgs/development/libraries/glibc/2.14/locales-builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Glibc cannot have itself in its RPATH. -export NIX_NO_SELF_RPATH=1 - -source $stdenv/setup - -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= - - export NIX_DONT_SET_RPATH=1 - unset CFLAGS -} - -genericBuild diff --git a/pkgs/development/libraries/glibc/2.14/locales.nix b/pkgs/development/libraries/glibc/2.14/locales.nix deleted file mode 100644 index b7eae50ca38..00000000000 --- a/pkgs/development/libraries/glibc/2.14/locales.nix +++ /dev/null @@ -1,47 +0,0 @@ -/* This function builds just the `lib/locale/locale-archive' file from - Glibc and nothing else. If `allLocales' is true, all supported - locales are included; otherwise, just the locales listed in - `locales'. See localedata/SUPPORTED in the Glibc source tree for - the list of all supported locales: - http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc -*/ - -{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: - -let build = import ./common.nix; -in - build null { - name = "glibc-locales"; - - inherit fetchurl stdenv; - installLocales = true; - - builder = ./locales-builder.sh; - - # Awful hack: `localedef' doesn't allow the path to `locale-archive' - # to be overriden, but you *can* specify a prefix, i.e. it will use - # //lib/locale/locale-archive. So we use - # $TMPDIR as a prefix, meaning that the locale-archive is placed in - # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive. - buildPhase = - '' - mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" - - # Hack to allow building of the locales (needed since glibc-2.12) - sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ - /library-path/d ../glibc-2*/localedata/Makefile - ${if allLocales then "" else - "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} - - make localedata/install-locales \ - localedir=$out/lib/locale \ - ''; - - installPhase = - '' - mkdir -p "$out/lib/locale" - cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" - ''; - - meta.description = "Locale information for the GNU C Library"; - } diff --git a/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch deleted file mode 100644 index aca904f7ff4..00000000000 --- a/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index d545f17..0d8638a 100644 ---- a/locale/loadarchive.c -+++ b/locale/loadarchive.c -@@ -124,6 +124,25 @@ calculate_head_size (const struct locarhead *h) - } - - -+static int -+open_locale_archive () -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ const char *usualpath = "/usr/lib/locale/locale-archive"; -+ if (path) -+ fd = open_not_cancel_2 (path, O_RDONLY|O_LARGEFILE); -+ if (path2 && fd < 0) -+ fd = open_not_cancel_2 (path2, O_RDONLY|O_LARGEFILE); -+ if (fd < 0) -+ fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ if (fd < 0) -+ fd = open_not_cancel_2 (usualpath, O_RDONLY|O_LARGEFILE); -+ return fd; -+} -+ -+ - /* Find the locale *NAMEP in the locale archive, and return the - internalized data structure for its CATEGORY data. If this locale has - already been loaded from the archive, just returns the existing data -@@ -203,7 +222,7 @@ _nl_load_locale_from_archive (int category, const char **namep) - archmapped = &headmap; - - /* The archive has never been opened. */ -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ fd = open_locale_archive (); - if (fd < 0) - /* Cannot open the archive, for whatever reason. */ - return NULL; -@@ -394,7 +413,7 @@ _nl_load_locale_from_archive (int category, const char **namep) - if (fd == -1) - { - struct stat64 st; -- fd = open_not_cancel_2 (archfname, O_RDONLY|O_LARGEFILE); -+ fd = open_locale_archive (); - if (fd == -1) - /* Cannot open the archive, for whatever reason. */ - return NULL; -diff --git a/locale/programs/locale.c b/locale/programs/locale.c -index 77262b7..fddc00d 100644 ---- a/locale/programs/locale.c -+++ b/locale/programs/locale.c -@@ -628,6 +628,20 @@ nameentcmp (const void *a, const void *b) - ((const struct nameent *) b)->name); - } - -+static int -+open_nix_locale_archive (const char * fname, int access) -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); -+ if (fd < 0) -+ fd = open64 (fname, access); -+ return fd; -+} - - static int - write_archive_locales (void **all_datap, char *linebuf) -@@ -641,7 +658,7 @@ write_archive_locales (void **all_datap, char *linebuf) - int fd, ret = 0; - uint32_t cnt; - -- fd = open64 (ARCHIVE_NAME, O_RDONLY); -+ fd = open_nix_locale_archive (ARCHIVE_NAME, O_RDONLY); - if (fd < 0) - return 0; - -diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c -index 85ba77d..3ad2af8 100644 ---- a/locale/programs/locarchive.c -+++ b/locale/programs/locarchive.c -@@ -512,6 +512,20 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) - *ah = new_ah; - } - -+static int -+open_nix_locale_archive (const char * fname, int access) -+{ -+ int fd = -1; -+ char *path = getenv ("LOCALE_ARCHIVE_2_11"); -+ char *path2 = getenv ("LOCALE_ARCHIVE"); -+ if (path) -+ fd = open64 (path, access); -+ if (path2 && fd < 0) -+ fd = open64 (path2, access); -+ if (fd < 0) -+ fd = open64 (fname, access); -+ return fd; -+} - - void - open_archive (struct locarhandle *ah, bool readonly) -@@ -531,7 +548,7 @@ open_archive (struct locarhandle *ah, bool readonly) - while (1) - { - /* Open the archive. We must have exclusive write access. */ -- fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR); -+ fd = open_nix_locale_archive (archivefname, readonly ? O_RDONLY : O_RDWR); - if (fd == -1) - { - /* Maybe the file does not yet exist. */ diff --git a/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch deleted file mode 100644 index e48dc2bc0a6..00000000000 --- a/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c ---- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200 -+++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200 -@@ -505,8 +505,6 @@ - int no_data = 0; - int no_inet6_data = 0; - service_user *nip = NULL; -- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -- enum nss_status status = NSS_STATUS_UNAVAIL; - int no_more; - int old_res_options; - -@@ -702,6 +700,8 @@ - - while (!no_more) - { -+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; -+ enum nss_status status = NSS_STATUS_UNAVAIL; - no_data = 0; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); diff --git a/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch deleted file mode 100644 index fbb03dd5fad..00000000000 --- a/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch +++ /dev/null @@ -1,72 +0,0 @@ -By default, rpcgen(1) looks for cpp(1) from a list of fixed absolute paths -(`/lib/cpp', etc.), which may only be overrided with the `-Y' option. This -patch makes it run any `cpp' command found in $PATH. - ---- glibc-2.7/sunrpc/rpc_main.c 2006-11-10 21:54:46.000000000 +0100 -+++ glibc-2.7/sunrpc/rpc_main.c 2009-04-22 14:32:10.000000000 +0200 -@@ -79,7 +79,7 @@ static const char *cmdname; - - static const char *svcclosetime = "120"; - static int cppDefined; /* explicit path for C preprocessor */ --static const char *CPP = SUNOS_CPP; -+static const char *CPP = "cpp"; - static const char CPPFLAGS[] = "-C"; - static char *pathbuf; - static int cpp_pid; -@@ -108,7 +108,6 @@ static char *extendfile (const char *fil - static void open_output (const char *infile, const char *outfile); - static void add_warning (void); - static void clear_args (void); --static void find_cpp (void); - static void open_input (const char *infile, const char *define); - static int check_nettype (const char *name, const char *list_to_check[]); - static void c_output (const char *infile, const char *define, -@@ -327,31 +326,6 @@ clear_args (void) - argcount = FIXEDARGS; - } - --/* make sure that a CPP exists */ --static void --find_cpp (void) --{ -- struct stat buf; -- -- if (stat (CPP, &buf) < 0) -- { /* /lib/cpp or explicit cpp does not exist */ -- if (cppDefined) -- { -- fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP); -- crash (); -- } -- else -- { /* try the other one */ -- CPP = SVR4_CPP; -- if (stat (CPP, &buf) < 0) -- { /* can't find any cpp */ -- fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout); -- crash (); -- } -- } -- } --} -- - /* - * Open input file with given define for C-preprocessor - */ -@@ -370,7 +344,6 @@ open_input (const char *infile, const ch - switch (cpp_pid) - { - case 0: -- find_cpp (); - putarg (0, CPP); - putarg (1, CPPFLAGS); - addarg (define); -@@ -380,7 +353,7 @@ open_input (const char *infile, const ch - close (1); - dup2 (pd[1], 1); - close (pd[0]); -- execv (arglist[0], (char **) arglist); -+ execvp (arglist[0], (char **) arglist); - perror ("execv"); - exit (1); - case -1: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da9451b465f..1d0959305c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3608,27 +3608,6 @@ let inherit fetchgit; })); - glibc214 = (callPackage ../development/libraries/glibc/2.14 { - kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; - machHeaders = null; - hurdHeaders = null; - gccCross = null; - }) // (lib.optionalAttrs (crossSystem != null) { hostDrv = glibc214Cross; }); - - glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.14) - (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); - in { - inherit stdenv fetchurl; - gccCross = gccCrossStageStatic; - kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; - installLocales = getConfig [ "glibc" "locales" ] false; - } - // lib.optionalAttrs crossGNU { - inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; - inherit fetchgit; - })); - glibc216 = callPackage ../development/libraries/glibc/2.16 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; -- GitLab From 8ed71a1ee5c6daea50bd05624dc353190890f71f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 15:12:15 -0400 Subject: [PATCH 0550/5607] perl: Add 5.16.1 --- .../interpreters/perl/5.16/default.nix | 63 ++++++++ .../interpreters/perl/5.16/no-libutil.patch | 12 ++ .../interpreters/perl/5.16/no-sys-dirs.patch | 152 ++++++++++++++++++ .../interpreters/perl/5.16/setup-hook.sh | 5 + pkgs/top-level/all-packages.nix | 6 +- 5 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/perl/5.16/default.nix create mode 100644 pkgs/development/interpreters/perl/5.16/no-libutil.patch create mode 100644 pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch create mode 100644 pkgs/development/interpreters/perl/5.16/setup-hook.sh diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix new file mode 100644 index 00000000000..13d2fa5f54b --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl }: + +let + + libc = stdenv.gcc.libc or "/usr"; + +in + +stdenv.mkDerivation rec { + name = "perl-5.16.1"; + + src = fetchurl { + url = "mirror://cpan/src/${name}.tar.gz"; + sha256 = "15qxzba3a50c9nik5ydgyfp62x7h9vxxn12yd1jgl93hb1wj96km"; + }; + + patches = + [ # Do not look in /usr etc. for dependencies. + ./no-sys-dirs.patch + ] + ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch; + + # Build a thread-safe Perl with a dynamic libperls.o. We need the + # "installstyle" option to ensure that modules are put under + # $out/lib/perl5 - this is the general default, but because $out + # contains the string "perl", Configure would select $out/lib. + # Miniperl needs -lm. perl needs -lrt. + configureFlags = + [ "-de" + "-Dcc=gcc" + "-Uinstallusrbinperl" + "-Dinstallstyle=lib/perl5" + "-Duseshrplib" + "-Dlocincpth=${libc}/include" + "-Dloclibpth=${libc}/lib" + ] + ++ stdenv.lib.optional (stdenv ? glibc) "-Dusethreads"; + + configureScript = "${stdenv.shell} ./Configure"; + + dontAddPrefix = true; + + enableParallelBuilding = true; + + preConfigure = + '' + configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" + + ${stdenv.lib.optionalString stdenv.isArm '' + configureFlagsArray=(-Dldflags="-lm -lrt") + ''} + ''; + + preBuild = stdenv.lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + '' + # Make Cwd work on NixOS (where we don't have a /bin/pwd). + substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" + ''; + + setupHook = ./setup-hook.sh; + + passthru.libPrefix = "lib/perl5/site_perl"; +} diff --git a/pkgs/development/interpreters/perl/5.16/no-libutil.patch b/pkgs/development/interpreters/perl/5.16/no-libutil.patch new file mode 100644 index 00000000000..9b749bccf32 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/no-libutil.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure +--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 +@@ -1368,7 +1368,7 @@ + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. + libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" +-libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" ++libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. + glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` diff --git a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch new file mode 100644 index 00000000000..54ffb28e206 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch @@ -0,0 +1,152 @@ +diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure +--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/Configure 2012-01-20 17:05:23.089223129 +0100 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1311,8 +1303,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1328,17 +1319,12 @@ + archobjs='' + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1371,8 +1357,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2380,7 +2364,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth /lib /usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -4785,7 +4768,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8390,13 +8373,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19721,9 +19699,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL +--- perl-5.14.2-orig/ext/Errno/Errno_pm.PL 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/ext/Errno/Errno_pm.PL 2012-01-20 17:02:07.938138311 +0100 +@@ -137,11 +137,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i +- # might be using, say, Intel's icc +- ) { ++ } elsif (0) { + # Some Linuxes have weird errno.hs which generate + # no #file or #line directives + my $linux_errno_h = -e '/usr/include/errno.h' ? +diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh +--- perl-5.14.2-orig/hints/freebsd.sh 2011-09-19 15:18:22.000000000 +0200 ++++ perl-5.14.2/hints/freebsd.sh 2012-01-20 17:10:37.267924044 +0100 +@@ -118,21 +118,21 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' diff --git a/pkgs/development/interpreters/perl/5.16/setup-hook.sh b/pkgs/development/interpreters/perl/5.16/setup-hook.sh new file mode 100644 index 00000000000..6a144a7f780 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.16/setup-hook.sh @@ -0,0 +1,5 @@ +addPerlLibPath () { + addToSearchPath PERL5LIB $1/lib/perl5/site_perl +} + +envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d0959305c1..5d53e35763e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2727,11 +2727,13 @@ let perl510 = callPackage ../development/interpreters/perl/5.10 { }; - perl514 = callPackage ../development/interpreters/perl/5.14 { + perl514 = callPackage ../development/interpreters/perl/5.14 { }; + + perl516 = callPackage ../development/interpreters/perl/5.16 { fetchurl = fetchurlBoot; }; - perl = if system != "i686-cygwin" then perl514 else sysPerl; + perl = if system != "i686-cygwin" then perl516 else sysPerl; php = php5_3; -- GitLab From 2322899a1fa85f6547004b2829af81e7b444f506 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 17:01:08 -0400 Subject: [PATCH 0551/5607] openssh: Update to 6.1p1 --- pkgs/tools/networking/openssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f708ede2f69..c1504697a18 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.0p1"; + name = "openssh-6.1p1"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha1 = "f691e53ef83417031a2854b8b1b661c9c08e4422"; + sha1 = "751c92c912310c3aa9cadc113e14458f843fc7b3"; }; prePatch = stdenv.lib.optionalString hpnSupport -- GitLab From f590586775a47aa7179fe1963db98590643aa0fd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Sep 2012 17:10:36 -0400 Subject: [PATCH 0552/5607] xorg-server: Enable the SECURITY extension This allows "ssh -X" to do the right thing. --- pkgs/servers/x11/xorg/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 46903124568..ad6534b3df5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -168,6 +168,7 @@ in }; xorgserver = attrs: attrs // { + configureFlags = "--enable-xcsecurity"; # enable SECURITY extension patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; buildInputs = attrs.buildInputs ++ [ args.zlib args.udev args.mesa args.dbus.libs -- GitLab From 265a0563fabccebc032c018bdc2fa7f64e216e49 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 18 Sep 2012 23:56:51 +0200 Subject: [PATCH 0553/5607] Apply patch to shadow which allows dots (.) in user names. --- pkgs/os-specific/linux/shadow/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index d401a04e6b9..1055fccd8aa 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -7,6 +7,11 @@ let then glibcCross else assert stdenv ? glibc; stdenv.glibc; + dots_in_usernames = fetchurl { + url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch; + sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; + }; + in stdenv.mkDerivation rec { @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; - patches = [ ./keep-path.patch ]; + patches = [ ./keep-path.patch dots_in_usernames ]; # Assume System V `setpgrp (void)', which is the default on GNU variants # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) -- GitLab From 7ba33d813e6db4f75696b29315dd44d01b3b7419 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Sep 2012 01:16:01 +0200 Subject: [PATCH 0554/5607] popa3d: add version 1.0.2 --- pkgs/servers/mail/popa3d/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/servers/mail/popa3d/default.nix diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix new file mode 100644 index 00000000000..809f424d665 --- /dev/null +++ b/pkgs/servers/mail/popa3d/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, pkgconfig, openssl, lua5, curl, readline, bison, expat}: + +stdenv.mkDerivation rec { + + name = "popa3d-1.0.2"; + + src = fetchurl { + url = "http://www.openwall.com/popa3d/${name}.tar.gz"; + sha256 = "0zvspgnlrx4jhhkb5b1p280nsf9d558jijgpvwfyvdp4q4v460z7"; + }; + + configurePhase = ''makeFlags="LIBS=-lcrypt PREFIX=$out MANDIR=$out/share/man"''; + + meta = { + homepage = "http://www.openwall.com/popa3d/"; + description = "tiny POP3 daemon with security as the primary goal"; + 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 b00b1de4098..36517d48457 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5334,6 +5334,8 @@ let nginx = callPackage ../servers/http/nginx { }; + popa3d = callPackage ../servers/mail/popa3d { }; + postfix = callPackage ../servers/mail/postfix { }; pulseaudio = callPackage ../servers/pulseaudio { -- GitLab From d23aef54325c094736dc391bdf9fe06260e0c7d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Sep 2012 01:27:00 +0200 Subject: [PATCH 0555/5607] popa3d: customize for use on NixOS --- pkgs/servers/mail/popa3d/default.nix | 8 +++++-- .../mail/popa3d/fix-mail-spool-path.patch | 12 +++++++++++ .../servers/mail/popa3d/use-glibc-crypt.patch | 12 +++++++++++ pkgs/servers/mail/popa3d/use-openssl.patch | 21 +++++++++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/mail/popa3d/fix-mail-spool-path.patch create mode 100644 pkgs/servers/mail/popa3d/use-glibc-crypt.patch create mode 100644 pkgs/servers/mail/popa3d/use-openssl.patch diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 809f424d665..7a5d701ea8c 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, openssl, lua5, curl, readline, bison, expat}: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0zvspgnlrx4jhhkb5b1p280nsf9d558jijgpvwfyvdp4q4v460z7"; }; - configurePhase = ''makeFlags="LIBS=-lcrypt PREFIX=$out MANDIR=$out/share/man"''; + buildInputs = [ openssl ]; + + patches = [ ./fix-mail-spool-path.patch ./use-openssl.patch ./use-glibc-crypt.patch ]; + + configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"''; meta = { homepage = "http://www.openwall.com/popa3d/"; diff --git a/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch b/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch new file mode 100644 index 00000000000..4f440ae5966 --- /dev/null +++ b/pkgs/servers/mail/popa3d/fix-mail-spool-path.patch @@ -0,0 +1,12 @@ +diff -ubr popa3d-1.0.2-orig/params.h popa3d-1.0.2/params.h +--- popa3d-1.0.2-orig/params.h 2012-09-19 01:19:56.698098130 +0200 ++++ popa3d-1.0.2/params.h 2012-09-19 01:21:13.748065132 +0200 +@@ -191,7 +191,7 @@ + * + * #undef this for qmail-style $HOME/Mailbox mailboxes. + */ +-#define MAIL_SPOOL_PATH "/var/mail" ++#define MAIL_SPOOL_PATH "/var/spool/mail" + + #ifndef MAIL_SPOOL_PATH + /* diff --git a/pkgs/servers/mail/popa3d/use-glibc-crypt.patch b/pkgs/servers/mail/popa3d/use-glibc-crypt.patch new file mode 100644 index 00000000000..35843a38bb3 --- /dev/null +++ b/pkgs/servers/mail/popa3d/use-glibc-crypt.patch @@ -0,0 +1,12 @@ +diff -ubr popa3d-1.0.2-orig/Makefile popa3d-1.0.2/Makefile +--- popa3d-1.0.2-orig/Makefile 2012-09-19 01:19:56.698098130 +0200 ++++ popa3d-1.0.2/Makefile 2012-09-19 01:24:33.871750473 +0200 +@@ -9,7 +9,7 @@ + LDFLAGS = -s + LIBS = + # Linux with glibc, FreeBSD, NetBSD +-#LIBS += -lcrypt ++LIBS += -lcrypt + # HP-UX trusted system + #LIBS += -lsec + # Solaris (POP_STANDALONE, POP_VIRTUAL) diff --git a/pkgs/servers/mail/popa3d/use-openssl.patch b/pkgs/servers/mail/popa3d/use-openssl.patch new file mode 100644 index 00000000000..54301dd873b --- /dev/null +++ b/pkgs/servers/mail/popa3d/use-openssl.patch @@ -0,0 +1,21 @@ +diff -ubr popa3d-1.0.2-orig/Makefile popa3d-1.0.2/Makefile +--- popa3d-1.0.2-orig/Makefile 2012-09-19 01:19:56.698098130 +0200 ++++ popa3d-1.0.2/Makefile 2012-09-19 01:23:00.309636423 +0200 +@@ -5,7 +5,7 @@ + INSTALL = install -c + CFLAGS = -Wall -O2 -fomit-frame-pointer + # You may use OpenSSL's MD5 routines instead of the ones supplied here +-#CFLAGS += -DHAVE_OPENSSL ++CFLAGS += -DHAVE_OPENSSL + LDFLAGS = -s + LIBS = + # Linux with glibc, FreeBSD, NetBSD +@@ -21,7 +21,7 @@ + # libwrap may also want this + #LIBS += -lnsl + # OpenSSL (-DHAVE_OPENSSL) +-#LIBS += -lcrypto ++LIBS += -lcrypto + + DESTDIR = + PREFIX = /usr/local -- GitLab From 4f099c9880221812bacf84e1e0248461b67327db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Sep 2012 01:38:07 +0200 Subject: [PATCH 0556/5607] popa3d: enable standalone mode --- pkgs/servers/mail/popa3d/default.nix | 7 ++++++- .../servers/mail/popa3d/enable-standalone-mode.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/mail/popa3d/enable-standalone-mode.patch diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index 7a5d701ea8c..25ac0d5f9e3 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - patches = [ ./fix-mail-spool-path.patch ./use-openssl.patch ./use-glibc-crypt.patch ]; + patches = [ + ./fix-mail-spool-path.patch + ./use-openssl.patch + ./use-glibc-crypt.patch + ./enable-standalone-mode.patch + ]; configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"''; diff --git a/pkgs/servers/mail/popa3d/enable-standalone-mode.patch b/pkgs/servers/mail/popa3d/enable-standalone-mode.patch new file mode 100644 index 00000000000..763ede102f2 --- /dev/null +++ b/pkgs/servers/mail/popa3d/enable-standalone-mode.patch @@ -0,0 +1,12 @@ +diff -ubr popa3d-1.0.2-orig/params.h popa3d-1.0.2/params.h +--- popa3d-1.0.2-orig/params.h 2012-09-19 01:19:56.698098130 +0200 ++++ popa3d-1.0.2/params.h 2012-09-19 01:37:06.749130665 +0200 +@@ -13,7 +13,7 @@ + /* + * Are we going to be a standalone server or start via an inetd clone? + */ +-#define POP_STANDALONE 0 ++#define POP_STANDALONE 1 + + #if POP_STANDALONE + -- GitLab From ef9a15a5a4952e36c111edfba3c6716c43a49090 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 19 Sep 2012 11:48:27 +0200 Subject: [PATCH 0557/5607] fix/update debootstrap (thereby updating fakeroot) fakeroot is used to create devices.tar.gz now (thanks to aszlig) --- pkgs/tools/misc/debootstrap/default.nix | 125 ++++++++++++++---------- pkgs/tools/system/fakeroot/default.nix | 18 +++- 2 files changed, 86 insertions(+), 57 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 33a1fc839ce..39666f46172 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,55 +1,68 @@ -{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }: +{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: let - devices = fetchurl { - url = mirror://gentoo/distfiles/devices.tar.gz; - sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd"; +# USAGE like this: debootstrap sid /tmp/target-chroot-directory + +# There is also cdebootstrap now. Is that easier to maintain? + + makedev = stdenv.mkDerivation { + name = "makedev-for-debootstrap"; + src = fetchurl { + url = http://ftp.de.debian.org/debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz; + sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5"; + }; + patches = [ + (fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz"; + sha256 = "1zbifw2jkq6471fb67y893nq4lq009xbfbi57jbjwxnhqmrppcy9"; + }) + ]; + # TODO install man + installPhase = '' + ensureDir $out/sbin + ls -l + t=$out/sbin/MAKEDEV + cp MAKEDEV $t + chmod +x $t + ''; }; in stdenv.mkDerivation { - name = "debootstrap-1.0.10lenny"; + + name = "debootstrap-1.0.42"; src = fetchurl { - # I'd like to use the source. However it's lacking the lanny script ? - url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb; - sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051"; + # git clone git://git.debian.org/d-i/debootstrap.git + # I'd like to use the source. However it's lacking the lanny script ? (still true?) + url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.42.tar.gz; + sha256 = "0a5azl22wz1q92b2c91zlpz6krd7wqyi63yk87vyczp363ml0nz0"; }; - + # unpackPhase = '' + # dpkg-deb --extract "$src" . + # ''; + buildInputs = [ dpkg gettext gawk perl ]; - unpackPhase = '' - dpkg-deb --extract "$src" . - ''; - buildPhase = ":"; - patches = [ - # replace /usr/* and /sbin/* executables by @executable@ so that they can be replaced by substitute - # Be careful not to replace code being run in the debian chroot ! - ./subst.patch - ]; - - # from deb + # If you have to update the patch for functions a vim regex like this + # can help you identify which lines are used to write scripts on TARGET and + # which should /bin/ paths should be replaced: + # \\|\/bin\/\|^\s*\\|EOF\|END installPhase = '' - cp -r . $out; cd $out - t=bin/debootstrap - mkdir -p bin man/man8 - cat >> $t << EOF - #!/bin/sh - export DEBOOTSTRAP_DIR=$out/usr/share/debootstrap - # mount and other tools must be found in chroot. So add default debain paths! - # TODO only add paths which are required by the scripts! - export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - $out/usr/sbin/debootstrap "\$@" - EOF - chmod +x $t - mv usr/share/man/man8/debootstrap.8.gz man/man8 - set -x - for file in usr/share/debootstrap/functions usr/sbin/debootstrap; do + sed -i \ + -e 's@/usr/bin/id@id@' \ + -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \ + -e 's@/usr/bin/sha@${coreutils}/bin/sha@' \ + -e 's@/bin/sha@${coreutils}/bin/sha@' \ + debootstrap + + + for file in functions debootstrap; do substituteInPlace "$file" \ --subst-var-by gunzip "$(type -p gunzip)" \ --subst-var-by bunzip "$(type -p bunzip)" \ @@ -61,28 +74,36 @@ stdenv.mkDerivation { --subst-var-by uname "$(type -p uname)" \ --subst-var-by wget "${wget}/bin/wget" done - ''; - /* build from source: - installPhase = '' - cp ${devices} devices.tar.gz - mkdir -p $out/{bin,man/man8}; - cp debootstrap.8 $out/man/man8 + sed -i \ - -e 's@-o root@@' \ - -e 's@-g root@@' \ - -e 's@chown@true@' \ - Makefile - make pkgdetails debootstrap-arch - make DESTDIR="''\${out}" install-arch - t=$out/bin/debootstrap - cat >> $t << EOF + -e 's@\@${wget}/bin/wget@' \ + functions + + d=$out/share/debootstrap + ensureDir $out/{share/debootstrap,bin} + + ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV + + cp -r . $d + + cat >> $out/bin/debootstrap << EOF #!/bin/sh - DEBOOTSTRAP_DIR=$out/usr/share/debootstrap $out/usr/sbin/debootstrap "\$@" + export DEBOOTSTRAP_DIR="''${DEBOOTSTRAP_DIR:-$d}" + # mount and other tools must be found in chroot. So add default debain paths! + # TODO only add paths which are required by the scripts! + export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + exec $d/debootstrap "\$@" EOF - chmod +x $t + chmod +x $out/bin/debootstrap + + ensureDir $out/man/man8 + mv debootstrap.8 $out/man/man8 ''; - */ + + passthru = { + inherit makedev; + }; meta = { description = "Tool to create a Debian system in a chroot"; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index d80b35e1a11..1bf18ed867c 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -1,13 +1,21 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, utillinux}: -stdenv.mkDerivation { - name = "fakeroot-1.18.1"; +stdenv.mkDerivation rec { + name = "fakeroot-1.18.4"; src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.18.1.orig.tar.bz2; - sha256 = "0h5jsw715a9hv32cb1m1bajy26l7xxrbgrk6qk1b6m91lxh6rnw9"; + url = https://launchpad.net/ubuntu/+archive/primary/+files/fakeroot_1.18.4.orig.tar.bz2; + sha256 = "18mydrz49n7ic7147pikkpdb96x00s9wisdk6hrc75ll7vx9wd8a"; }; + buildInputs = [ utillinux /* provides getopt */ ]; + + postUnpack = '' + for prog in getopt; do + sed -i "s@getopt@$(type -p getopt)@g" ${name}/scripts/fakeroot.in + done + ''; + meta = { homepage = http://fakeroot.alioth.debian.org/; description = "Give a fake root environment through LD_PRELOAD"; -- GitLab From 267c54921f3a7dae0b3b200ab5c1c0f39001b0d2 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 17 Jul 2012 18:50:21 +0200 Subject: [PATCH 0558/5607] modemmanager: Update to 0.5.4.0 --- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index c9c975d557c..d3198cee32c 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "ModemManager"; - major = "0"; minor = "5"; extension = "xz"; - sha256 = "0zvwrni4l21d856nq28khigrhwgrq5cc7nh45zidwjj8q7bsxiz7"; + major = "0"; minor = "5"; patchlevel = "4.0"; extension = "xz"; + sha256 = "1fdf5d5cc494825afe9f551248e00a2d91e220e88435b47f109ca2a707a40f1f"; }; buildNativeInputs = [ intltool pkgconfig ]; -- GitLab From 99571aa24225767b87bc9321e018e01affd36e60 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 19 Sep 2012 12:45:05 -0400 Subject: [PATCH 0559/5607] Add temp nodePackage --- 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 8bcabbdf595..b5546eae66f 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -895,6 +895,19 @@ let self = { ]; }; + "temp" = self."temp-*"; + + "temp-*" = self.buildNodePackage rec { + name = "temp-0.4.0"; + src = fetchurl { + url = "http://registry.npmjs.org/temp/-/${name}.tgz"; + sha256 = "ca8274250d36d94e670b8773bf062a28bc43eb342ae47ff629fbb627d48d710b"; + }; + deps = [ + + ]; + }; + "timerstub" = self."timerstub-*"; "timerstub-*" = self.buildNodePackage rec { -- GitLab From 0062d0f11d163ca720134f8d5a18bc1696eab1ae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Sep 2012 13:13:11 -0400 Subject: [PATCH 0560/5607] Mark alternative stdenvs as lowPrio --- pkgs/top-level/all-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36517d48457..9649152d7af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -206,8 +206,7 @@ let defaultStdenv = allStdenvs.stdenv // { inherit platform; }; - stdenvCross = makeStdenvCross defaultStdenv crossSystem binutilsCross - gccCrossStageFinal; + stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal); stdenv = if bootStdenv != null then (bootStdenv // {inherit platform;}) else @@ -233,11 +232,11 @@ let # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. - stdenv_32bit = + stdenv_32bit = lowPrio ( if system == "x86_64-linux" then overrideGCC stdenv gcc43_multi else - stdenv; + stdenv); ### BUILD SUPPORT @@ -1821,7 +1820,7 @@ let clang = wrapClang clangUnwrapped; #Use this instead of stdenv to build with clang - clangStdenv = stdenvAdapters.overrideGCC stdenv clang; + clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); clean = callPackage ../development/compilers/clean { }; @@ -2991,7 +2990,7 @@ let # ccacheWrapper = makeOverridable ({ extraConfig ? "" }: wrapGCC (ccache.links extraConfig)) {}; - ccacheStdenv = overrideGCC stdenv ccacheWrapper; + ccacheStdenv = lowPrio (overrideGCC stdenv ccacheWrapper); cgdb = callPackage ../development/tools/misc/cgdb { }; -- GitLab From e6077fbc46561fbe85c40a43b2b0e86e939f984f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Sep 2012 13:56:56 -0400 Subject: [PATCH 0561/5607] Remove getConfig helper function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’ can be written more concisely as ‘config.cabal.libraryProfiling or false’. --- .../applications/editors/vim/configurable.nix | 14 +- pkgs/applications/misc/grass/default.nix | 52 +++--- .../networking/browsers/chromium/default.nix | 85 +++++----- pkgs/build-support/source-from-head-fun.nix | 6 +- pkgs/development/interpreters/octave/hg.nix | 8 +- pkgs/development/interpreters/php/5.2.nix | 34 ++-- pkgs/development/interpreters/php/5.3.nix | 34 ++-- pkgs/development/interpreters/ruby/libs.nix | 4 +- pkgs/games/oilrush/default.nix | 7 +- pkgs/top-level/all-packages.nix | 158 +++++++++--------- pkgs/top-level/haskell-defaults.nix | 6 +- 11 files changed, 202 insertions(+), 206 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7e03fd6b7b3..9e6b700f9ef 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -46,14 +46,14 @@ composableDerivation {} { ; cfg = { - pythonSupport = getConfig [ "vim" "python" ] true; - darwinSupport = getConfig [ "vim" "darwin" ] false; - nlsSupport = getConfig [ "vim" "nls" ] false; - tclSupport = getConfig [ "vim" "tcl" ] false; - multibyteSupport = getConfig [ "vim" "multibyte" ] false; - cscopeSupport = getConfig [ "vim" "cscope" ] false; + pythonSupport = config.vim.python or true; + darwinSupport = config.vim.darwin or false; + nlsSupport = config.vim.nls or false; + tclSupport = config.vim.tcl or false; + multibyteSupport = config.vim.multibyte or false; + cscopeSupport = config.vim.cscope or false; # add .nix filetype detection and minimal syntax highlighting support - ftNixSupport = getConfig [ "vim" "ftNix" ] true; + ftNixSupport = config.vim.ftNix or true; }; #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix index 067e4354573..6abf6da4a69 100644 --- a/pkgs/applications/misc/grass/default.nix +++ b/pkgs/applications/misc/grass/default.nix @@ -1,4 +1,4 @@ -{getConfig, ...}@a: +{ config, ... }@a: # You can set gui by exporting GRASS_GUI=.. # see http://grass.itc.it/gdp/html_grass64/g.gui.html @@ -36,31 +36,31 @@ a.composableDerivation.composableDerivation {} (fix: { ]; cfg = { - _64bitSupport = getConfig ["grass" "64bitSupport"] true; - cursesSupport = getConfig ["grass" "curses"] true; - gdalSupport = getConfig ["grass" "gdal"] true; - pythonSupport = getConfig ["grass" "python"] true; - wxwidgetsSupport = getConfig ["grass" "wxwidgets"] true; - readlineSupport = getConfig ["grass" "readline"] true; - jpegSupport = getConfig ["grass" "jpeg"] true; - tiffSupport = getConfig ["grass" "tiff"] true; - pngSupport = getConfig ["grass" "png"] true; - tcltkSupport = getConfig ["grass" "tcltk"] true; - postgresSupport = getConfig ["grass" "postgres"] true; - mysqlSupport = getConfig ["grass" "mysql"] true; - sqliteSupport = getConfig ["grass" "sqlite"] true; - ffmpegSupport = getConfig ["grass" "ffmpeg"] true; - openglSupport = getConfig ["grass" "opengl"] true; - odbcSupport = getConfig ["grass" "odbc"] false; # fails to find libodbc - why ? - fftwSupport = getConfig ["grass" "fftw"] true; - blasSupport = getConfig ["grass" "blas"] true; - lapackSupport = getConfig ["grass" "lapack"] true; - cairoSupport = getConfig ["grass" "cairo"] true; - motifSupport = getConfig ["grass" "motif"] true; - freetypeSupport = getConfig ["grass" "freetype"] true; - projSupport = getConfig ["grass" "proj"] true; - opendwgSupport = getConfig ["grass" "dwg"] false; - largefileSupport = getConfig ["grass" "largefile"] true; + _64bitSupport = config.grass."64bitSupport" or true; + cursesSupport = config.grass.curses or true; + gdalSupport = config.grass.gdal or true; + pythonSupport = config.grass.python or true; + wxwidgetsSupport = config.grass.wxwidgets or true; + readlineSupport = config.grass.readline or true; + jpegSupport = config.grass.jpeg or true; + tiffSupport = config.grass.tiff or true; + pngSupport = config.grass.png or true; + tcltkSupport = config.grass.tcltk or true; + postgresSupport = config.grass.postgres or true; + mysqlSupport = config.grass.mysql or true; + sqliteSupport = config.grass.sqlite or true; + ffmpegSupport = config.grass.ffmpeg or true; + openglSupport = config.grass.opengl or true; + odbcSupport = config.grass.odbc or false; # fails to find libodbc - why ? + fftwSupport = config.grass.fftw or true; + blasSupport = config.grass.blas or true; + lapackSupport = config.grass.lapack or true; + cairoSupport = config.grass.cairo or true; + motifSupport = config.grass.motif or true; + freetypeSupport = config.grass.freetype or true; + projSupport = config.grass.proj or true; + opendwgSupport = config.grass.dwg or false; + largefileSupport = config.grass.largefile or true; }; # ?? NLS support: no diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7a3c387deda..33f9283b47a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, getConfig, fetchurl, makeWrapper, which +{ stdenv, config, fetchurl, makeWrapper, which # default dependencies , bzip2, flac, speex @@ -22,10 +22,12 @@ , libselinux # config.selinux }: +with stdenv.lib; + let - mkConfigurable = stdenv.lib.mapAttrs (flag: default: getConfig ["chromium" flag] default); + mkConfigurable = mapAttrs (flag: default: attrByPath ["chromium" flag] default config); - config = mkConfigurable { + cfg = mkConfigurable { channel = "stable"; selinux = false; nacl = false; @@ -34,18 +36,19 @@ let gnomeKeyring = false; proprietaryCodecs = true; cups = false; - pulseaudio = getConfig ["pulseaudio"] true; + pulseaudio = config.pulseaudio or true; }; - sourceInfo = builtins.getAttr config.channel (import ./sources.nix); + sourceInfo = builtins.getAttr cfg.channel (import ./sources.nix); - mkGypFlags = with stdenv.lib; let - sanitize = value: - if value == true then "1" - else if value == false then "0" - else "${value}"; - toFlag = key: value: "-D${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + mkGypFlags = + let + sanitize = value: + if value == true then "1" + else if value == false then "0" + else "${value}"; + toFlag = key: value: "-D${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gypFlagsUseSystemLibs = { use_system_bzip2 = true; @@ -56,7 +59,7 @@ let use_system_libpng = true; use_system_libxml = true; use_system_speex = true; - use_system_ssl = config.openssl; + use_system_ssl = cfg.openssl; use_system_stlport = true; use_system_xdg_utils = true; use_system_yasm = true; @@ -78,12 +81,12 @@ let ]; seccompPatch = let - pre22 = stdenv.lib.versionOlder sourceInfo.version "22.0.0.0"; + pre22 = 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"; + below22 = versionOlder sourceInfo.version "22.0.0.0"; patch = fetchurl { name = "revert-r151720"; url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;" @@ -91,7 +94,7 @@ let + "h=0fabb4fda7059a8757422e8a44e70deeab28e698"; sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf"; }; - in stdenv.lib.optional (!below22) patch; + in optional (!below22) patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; @@ -108,28 +111,28 @@ in stdenv.mkDerivation rec { which makeWrapper python perl pkgconfig nspr udev - (if config.openssl then openssl else nss) + (if cfg.openssl then openssl else nss) utillinux alsaLib gcc bison gperf krb5 glib gtk dbus_glib libXScrnSaver libXcursor mesa - ] ++ stdenv.lib.optional config.gnomeKeyring libgnome_keyring - ++ stdenv.lib.optionals config.gnome [ gconf libgcrypt ] - ++ stdenv.lib.optional config.selinux libselinux - ++ stdenv.lib.optional config.cups libgcrypt - ++ stdenv.lib.optional config.pulseaudio pulseaudio; + ] ++ optional cfg.gnomeKeyring libgnome_keyring + ++ optionals cfg.gnome [ gconf libgcrypt ] + ++ optional cfg.selinux libselinux + ++ optional cfg.cups libgcrypt + ++ optional cfg.pulseaudio pulseaudio; - opensslPatches = stdenv.lib.optional config.openssl openssl.patches; + opensslPatches = optional cfg.openssl openssl.patches; prePatch = "patchShebangs ."; - 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 + patches = optional (!cfg.selinux) seccompPatch + ++ optional cfg.cups ./cups_allow_deprecated.patch + ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch ++ maybeRevertZlibChanges; - postPatch = stdenv.lib.optionalString config.openssl '' + postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl ''; @@ -137,21 +140,21 @@ in stdenv.mkDerivation rec { linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; - use_gnome_keyring = config.gnomeKeyring; - use_gconf = config.gnome; - use_gio = config.gnome; - use_pulseaudio = config.pulseaudio; - disable_nacl = !config.nacl; - use_openssl = config.openssl; - selinux = config.selinux; - use_cups = config.cups; - } // stdenv.lib.optionalAttrs config.proprietaryCodecs { + use_gnome_keyring = cfg.gnomeKeyring; + use_gconf = cfg.gnome; + use_gio = cfg.gnome; + use_pulseaudio = cfg.pulseaudio; + disable_nacl = !cfg.nacl; + use_openssl = cfg.openssl; + selinux = cfg.selinux; + use_cups = cfg.cups; + } // optionalAttrs cfg.proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; ffmpeg_branding = "Chrome"; - } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { + } // optionalAttrs (stdenv.system == "x86_64-linux") { target_arch = "x64"; - } // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") { + } // optionalAttrs (stdenv.system == "i686-linux") { target_arch = "ia32"; }); @@ -203,11 +206,11 @@ in stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = { description = "Chromium, an open source web browser"; homepage = http://www.chromium.org/; - maintainers = with stdenv.lib.maintainers; [ goibhniu chaoflow ]; + maintainers = with maintainers; [ goibhniu chaoflow ]; license = licenses.bsd3; - platforms = with stdenv.lib.platforms; linux; + platforms = platforms.linux; }; } diff --git a/pkgs/build-support/source-from-head-fun.nix b/pkgs/build-support/source-from-head-fun.nix index 3281cec5444..c6d6cfcc95b 100644 --- a/pkgs/build-support/source-from-head-fun.nix +++ b/pkgs/build-support/source-from-head-fun.nix @@ -9,8 +9,8 @@ The documentation is availible at http://github.com/MarcWeber/nix-repository-manager/raw/master/README */ -{ getConfig }: +{ config }: localTarName: publishedSrcSnapshot: - if getConfig ["sourceFromHead" "useLocalRepos"] false then - "${getConfig ["sourceFromHead" "managedRepoDir"] "/set/sourceFromHead.managedRepoDir/please"}/dist/${localTarName}" + if config.sourceFromHead.useLocalRepos or false then + "${config.sourceFromHead.managedRepoDir or "/set/sourceFromHead.managedRepoDir/please"}/dist/${localTarName}" else publishedSrcSnapshot diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index a908ddc0fc8..f414dd71965 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, - bison, autoconf, automake, sourceFromHead, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}: + bison, autoconf, automake, sourceFromHead, config, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}: let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texinfo]; in @@ -12,7 +12,7 @@ stdenv.mkDerivation ({ license = "GPL-3"; }; } // ( - if (getConfig ["octave" "devVersion"] false) then { + if (config.octave.devVersion or false) then { name = "octave-hg"; # developement version mercurial repo # REGION AUTO UPDATE: { name="octave"; type = "hg"; url = "http://www.octave.org/hg/octave"; } src = sourceFromHead "octave-03b414516dd8.tar.gz" @@ -27,7 +27,7 @@ stdenv.mkDerivation ({ export HOME=$TMP ''; buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texLive ] - ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ]; + ++ lib.optionals (config.octave.atlas or true) [ python atlas ]; # it does build, but documentation doesn't.. So just remove that directory # from the buildfile buildPhase = '' @@ -44,6 +44,6 @@ stdenv.mkDerivation ({ sha256 = "1lm4v85kdic4n5yxwzrdb0v6dc6nw06ljgx1q8hfkmi146kpg7s6"; }; buildInputs = commonBuildInputs ++ [ flex bison autoconf automake python ] - ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ]; + ++ lib.optionals (config.octave.atlas or true) [ python atlas ]; } )) diff --git a/pkgs/development/interpreters/php/5.2.nix b/pkgs/development/interpreters/php/5.2.nix index f98d178663f..4395c0f498c 100644 --- a/pkgs/development/interpreters/php/5.2.nix +++ b/pkgs/development/interpreters/php/5.2.nix @@ -121,23 +121,23 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { }; cfg = { - mysqlSupport = getConfig ["php" "mysql"] true; - mysqliSupport = getConfig ["php" "mysqli"] true; - pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true; - libxml2Support = getConfig ["php" "libxml2"] true; - apxs2Support = getConfig ["php" "apxs2"] true; - bcmathSupport = getConfig ["php" "bcmath"] true; - socketsSupport = getConfig ["php" "sockets"] true; - curlSupport = getConfig ["php" "curl"] true; - gettextSupport = getConfig ["php" "gettext"] true; - postgresqlSupport = getConfig ["php" "postgresql"] true; - readlineSupport = getConfig ["php" "readline"] true; - sqliteSupport = getConfig ["php" "sqlite"] true; - soapSupport = getConfig ["php" "soap"] true; - zlibSupport = getConfig ["php" "zlib"] true; - opensslSupport = getConfig ["php" "openssl"] true; - mbstringSupport = getConfig ["php" "mbstring"] true; - gdSupport = getConfig ["php" "gd"] true; + mysqlSupport = config.php.mysql or true; + mysqliSupport = config.php.mysqli or true; + pdo_mysqlSupport = config.php.pdo_mysql or true; + libxml2Support = config.php.libxml2 or true; + apxs2Support = config.php.apxs2 or true; + bcmathSupport = config.php.bcmath or true; + socketsSupport = config.php.sockets or true; + curlSupport = config.php.curl or true; + gettextSupport = config.php.gettext or true; + postgresqlSupport = config.php.postgresql or true; + readlineSupport = config.php.readline or true; + sqliteSupport = config.php.sqlite or true; + soapSupport = config.php.soap or true; + zlibSupport = config.php.zlib or true; + opensslSupport = config.php.openssl or true; + mbstringSupport = config.php.mbstring or true; + gdSupport = config.php.gd or true; }; configurePhase = '' diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index b4f00ab1f7d..d4aebc77637 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -121,23 +121,23 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { }; cfg = { - mysqlSupport = getConfig ["php" "mysql"] true; - mysqliSupport = getConfig ["php" "mysqli"] true; - pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true; - libxml2Support = getConfig ["php" "libxml2"] true; - apxs2Support = getConfig ["php" "apxs2"] true; - bcmathSupport = getConfig ["php" "bcmath"] true; - socketsSupport = getConfig ["php" "sockets"] true; - curlSupport = getConfig ["php" "curl"] true; - gettextSupport = getConfig ["php" "gettext"] true; - postgresqlSupport = getConfig ["php" "postgresql"] true; - readlineSupport = getConfig ["php" "readline"] true; - sqliteSupport = getConfig ["php" "sqlite"] true; - soapSupport = getConfig ["php" "soap"] true; - zlibSupport = getConfig ["php" "zlib"] true; - opensslSupport = getConfig ["php" "openssl"] true; - mbstringSupport = getConfig ["php" "mbstring"] true; - gdSupport = getConfig ["php" "gd"] true; + mysqlSupport = config.php.mysql or true; + mysqliSupport = config.php.mysqli or true; + pdo_mysqlSupport = config.php.pdo_mysql or true; + libxml2Support = config.php.libxml2 or true; + apxs2Support = config.php.apxs2 or true; + bcmathSupport = config.php.bcmath or true; + socketsSupport = config.php.sockets or true; + curlSupport = config.php.curl or true; + gettextSupport = config.php.gettext or true; + postgresqlSupport = config.php.postgresql or true; + readlineSupport = config.php.readline or true; + sqliteSupport = config.php.sqlite or true; + soapSupport = config.php.soap or true; + zlibSupport = config.php.zlib or true; + opensslSupport = config.php.openssl or true; + mbstringSupport = config.php.mbstring or true; + gdSupport = config.php.gd or true; }; configurePhase = '' diff --git a/pkgs/development/interpreters/ruby/libs.nix b/pkgs/development/interpreters/ruby/libs.nix index 9aa9203f10f..1b4b7aec2b1 100644 --- a/pkgs/development/interpreters/ruby/libs.nix +++ b/pkgs/development/interpreters/ruby/libs.nix @@ -1,4 +1,4 @@ -{stdenv, getConfig, fetchurl, callPackage}: +{ stdenv, config, fetchurl, callPackage }: let inherit (stdenv.lib) fold optional; @@ -36,7 +36,7 @@ in if builtins.pathExists file then import (builtins.toPath file) else null; in - getConfig [ "gems" name ] fallback; + stdenv.lib.attrByPath [ "gems" name ] fallback config; in { generated = getLocalGemFun "generated"; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 4605f04e3ae..339c3bbd1a8 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,11 +1,12 @@ -{ stdenv, getConfig, fetchurl, libX11, libXext, libXinerama, libXrandr +{ stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr , libXrender, fontconfig, freetype, openal }: + stdenv.mkDerivation { name = "oilrush"; src = let - url = getConfig [ "oilrush" "url" ] null; - sha256 = getConfig [ "oilrush" "sha256" ] null; + url = config.oilrush.url or null; + sha256 = config.oilrush.sha256 or null; in assert url != null && sha256 != null; fetchurl { inherit url sha256; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9649152d7af..0d44816448e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -78,11 +78,7 @@ let # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc) platform = if platform_ != null then platform_ - else getConfig [ "platform" ] (import ./platforms.nix).pc; - - # Return an attribute from the Nixpkgs configuration file, or - # a default value if the attribute doesn't exist. - getConfig = attrPath: default: lib.attrByPath attrPath default config; + else config.platform or (import ./platforms.nix).pc; # Helper functions that are exported through `pkgs'. @@ -101,7 +97,7 @@ let # (un-overriden) set of packages, allowing packageOverrides # attributes to refer to the original attributes (e.g. "foo = # ... pkgs.foo ..."). - pkgs = applyGlobalOverrides (getConfig ["packageOverrides"] (pkgs: {})); + pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {})); # Return the complete set of packages, after applying the overrides @@ -178,7 +174,7 @@ let ### Helper functions. - inherit lib config getConfig stdenvAdapters; + inherit lib config stdenvAdapters; inherit (lib) lowPrio hiPrio appendToName makeOverridable; @@ -214,7 +210,7 @@ let stdenvCross else let - changer = getConfig ["replaceStdenv"] null; + changer = config.replaceStdenv or null; in if changer != null then changer { # We import again all-packages to avoid recursivities. @@ -277,7 +273,7 @@ let fetchgitrevision = import ../build-support/fetchgitrevision runCommand git; - fetchmtn = callPackage ../build-support/fetchmtn (getConfig ["fetchmtn"] {}); + fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); fetchsvn = import ../build-support/fetchsvn { inherit stdenv subversion openssh; @@ -417,7 +413,7 @@ let autojump = callPackage ../tools/misc/autojump { }; avahi = callPackage ../development/libraries/avahi { - qt4Support = getConfig [ "avahi" "qt4Support" ] false; + qt4Support = config.avahi.qt4Support or false; }; aws = callPackage ../tools/virtualization/aws { }; @@ -837,7 +833,7 @@ let }; grub = callPackage_i686 ../tools/misc/grub { - buggyBiosCDSupport = getConfig ["grub" "buggyBiosCDSupport"] true; + buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; @@ -1635,7 +1631,7 @@ let }; truecrypt = callPackage ../applications/misc/truecrypt { - wxGUI = getConfig [ "truecrypt" "wxGUI" ] true; + wxGUI = config.truecrypt.wxGUI or true; }; ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; @@ -2744,14 +2740,14 @@ let inherit stdenv fetchurl lib composableDerivation autoconf automake flex bison apacheHttpd mysql libxml2 readline - zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng; + zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng; }; php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) { inherit stdenv fetchurl lib composableDerivation autoconf automake flex bison apacheHttpd mysql libxml2 readline - zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng; + zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng; }; php_apc = callPackage ../development/libraries/php-apc { }; @@ -2821,7 +2817,7 @@ let rubySqlite3 = callPackage ../development/ruby-modules/sqlite3 { }; rLang = callPackage ../development/interpreters/r-lang { - withBioconductor = getConfig ["rLang" "withBioconductor"] false; + withBioconductor = config.rLang.withBioconductor or false; }; rubygemsFun = ruby: builderDefsPackage (import ../development/interpreters/ruby/rubygems.nix) { @@ -2859,7 +2855,7 @@ let */ sourceFromHead = import ../build-support/source-from-head-fun.nix { - inherit getConfig; + inherit config; }; ecj = callPackage ../development/eclipse/ecj { }; @@ -3175,10 +3171,10 @@ let radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; - useX11 = getConfig ["radare" "useX11"] false; - pythonBindings = getConfig ["radare" "pythonBindings"] false; - rubyBindings = getConfig ["radare" "rubyBindings"] false; - luaBindings = getConfig ["radare" "luaBindings"] false; + useX11 = config.radare.useX11 or false; + pythonBindings = config.radare.pythonBindings or false; + rubyBindings = config.radare.rubyBindings or false; + luaBindings = config.radare.luaBindings or false; }; ragel = callPackage ../development/tools/parsing/ragel { }; @@ -3610,19 +3606,19 @@ let glibc29 = callPackage ../development/libraries/glibc/2.9 { kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; + installLocales = config.glibc.locales or false; }; glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.9) { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = linuxHeadersCross; - installLocales = getConfig [ "glibc" "locales" ] false; + installLocales = config.glibc.locales or false; }); glibc213 = (callPackage ../development/libraries/glibc/2.13 { kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; + installLocales = config.glibc.locales or false; machHeaders = null; hurdHeaders = null; gccCross = null; @@ -3634,7 +3630,7 @@ let inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; - installLocales = getConfig [ "glibc" "locales" ] false; + installLocales = config.glibc.locales or false; } // lib.optionalAttrs crossGNU { inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; @@ -3643,7 +3639,7 @@ let glibc214 = (callPackage ../development/libraries/glibc/2.14 { kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; + installLocales = config.glibc.locales or false; machHeaders = null; hurdHeaders = null; gccCross = null; @@ -3655,7 +3651,7 @@ let inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; - installLocales = getConfig [ "glibc" "locales" ] false; + installLocales = config.glibc.locales or false; } // lib.optionalAttrs crossGNU { inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; @@ -3674,7 +3670,7 @@ let eglibc = callPackage ../development/libraries/eglibc { kernelHeaders = linuxHeaders; - installLocales = getConfig [ "glibc" "locales" ] false; + installLocales = config.glibc.locales or false; }; glibcLocales = callPackage ../development/libraries/glibc/2.13/locales.nix { }; @@ -3782,11 +3778,11 @@ let }; gnutls = callPackage ../development/libraries/gnutls { - guileBindings = getConfig ["gnutls" "guile"] true; + guileBindings = config.gnutls.guile or true; }; gnutls2 = callPackage ../development/libraries/gnutls/2.12.nix { - guileBindings = getConfig ["gnutls" "guile"] true; + guileBindings = config.gnutls.guile or true; }; gnutls_without_guile = gnutls.override { guileBindings = false; }; @@ -3975,7 +3971,7 @@ let libaal = callPackage ../development/libraries/libaal { }; libao = callPackage ../development/libraries/libao { - usePulseAudio = getConfig [ "pulseaudio" ] true; + usePulseAudio = config.pulseaudio or true; }; libarchive = callPackage ../development/libraries/libarchive { }; @@ -4146,7 +4142,7 @@ let libimobiledevice = callPackage ../development/libraries/libimobiledevice { }; libiodbc = callPackage ../development/libraries/libiodbc { - useGTK = getConfig [ "libiodbc" "gtk" ] false; + useGTK = config.libiodbc.gtk or false; }; liblastfmSF = callPackage ../development/libraries/liblastfmSF { }; @@ -4618,12 +4614,12 @@ let pangoxsl = callPackage ../development/libraries/pangoxsl { }; pcre = callPackage ../development/libraries/pcre { - unicodeSupport = getConfig ["pcre" "unicode"] true; + unicodeSupport = config.pcre.unicode or true; cplusplusSupport = !stdenv ? isDietLibC; }; pcre_8_30 = callPackage ../development/libraries/pcre/8.30.nix { - unicodeSupport = getConfig ["pcre" "unicode"] true; + unicodeSupport = config.pcre.unicode or true; cplusplusSupport = !stdenv ? isDietLibC; }; @@ -5357,7 +5353,7 @@ let #monetdb = callPackage ../servers/sql/monetdb { }; mongodb = callPackage ../servers/nosql/mongodb { - useV8 = (getConfig ["mongodb" "useV8"] false); + useV8 = (config.mongodb.useV8 or false); }; mysql4 = import ../servers/sql/mysql { @@ -6074,8 +6070,8 @@ let pam_usb = callPackage ../os-specific/linux/pam_usb { }; pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { - firmware = getConfig ["pcmciaUtils" "firmware"] []; - config = getConfig ["pcmciaUtils" "config"] null; + firmware = config.pcmciaUtils.firmware or []; + config = config.pcmciaUtils.config or null; }; phat = callPackage ../development/libraries/phat { @@ -6667,7 +6663,7 @@ let dvswitch = callPackage ../applications/video/dvswitch { }; dwm = callPackage ../applications/window-managers/dwm { - patches = getConfig [ "dwm" "patches" ] []; + patches = config.dwm.patches or []; }; eaglemode = callPackage ../applications/misc/eaglemode { }; @@ -6700,8 +6696,8 @@ let literal backslashes have changed. */ else overrideGCC stdenv gcc44; - xaw3dSupport = getConfig [ "emacs" "xaw3dSupport" ] false; - gtkGUI = getConfig [ "emacs" "gtkSupport" ] true; + xaw3dSupport = config.emacs.xaw3dSupport or false; + gtkGUI = config.emacs.gtkSupport or true; }; emacs23 = callPackage ../applications/editors/emacs-23 { @@ -6877,7 +6873,7 @@ let grass = import ../applications/misc/grass { inherit (xlibs) libXmu libXext libXp libX11 libXt libSM libICE libXpm libXaw libXrender; - inherit getConfig composableDerivation stdenv fetchurl + inherit config composableDerivation stdenv fetchurl lib flex bison cairo fontconfig gdal zlib ncurses gdbm proj pkgconfig swig blas liblapack libjpeg libpng mysql unixODBC mesa postgresql python @@ -6942,11 +6938,11 @@ let flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { }; flashplayer10 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-10 { - debug = getConfig ["flashplayer" "debug"] false; + debug = config.flashplayer.debug or false; }; flashplayer11 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { - debug = getConfig ["flashplayer" "debug"] false; + debug = config.flashplayer.debug or false; # !!! Fix the dependency on two different builds of nss. }; @@ -7040,7 +7036,7 @@ let gnunet08 = callPackage ../applications/networking/p2p/gnunet/0.8.nix { inherit (gnome) libglade; guile = guile_1_8; - gtkSupport = getConfig [ "gnunet" "gtkSupport" ] true; + gtkSupport = config.gnunet.gtkSupport or true; }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; @@ -7401,7 +7397,7 @@ let avahi = avahi.override { withLibdnssdCompat = true; }; - jackSupport = getConfig [ "mumble" "jackSupport" ] false; + jackSupport = config.mumble.jackSupport or false; }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -7493,9 +7489,9 @@ let 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; - libgcrypt = if (getConfig ["pidgin" "gnutls"] false) then libgcrypt else null; + openssl = if (config.pidgin.openssl or true) then openssl else null; + gnutls = if (config.pidgin.gnutls or false) then gnutls else null; + libgcrypt = if (config.pidgin.gnutls or false) then libgcrypt else null; inherit (gnome) startupnotification; }; @@ -7584,7 +7580,7 @@ let rsync = callPackage ../applications/networking/sync/rsync { enableACLs = !(stdenv.isDarwin || stdenv.isSunOS); - enableCopyDevicesPatch = (getConfig ["rsync" "enableCopyDevicesPatch"] false); + enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false); }; rxvt = callPackage ../applications/misc/rxvt { }; @@ -7617,7 +7613,7 @@ let siproxd = callPackage ../applications/networking/siproxd { }; skype_linux = callPackage_i686 ../applications/networking/instant-messengers/skype { - usePulseAudio = getConfig [ "pulseaudio" ] false; # disabled by default (the 100% cpu bug) + usePulseAudio = config.pulseaudio or false; # disabled by default (the 100% cpu bug) }; st = callPackage ../applications/misc/st { }; @@ -7712,7 +7708,7 @@ let taskjuggler = callPackage ../applications/misc/taskjuggler { # KDE support is not working yet. inherit (kde3) kdelibs kdebase; - withKde = getConfig [ "taskJuggler" "kde" ] false; + withKde = config.taskJuggler.kde or false; }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -7768,7 +7764,7 @@ let unison = callPackage ../applications/networking/sync/unison { inherit (ocamlPackages) lablgtk; - enableX11 = getConfig [ "unison" "enableX11" ] true; + enableX11 = config.unison.enableX11 or true; }; uucp = callPackage ../tools/misc/uucp { }; @@ -7798,19 +7794,15 @@ let vimHugeX = vim_configurable; vim_configurable = import ../applications/editors/vim/configurable.nix { - inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib - getConfig; - inherit (pkgs.xlibs) libX11 libXext libSM libXpm - libXt libXaw libXau libXmu libICE; + inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib config; + inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu libICE; inherit (pkgs) glib gtk; features = "huge"; # one of tiny, small, normal, big or huge # optional features by passing # python # TODO mzschemeinterp perlinterp inherit (pkgs) python perl tcl ruby /*x11*/; - lua = pkgs.lua5; - # optional features by flags flags = [ "X11" ]; # only flag "X11" by now }; @@ -7859,7 +7851,7 @@ let libixp = libixp_for_wmii; inherit fetchurl /* fetchhg */ stdenv gawk; inherit (xlibs) libX11 xextproto libXt libXext; - includeUnpack = getConfig ["stdenv" "includeUnpack"] false; + includeUnpack = config.stdenv.includeUnpack or false; }; wordnet = callPackage ../applications/misc/wordnet { }; @@ -7871,23 +7863,23 @@ let inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = let - enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true; - enableGnash = getConfig [ browserName "enableGnash" ] false; + enableAdobeFlash = config.browserNameenableAdobeFlash or true; + enableGnash = config.browserNameenableGnash or false; in assert !(enableGnash && enableAdobeFlash); ([ ] ++ lib.optional enableGnash gnash ++ lib.optional enableAdobeFlash flashplayer # RealPlayer is disabled by default for legal reasons. - ++ lib.optional (system != "i686-linux" && getConfig [browserName "enableRealPlayer"] false) RealPlayer - ++ lib.optional (getConfig [browserName "enableDjvu"] false) (djview4) - ++ lib.optional (getConfig [browserName "enableMPlayer"] false) (MPlayerPlugin browser) - ++ lib.optional (getConfig [browserName "enableGeckoMediaPlayer"] false) gecko_mediaplayer - ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin + ++ lib.optional (system != "i686-linux" && config.browserNameenableRealPlayer or false) RealPlayer + ++ lib.optional (config.browserNameenableDjvu or false) (djview4) + ++ lib.optional (config.browserNameenableMPlayer or false) (MPlayerPlugin browser) + ++ lib.optional (config.browserNameenableGeckoMediaPlayer or false) gecko_mediaplayer + ++ lib.optional (supportsJDK && config.browserNamejre or false && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional (config.browserNameenableGoogleTalkPlugin or false) google_talk_plugin ); libs = - if getConfig [ browserName "enableQuakeLive" ] false + if config.browserNameenableQuakeLive or false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; }; @@ -8716,8 +8708,8 @@ let ghostscript = callPackage ../misc/ghostscript { x11Support = false; - cupsSupport = getConfig [ "ghostscript" "cups" ] true; - gnuFork = getConfig [ "ghostscript" "gnu" ] false; + cupsSupport = config.ghostscript.cups or true; + gnuFork = config.ghostscript.gnu or false; }; ghostscriptX = appendToName "with-X" (ghostscript.override { @@ -8753,13 +8745,13 @@ let nix = nixStable; nixStable = callPackage ../tools/package-management/nix { - storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; - stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; }; nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { - storeDir = getConfig [ "nix" "storeDir" ] "/nix/store"; - stateDir = getConfig [ "nix" "stateDir" ] "/nix/var"; + storeDir = config.nix.storeDir or "/nix/store"; + stateDir = config.nix.stateDir or "/nix/var"; }; nixCustomFun = src: preConfigure: enableScripts: configureFlags: @@ -8779,13 +8771,13 @@ let disnix = callPackage ../tools/package-management/disnix { }; disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts { - enableApacheWebApplication = getConfig ["disnix" "enableApacheWebApplication"] false; - enableAxis2WebService = getConfig ["disnix" "enableAxis2WebService"] false; - enableEjabberdDump = getConfig ["disnix" "enableEjabberdDump"] false; - enableMySQLDatabase = getConfig ["disnix" "enableMySQLDatabase"] false; - enablePostgreSQLDatabase = getConfig ["disnix" "enablePostgreSQLDatabase"] false; - enableSubversionRepository = getConfig ["disnix" "enableSubversionRepository"] false; - enableTomcatWebApplication = getConfig ["disnix" "enableTomcatWebApplication"] false; + enableApacheWebApplication = config.disnix.enableApacheWebApplication or false; + enableAxis2WebService = config.disnix.enableAxis2WebService or false; + enableEjabberdDump = config.disnix.enableEjabberdDump or false; + enableMySQLDatabase = config.disnix.enableMySQLDatabase or false; + enablePostgreSQLDatabase = config.disnix.enablePostgreSQLDatabase or false; + enableSubversionRepository = config.disnix.enableSubversionRepository or false; + enableTomcatWebApplication = config.disnix.enableTomcatWebApplication or false; }; disnixos = callPackage ../tools/package-management/disnix/disnixos { }; @@ -8830,12 +8822,12 @@ let xlockmore = callPackage ../misc/screensavers/xlockmore { }; saneBackends = callPackage ../misc/sane-backends { - gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; - hotplugSupport = getConfig ["sane" "hotplugSupport"] true; + gt68xxFirmware = config.sane.gt68xxFirmware or null; + hotplugSupport = config.sane.hotplugSupport or true; }; saneBackendsSnapshot = callPackage ../misc/sane-backends/snapshot.nix { - gt68xxFirmware = getConfig ["sane" "gt68xxFirmware"] null; + gt68xxFirmware = config.sane.gt68xxFirmware or null; }; saneFrontends = callPackage ../misc/sane-front { }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 01b4f2e75ab..803b45061bd 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -8,7 +8,7 @@ # The actual Haskell packages are composed in haskell-packages.nix. There is # more documentation in there. -{ makeOverridable, lowPrio, stdenv, pkgs, newScope, getConfig, callPackage } : rec { +{ makeOverridable, lowPrio, stdenv, pkgs, newScope, config, callPackage } : rec { # Preferences functions. # @@ -123,13 +123,13 @@ # prefFun = self : super : self; enableLibraryProfiling = if profExplicit then profDefault - else getConfig [ "cabal" "libraryProfiling" ] profDefault; + else config.cabal.libraryProfiling or profDefault; ghc = callPackage ghcPath { ghc = ghcBinary; }; }); defaultVersionPrioFun = profDefault : - if getConfig [ "cabal" "libraryProfiling" ] false == profDefault + if config.cabal.libraryProfiling or false == profDefault then (x : x) else lowPrio; -- GitLab From 8cb034fd30b4d9742c48a2f5d1e07fd697bb501b Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 19 Sep 2012 22:41:15 +0200 Subject: [PATCH 0562/5607] fix blender build and enable parallel building --- pkgs/applications/misc/blender/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e8307a79cf7..828d55ad478 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { "-DPYTHON_LIBPATH=${python}/lib" ]; - NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}"; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}"; + + enableParallelBuilding = true; meta = { description = "3D Creation/Animation/Publishing System"; -- GitLab From 355cf69c76fa811deb2c43126b865c549edcc4ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:08:10 +0200 Subject: [PATCH 0563/5607] haskell-Cabal: add version 1.16.0 --- .../libraries/haskell/Cabal/1.16.0.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/Cabal/1.16.0.nix diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.nix new file mode 100644 index 00000000000..14e811b5e94 --- /dev/null +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.nix @@ -0,0 +1,15 @@ +{ cabal, filepath }: + +cabal.mkDerivation (self: { + pname = "Cabal"; + version = "1.16.0"; + sha256 = "0ia2ysqbnnbfv75l8617bys5iaq8aygcbd1ijqcbzd3asf8flyms"; + buildDepends = [ filepath ]; + meta = { + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + 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 b5e9e4506d6..750d172f18e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -495,6 +495,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; + Cabal_1_16_0 = callPackage ../development/libraries/haskell/Cabal/1.16.0.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; -- GitLab From 56bb1ac90bd7782a478802162497b5756e24d50b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:09:08 +0200 Subject: [PATCH 0564/5607] haskell-network: update to version 2.4.0.1 --- .../libraries/haskell/network/{2.4.0.0.nix => 2.4.0.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/network/{2.4.0.0.nix => 2.4.0.1.nix} (80%) diff --git a/pkgs/development/libraries/haskell/network/2.4.0.0.nix b/pkgs/development/libraries/haskell/network/2.4.0.1.nix similarity index 80% rename from pkgs/development/libraries/haskell/network/2.4.0.0.nix rename to pkgs/development/libraries/haskell/network/2.4.0.1.nix index 421f023ab73..e0aa44c38bd 100644 --- a/pkgs/development/libraries/haskell/network/2.4.0.0.nix +++ b/pkgs/development/libraries/haskell/network/2.4.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network"; - version = "2.4.0.0"; - sha256 = "1l4gdhjac7nnl4zd03bndjbjm9fizmxhimz2bznjw19q6gbp3rp0"; + version = "2.4.0.1"; + sha256 = "00jj3pf2gchkx5wmipm2ijxcmhy37g86ggnp6pb92i5nmb93h1iw"; buildDepends = [ parsec ]; meta = { homepage = "https://github.com/haskell/network"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 750d172f18e..2f6b53e6d26 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_5; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok - network = self.network_2_4_0_0; # 7.6 ok + network = self.network_2_4_0_1; # 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 @@ -1131,8 +1131,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_4_0_0 = callPackage ../development/libraries/haskell/network/2.4.0.0.nix {}; - network = self.network_2_4_0_0; + network_2_4_0_1 = callPackage ../development/libraries/haskell/network/2.4.0.1.nix {}; + network = self.network_2_4_0_1; networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; -- GitLab From 76eaa4c4f011dd6e1fc7e37393a76a4e77983aa6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0565/5607] haskell-HStringTemplate: update to version 0.6.10 --- .../libraries/haskell/HStringTemplate/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 6754c15f3f4..e966fb1283e 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,13 +1,14 @@ -{ cabal, deepseq, filepath, mtl, parsec, syb, sybWithClass, text -, time, utf8String +{ cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb +, sybWithClass, text, time, utf8String }: cabal.mkDerivation (self: { pname = "HStringTemplate"; - version = "0.6.9"; - sha256 = "0xa665q5gya51vjkg1i6f6qk67jx28xcbxs5v1d9yr1f8djh5d9v"; + version = "0.6.10"; + sha256 = "0asv8n4l2j819cngxgdk5p0b4bqcxnmdc2mlp9b3s7mrs15ljxkk"; buildDepends = [ - deepseq filepath mtl parsec syb sybWithClass text time utf8String + blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time + utf8String ]; meta = { description = "StringTemplate implementation in Haskell"; -- GitLab From e5b709fef6621e08206e26c4f91e6cf94356e9c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0566/5607] haskell-SDL: update to version 0.6.4 --- pkgs/development/libraries/haskell/SDL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index a83518f9e10..62731657e82 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SDL"; - version = "0.6.3"; - sha256 = "0m3ick3rw8623ja42yfj4pa57naa6yb20ym8lv252gwb18ghp4sp"; + version = "0.6.4"; + sha256 = "1zrfx2nw0k8lfkr6vnwsp5wr3yz62v0bq60p4sdzj7gm01bz92g0"; extraLibraries = [ SDL ]; meta = { description = "Binding to libSDL"; -- GitLab From 7347039d0d7d7dfc804c9f86f7713e178f381d75 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0567/5607] haskell-binary: update to version 0.6.1.0 --- 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 83ad3df7071..f0757bcca02 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.6.0.0"; - sha256 = "0p72w7f9nn19g2wggsh8x4z7y9s174f3drz9a5ln4x7h554swcxv"; + version = "0.6.1.0"; + sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js"; meta = { homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; -- GitLab From 70a1ead4a2a4e0d1663ea2834b5f4a3408455fb2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0568/5607] haskell-http-conduit: update to version 1.6.0.4 --- 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 b1cb2bac6ab..3597204eda6 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.3"; - sha256 = "101h4ba92h8gh74pl9kkgfg94sx3nivv6cc2lfm7i85lrp2fwyjr"; + version = "1.6.0.4"; + sha256 = "1gnr65nkgn99cvll71zka6wrpg9ihhn38mg89841q1w2y0xf1mb0"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie -- GitLab From 9958d66805ef1bbbb1dcc0129de5e0c4f44918c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0569/5607] haskell-murmur-hash: update to version 0.1.0.6 --- pkgs/development/libraries/haskell/murmur-hash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix index 8f1ee9fa6a3..0c4058eb111 100644 --- a/pkgs/development/libraries/haskell/murmur-hash/default.nix +++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "murmur-hash"; - version = "0.1.0.5"; - sha256 = "1m7rm57bxkrl4i9fbvmx5m29axyxddrs4ss7plbd19pw3wsvgmr0"; + version = "0.1.0.6"; + sha256 = "0wnkwl3a9x0f4rvsj4wf129n03vpw8qk4kzx6vmrapwwb4r80npz"; meta = { homepage = "http://github.com/nominolo/murmur-hash"; description = "MurmurHash2 implementation for Haskell"; -- GitLab From d5f1233623cc42e2984282b223cf2f4de13c4436 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0570/5607] haskell-network-conduit: update to version 0.5.0.2 --- .../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 4c989e17698..d5c04d8e2b8 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.1"; - sha256 = "1rk8a8n1yily20y3jr51zbd00m2c6ic8gxw9rnmkr2cfs963l2v5"; + version = "0.5.0.2"; + sha256 = "0ragnwhc8szh680iyzyz6fbprqd3drr8sb970h1p2l4i22srkm39"; buildDepends = [ conduit liftedBase monadControl network transformers ]; -- GitLab From a19959bfa62b51e5b6bd259d8bee8a61503216b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0571/5607] haskell-shelly: update to version 0.14.0.1 --- pkgs/development/libraries/haskell/shelly/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 0c266ab1b29..cafb4a5215f 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; + jailbreak = true; meta = { homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; -- GitLab From 51ec98ee2abbabbece276fef3e5a1926078c10bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:52 +0200 Subject: [PATCH 0572/5607] haskell-snap-core: update to version 0.9.2 --- .../libraries/haskell/snap/core.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 1d51b9d9933..a9eae8dca69 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,22 +1,21 @@ -{ cabal, attoparsec, attoparsecEnumerator, base16Bytestring -, blazeBuilder, blazeBuilderEnumerator, bytestringMmap -, bytestringNums, caseInsensitive, deepseq, dlist, enumerator -, filepath, HUnit, MonadCatchIOTransformers, mtl, mwcRandom -, regexPosix, text, time, transformers, unixCompat +{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder +, blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq +, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl +, random, regexPosix, text, time, transformers, unixCompat , unorderedContainers, vector, zlibEnum }: cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.0"; - sha256 = "1fsjamv9sl19in2ws97v246sbvlnj05rm9dljc0pz7kasawyqsb7"; + version = "0.9.2"; + sha256 = "04c1i5ccsb76yw7nyj8sxxnwq3ym14iygc3immdn2lqrm424vkkp"; buildDepends = [ - attoparsec attoparsecEnumerator base16Bytestring blazeBuilder - blazeBuilderEnumerator bytestringMmap bytestringNums - caseInsensitive deepseq dlist enumerator filepath HUnit - MonadCatchIOTransformers mtl mwcRandom regexPosix text time + attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator + bytestringMmap caseInsensitive deepseq enumerator filepath HUnit + MonadCatchIOTransformers mtl random regexPosix text time transformers unixCompat unorderedContainers vector zlibEnum ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; -- GitLab From 4f2e67cb7d2740393c0b5b462f24a28325c58055 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0573/5607] haskell-snap-server: update to version 0.9.2.2 --- .../libraries/haskell/snap/server.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 20a6af0ba90..05cd0038b0b 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,20 +1,20 @@ { cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder -, blazeBuilderEnumerator, bytestringNums, caseInsensitive -, directoryTree, enumerator, filepath, MonadCatchIOTransformers -, mtl, murmurHash, network, snapCore, text, time, transformers -, unixCompat, vector, vectorAlgorithms +, blazeBuilderEnumerator, caseInsensitive, directoryTree +, enumerator, filepath, MonadCatchIOTransformers, mtl, network +, snapCore, text, time, transformers, unixCompat }: cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.0"; - sha256 = "12mjy1w6gsnw93bcpsnxnw7kc2v73dfps7gk542iw73lldfhh3va"; + version = "0.9.2.2"; + sha256 = "1yfm09w1zybdsbn1rj9gdbrbh63lhmrykyg9rc2ys7fcaszvsx7c"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder - blazeBuilderEnumerator bytestringNums caseInsensitive directoryTree - enumerator filepath MonadCatchIOTransformers mtl murmurHash network - snapCore text time transformers unixCompat vector vectorAlgorithms + blazeBuilderEnumerator caseInsensitive directoryTree enumerator + filepath MonadCatchIOTransformers mtl network snapCore text time + transformers unixCompat ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; -- GitLab From 5adbb7aaf416d6a1ac062974e6ecedab4147927d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0574/5607] haskell-snap: update to version 0.9.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index e40aee63bc1..2ceccbcf40e 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.1.1"; - sha256 = "1g8jvnwrhna5g064dmv4v4khrpwwn0vcqw8l7rcpkp75l46fq29z"; + version = "0.9.2"; + sha256 = "12sqc6j6v57jll8pkgzj71f6s435rwhqxqzl78l3rk4qn6sc0gzi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,10 +19,9 @@ cabal.mkDerivation (self: { snapServer stm syb text time transformers unorderedContainers utf8String vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework: project starter executable and glue code library"; + description = "Top-level package for the Snap Web Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; -- GitLab From 5e3e55ea087c12ac96f12c02dd912e9e2066bb5a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0575/5607] haskell-strptime: update to version 1.0.7 --- pkgs/development/libraries/haskell/strptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix index f0b9c638946..2749353543d 100644 --- a/pkgs/development/libraries/haskell/strptime/default.nix +++ b/pkgs/development/libraries/haskell/strptime/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "strptime"; - version = "1.0.6"; - sha256 = "1brzh22nrs2mg5h815vj8vlz0qn2jwm4y4sdp5zlszjxfsqc2hp7"; + version = "1.0.7"; + sha256 = "1x8z7ib66v8xif7gxdzsxi7ifnz75f4k2c1h2jsjq308srdzxjcr"; buildDepends = [ time ]; meta = { description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)"; -- GitLab From 012b942ca39375276e396bb9c492273c22bb37a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0576/5607] haskell-stylish-haskell: update to version 0.5.1.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 2f76c16a2a4..f2ebed7cc6a 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.0.2"; - sha256 = "0am63hw24c1yja1sb2xsbi1bcyfxb1qsypszkpaylvks797czmc7"; + version = "0.5.1.0"; + sha256 = "0vriwgx7z8azqmci9lq7xlvn0v12p5nj9s6i4jvxsjam538qll94"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 95b00cb92b47e25b6aacfdd1ac3d9c7ad99472c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0577/5607] haskell-unix-compat: update to version 0.4.0.0 --- 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 df329ba1d90..7c5cb6c63c4 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.2"; - sha256 = "0rikix2l8d0n948pzri2rdis9k5q0m73h7vxsxjz1vh24ryjj59f"; + version = "0.4.0.0"; + sha256 = "0xhhvqdjcmcyavf0g2q2sjghj2h4si1ijg4nc4s8kidbd957z9r8"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; -- GitLab From a845d17efcd28c2a92b8aebe6fbce60db1c6ed14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0578/5607] haskell-wai-app-static: update to version 1.3.0.2 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index f073d36f502..f7f858b17f2 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.0.1"; - sha256 = "0rgbqbcj4jd6xpjm3nqa5hdf3an7208in536dl6x9n88w9a6qngp"; + version = "1.3.0.2"; + sha256 = "0z49s4kc365q3brfkgdnja964h3h3yc3wypccnkj71dl11n040zq"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes -- GitLab From 36b729ea623daee1376cb12b7836a99d0cab6146 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0579/5607] haskell-wai-extra: update to version 1.3.0.2 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 0debe101b4f..7c460681fcb 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.0.1"; - sha256 = "0mclhaxdgj1vcqa6q22zl5zv4znfis1zyivwypl1pwv0r267siy5"; + version = "1.3.0.2"; + sha256 = "0w69wjfbzgg523n0rcs700qx0gsdhvlr0qjvqg1hppvi188llpwl"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network -- GitLab From 3b26099b626d87e323fd2466463d628f891c124c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:53 +0200 Subject: [PATCH 0580/5607] haskell-wai: update to version 1.3.0.1 --- 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 a67da394a65..56421b213d5 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai"; - version = "1.3.0"; - sha256 = "08y0s7b5db5nyvxv0bvraj6ih7054h5n4lkwdlm3nkbm8s9k8hwv"; + version = "1.3.0.1"; + sha256 = "0z6byx71awhjb7fycz1ixsyzzlsrv1i69qwjrfzh9y5wnbchj9yl"; buildDepends = [ blazeBuilder conduit httpTypes network text transformers vault ]; -- GitLab From 9540d6e6f2d8a2075a0284b0c1754bbc466fb9c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:54 +0200 Subject: [PATCH 0581/5607] haskell-warp: update to version 1.3.1.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 30bbbef9a0b..6a54909d6d4 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.1"; - sha256 = "12f4v080v8jgm02swqbbgq9yvbajmbr8ja2p6ljc7bhf3rkpwplr"; + version = "1.3.1.1"; + sha256 = "1y0p36nh43wilk110dxpvsws6blrjpik4w9aqj5i1r97wn7xg9ax"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes liftedBase network networkConduit simpleSendfile transformers -- GitLab From 4c84e5275aa5d8599a8e8c03f2ce690408484e45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:54 +0200 Subject: [PATCH 0582/5607] haskell-yesod-form: update to version 1.1.2 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 8f3cf37149f..ce9e4c591e3 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.1"; - sha256 = "0239sbnpl022g53iwbg9pnphiyadxysdwrqz3f8spf6x3w2gs6vg"; + version = "1.1.2"; + sha256 = "0kjnnav7zb21iig3vhhy61jlz2wsk8r8b7dh251mla5l8pi3dq3r"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss -- GitLab From 8127dab3d59685360adb6acabc302fa43028c1ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:54 +0200 Subject: [PATCH 0583/5607] haskell-yesod-test: update to version 0.3.0.1 --- pkgs/development/libraries/haskell/yesod-test/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 2e504ca0f6d..5c88b652f86 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "0.3.0"; - sha256 = "194m4va6am2fmnsvs60jclym6bvjmwp35nyv3srbdnqwg3r983h4"; + version = "0.3.0.1"; + sha256 = "0dfdvhk3mspqhqicjapqvjzmi0hpd2641zb1899fk6mank8yfz0m"; buildDepends = [ attoparsec blazeHtml blazeMarkup caseInsensitive hspec htmlConduit httpTypes HUnit monadControl network persistent poolConduit text -- GitLab From 2433317cf0b2f53e8d048e4ff2011d3d6bd62545 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:34:54 +0200 Subject: [PATCH 0584/5607] haskell-yesod: update to version 1.1.0.3 --- pkgs/development/libraries/haskell/yesod/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 46ebf6c8b85..3fa94ffa905 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { transformers unixCompat unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore yesodForm yesodJson yesodPersistent zlib ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; -- GitLab From 42917c1c46b0a9a35392402f5219a04d6a867271 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:35:19 +0200 Subject: [PATCH 0585/5607] asymptote: update to version 2.18 --- pkgs/tools/graphics/asymptote/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/src-for-default.nix b/pkgs/tools/graphics/asymptote/src-for-default.nix index e9d822904af..ddd0860ccd1 100644 --- a/pkgs/tools/graphics/asymptote/src-for-default.nix +++ b/pkgs/tools/graphics/asymptote/src-for-default.nix @@ -1,7 +1,7 @@ rec { - version="2.16"; - name="asymptote-2.16"; - hash="1yj8dx320s1ypqbpb2116y4kkc8lwg5q4d49n992ds3g59w98djj"; + version="2.18"; + name="asymptote-2.18"; + hash="0i7jm12lzj983gvpa95a85wxb4v4ksk3cxb0cq359x2kka0b6g5m"; url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz"; - advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.16/asymptote-2.16.src.tgz"; + advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.18/asymptote-2.18.src.tgz"; } -- GitLab From 97d688b7872e5dc5730cee9e8b0a8497fb2f3fc1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Sep 2012 14:35:30 +0200 Subject: [PATCH 0586/5607] asymptote: add myself as maintainer --- pkgs/tools/graphics/asymptote/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index bdde709c2c2..e9baac43cbd 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -3,11 +3,11 @@ a @ { boehmgc,mesa,ncurses,readline,gsl,libsigsegv, python,zlib, perl, texLive, texinfo, lzma, - noDepEntry, fullDepEntry, fetchUrlFromSrcInfo, + noDepEntry, fullDepEntry, fetchUrlFromSrcInfo, lib, ...}: -let +let s = import ./src-for-default.nix; buildInputs = with a; [ freeglut ghostscriptX imagemagick fftw boehmgc @@ -54,8 +54,9 @@ rec { description = "A tool for programming graphics intended to replace Metapost"; maintainers = [ a.lib.maintainers.raskin + a.lib.maintainers.simons ]; - platforms = with a.lib.platforms; + platforms = with a.lib.platforms; linux; }; } -- GitLab From a9f8dd2c135f7966213de54eede012849df09714 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Sep 2012 14:08:40 -0400 Subject: [PATCH 0587/5607] Add optimist nodePackage --- pkgs/top-level/node-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index b5546eae66f..30ade238365 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -625,6 +625,19 @@ let self = { ]; }; + "optimist" = self."optimist-*"; + + "optimist-*" = self.buildNodePackage rec { + name = "optimist-0.3.4"; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/${name}.tgz"; + sha256 = "add88b473a660ad8a9ff88a3eec49a74d9c64f592acbcd219ff4c0d7249f4d60"; + }; + deps = [ + self."wordwrap-~0.0.2" + ]; + }; + "options" = self."options-*"; "options-*" = self.buildNodePackage rec { @@ -999,6 +1012,19 @@ let self = { ]; }; + "wordwrap" = self."wordwrap-~0.0.2"; + + "wordwrap-~0.0.2" = self.buildNodePackage rec { + name = "wordwrap-0.0.2"; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/${name}.tgz"; + sha256 = "66a2fa688509738922c3ad62a6159fe3c93268bd3bca2bff24df4bc02cc31582"; + }; + deps = [ + + ]; + }; + "ws" = self."ws-0.4.x"; "ws-0.4.x" = self."ws-0.4.21"; -- GitLab From 309ec44f404e30ede5cfcdbd01b614da5ff771c3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Sep 2012 14:45:31 -0400 Subject: [PATCH 0588/5607] build-node-package: make fewer assumptions about the name of the node tarball --- pkgs/development/web/nodejs/build-node-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 41550a72529..95d10db167f 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -7,7 +7,7 @@ with stdenv.lib; let npmFlags = concatStringsSep " " (map (v: "--${v}") flags); sources = runCommand "node-sources" {} '' tar xf ${nodejs.src} - mv node-v${nodejs.version} $out + mv *node* $out ''; in -- GitLab From 4367db0bd20c63e940309a6a36d8c9bb3a964cb8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:18:48 -0400 Subject: [PATCH 0589/5607] Disable libxcrypt in PAM It no longer builds: http://hydra.nixos.org/build/3046895 AFAIK we need libxcrypt for the legacy blowfish support, but it might be better to apply this patch to Glibc: http://cvs.pld-linux.org/cgi-bin/viewvc.cgi/cvs/packages/glibc/glibc-crypt-blowfish.patch?view=log --- 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 5d53e35763e..fe416542b03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6001,7 +6001,9 @@ let nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; - pam = callPackage ../os-specific/linux/pam { }; + pam = callPackage ../os-specific/linux/pam { + libxcrypt = null; + }; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) -- GitLab From 5d859baf59689e5bb18632e5c3cdb21ac39262db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:20:26 -0400 Subject: [PATCH 0590/5607] pam: Update to 1.1.6 --- pkgs/os-specific/linux/pam/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index c18ea2b1f2b..8e38d368ec8 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, flex, cracklib, libxcrypt }: stdenv.mkDerivation rec { - name = "linux-pam-1.1.1"; + name = "linux-pam-1.1.6"; src = fetchurl { - url = mirror://kernel/linux/libs/pam/library/Linux-PAM-1.1.1.tar.bz2; - sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0"; + url = https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-1.1.6.tar.bz2; + sha256 = "1hlz2kqvbjisvwyicdincq7nz897b9rrafyzccwzqiqg53b8gf5s"; }; buildNativeInputs = [ flex ]; + buildInputs = [ cracklib ] ++ stdenv.lib.optional (!stdenv.isArm && stdenv.system != "mips64el-linux") @@ -27,13 +28,13 @@ stdenv.mkDerivation rec { ''; postConfigure = '' sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile - ''; + ''; }; postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd - ''; + ''; preConfigure = '' configureFlags="$configureFlags --includedir=$out/include/security" -- GitLab From abc7c382ce3f03a6fccbbf497726ed5b9211f6ef Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 21 Sep 2012 16:29:12 +0200 Subject: [PATCH 0591/5607] Add attoparsec-binary-0.1.0.1 --- .../libraries/haskell/attoparsec-binary/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/attoparsec-binary/default.nix diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix new file mode 100644 index 00000000000..1faea022e9a --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix @@ -0,0 +1,13 @@ +{ cabal, attoparsec }: + +cabal.mkDerivation (self: { + pname = "attoparsec-binary"; + version = "0.1.0.1"; + sha256 = "1d3zjr8bh6d44v1vid0cvrrbyhn7xj4bn96vy36dzk7h7p87bzxa"; + buildDepends = [ attoparsec ]; + meta = { + description = "Binary processing extensions to Attoparsec"; + 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 2f6b53e6d26..fde7fc050a0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -425,6 +425,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); attoparsec = callPackage ../development/libraries/haskell/attoparsec {}; + attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binarbinary {}; + attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {}; attoparsecEnumerator = callPackage ../development/libraries/haskell/attoparsec/enumerator.nix {}; -- GitLab From 47706bf9f676529a2c19d5fe63a78eb9359afa7a Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 21 Sep 2012 16:29:55 +0200 Subject: [PATCH 0592/5607] Fix typo --- 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 fde7fc050a0..d4ad6e0f0d0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -425,7 +425,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); attoparsec = callPackage ../development/libraries/haskell/attoparsec {}; - attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binarbinary {}; + attoparsecBinary = callPackage ../development/libraries/haskell/attoparsec-binary {}; attoparsecConduit = callPackage ../development/libraries/haskell/attoparsec-conduit {}; -- GitLab From 882ccb0f5280d96d0a3e01efa8d876a47cd8b6c0 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 21 Sep 2012 16:33:24 +0200 Subject: [PATCH 0593/5607] Patch attoparsec-binary to work with GHC 7.6.1 --- .../attoparsec-binary-ghc7.6.1.patch | 20 +++++++++++++++++++ .../haskell/attoparsec-binary/default.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch b/pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch new file mode 100644 index 00000000000..dae949b2570 --- /dev/null +++ b/pkgs/development/libraries/haskell/attoparsec-binary/attoparsec-binary-ghc7.6.1.patch @@ -0,0 +1,20 @@ +diff --git a/Data/Attoparsec/Binary.hs b/Data/Attoparsec/Binary.hs +index fab76c6..01d6c8b 100644 +--- a/Data/Attoparsec/Binary.hs ++++ b/Data/Attoparsec/Binary.hs +@@ -23,7 +23,7 @@ import Data.Word + byteSize :: (Bits a) => a -> Int + byteSize = (`div` 8) . bitSize + +-pack :: (Bits a) => B.ByteString -> a ++pack :: (Bits a, Num a) => B.ByteString -> a + pack = B.foldl' (\n h -> (n `shiftL` 8) .|. fromIntegral h) 0 + + anyWordN :: (Bits a) => (B.ByteString -> a) -> Parser a +@@ -84,4 +84,4 @@ word64be = wordN unpack + + -- |Match a specific 64-bit little-endian word. + word64le :: Word64 -> Parser Word64 +-word64le = wordN $ B.reverse . unpack +\ No newline at end of file ++word64le = wordN $ B.reverse . unpack diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix index 1faea022e9a..f4e85d5ebd5 100644 --- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.1.0.1"; sha256 = "1d3zjr8bh6d44v1vid0cvrrbyhn7xj4bn96vy36dzk7h7p87bzxa"; buildDepends = [ attoparsec ]; + patches = [ ./attoparsec-binary-ghc7.6.1.patch ]; meta = { description = "Binary processing extensions to Attoparsec"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 0de672510594c9a49f2a38eb760fac520f1fe44d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0594/5607] haskell-idris: update to version 0.9.3.1 --- pkgs/development/compilers/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 99b8cbb7337..deb97a19b1c 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.3"; - sha256 = "1g8mb5g4w6zgcfx2g7l5ksr0lsjfghznxgh684yzlg8pfzah0hqh"; + version = "0.9.3.1"; + sha256 = "1dqb7gd5jn5f062hfwrirrfxv6ac1f6khkfax912j01mg147hv9a"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From e3a68cc13080bd843bb5922c942e593ca8b59544 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0595/5607] haskell-JuicyPixels: update to version 2.0.1 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index f6f37cb9692..8ec3a41a709 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "2.0"; - sha256 = "1qvdp0b2fn0cgp9vrm2p35jx8qcz1ikpvjzwkdkc8q84yr1x0457"; + version = "2.0.1"; + sha256 = "0irisyrqz9cyyjd428qnnxyybrqc54s1qi5vyz0md0acz7mr5anh"; buildDepends = [ cereal deepseq mtl primitive transformers vector zlib ]; -- GitLab From 46b291f6ea684d9bd6854c3968d34ea62afaba5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0596/5607] haskell-certificate: update to version 1.2.8 --- 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 91efd96e683..18114de5ec2 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.7"; - sha256 = "02fsip23k97p6wx94d867z5v37yfamrlxv4qvv9wcgjzmh2694ay"; + version = "1.2.8"; + sha256 = "0lcyvkr0iqywwid9zlpzfvzpg70gvw7y0ij51ljadrwp882nj0ws"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; -- GitLab From db90286ff714f9fefb9395e52400579fe4849acc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0597/5607] haskell-shelly: update to version 0.14.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 cafb4a5215f..838e6c30faf 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.14.0.1"; - sha256 = "062c3zqr6ad61p0s423h8rhimqfld6p95z3qzrmag9f29a5f4fbz"; + version = "0.14.1"; + sha256 = "1cvfak5siysnpms1znra6dk762zp0gv1sam3xfdp67a7ir0hpcpp"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; -- GitLab From ddaea62f91e55517c318bbb07340e578855e78f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0598/5607] haskell-snap-core: update to version 0.9.2.1 --- pkgs/development/libraries/haskell/snap/core.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index a9eae8dca69..a39442aef07 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -7,15 +7,14 @@ cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.2"; - sha256 = "04c1i5ccsb76yw7nyj8sxxnwq3ym14iygc3immdn2lqrm424vkkp"; + version = "0.9.2.1"; + sha256 = "18i0hfzc37q12nyp7g4sc87s4xcqz1crjwpnhh4y5fw66glzmq3q"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath HUnit MonadCatchIOTransformers mtl random regexPosix text time transformers unixCompat unorderedContainers vector zlibEnum ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; -- GitLab From 8ab696d92feb6ec80a228a8216b3ad0b92d9c671 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0599/5607] haskell-snap-server: update to version 0.9.2.3 --- pkgs/development/libraries/haskell/snap/server.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 05cd0038b0b..4971fec3b1d 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -6,15 +6,14 @@ cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.2.2"; - sha256 = "1yfm09w1zybdsbn1rj9gdbrbh63lhmrykyg9rc2ys7fcaszvsx7c"; + version = "0.9.2.3"; + sha256 = "0wl7clzwrd34d32sikd6vkj3pla9yni26mmdsnrjw1s3lq412yqd"; buildDepends = [ attoparsec attoparsecEnumerator binary blazeBuilder blazeBuilderEnumerator caseInsensitive directoryTree enumerator filepath MonadCatchIOTransformers mtl network snapCore text time transformers unixCompat ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; -- GitLab From ba26b90dac08c791eaf937b795b1e986d365cf02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0600/5607] haskell-snap: update to version 0.9.2.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 2ceccbcf40e..9ff0bceb3c3 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.2"; - sha256 = "12sqc6j6v57jll8pkgzj71f6s435rwhqxqzl78l3rk4qn6sc0gzi"; + version = "0.9.2.1"; + sha256 = "0gxnkr6icx2g16w3ab54cqy4x15xj6y9cs6qv8dg0xamm7kyyfhl"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From c270c755480c8d4c06da6a2003729b7d1778a081 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2012 13:46:17 +0200 Subject: [PATCH 0601/5607] haskell-strptime: update to version 1.0.8 --- pkgs/development/libraries/haskell/strptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix index 2749353543d..bb30fe71cc3 100644 --- a/pkgs/development/libraries/haskell/strptime/default.nix +++ b/pkgs/development/libraries/haskell/strptime/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "strptime"; - version = "1.0.7"; - sha256 = "1x8z7ib66v8xif7gxdzsxi7ifnz75f4k2c1h2jsjq308srdzxjcr"; + version = "1.0.8"; + sha256 = "0cd4wzrg9zpnwrfpp6lxs1ib06h0fcsdqd3idsw663wr5lllfgdq"; buildDepends = [ time ]; meta = { description = "Efficient parsing of LocalTime using a binding to C's strptime, with some extra features (i.e. fractional seconds)"; -- GitLab From c4041d9c395c0492027fd6b686f5ba493f3bec1d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:36:13 -0400 Subject: [PATCH 0602/5607] grub: Fix build on Glibc 2.16 http://hydra.nixos.org/build/3046836 --- pkgs/tools/misc/grub/2.0x.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 4186a440535..e85e8de3dd8 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -4,14 +4,14 @@ let 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 { @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { # See . sed -i "tests/util/grub-shell.in" \ -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' + + # Fix for building on Glibc 2.16. Won't be needed once the + # gnulib in grub is updated. + sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h ''; prePatch = -- GitLab From adc0b5254507b321becbf48efc46af46cdd41317 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:40:09 -0400 Subject: [PATCH 0603/5607] libidn: Update to 1.25 http://hydra.nixos.org/build/3046837 --- pkgs/development/libraries/libidn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 6da91d98d13..94e785ee53b 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libidn-1.24"; + name = "libidn-1.25"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "1zrmbwxvgmv7d37sdnlfn4lf3pxc7vgng3lhl18pkjry0v30h5ys"; + sha256 = "05j7qcj7gb791k6ya2pwr7cq9yxgi0bjqiiwf9yq6pbai8r2brkz"; }; doCheck = ! stdenv.isDarwin; -- GitLab From 5833b2ee3074d5fe237c42eef4c72a3b08763d3d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:49:26 -0400 Subject: [PATCH 0604/5607] sharutils: Fix building on Glibc 2.16 http://hydra.nixos.org/build/3046590 --- pkgs/tools/archivers/sharutils/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 15b8ead7d38..bbf585d058b 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1mallg1gprimlggdisfzdmh1xi676jsfdlfyvanlcw72ny8fsj3g"; }; + preConfigure = + '' + # Fix for building on Glibc 2.16. Won't be needed once the + # gnulib in sharutils is updated. + sed -i '/gets is a security hole/d' lib/stdio.in.h + ''; + # GNU Gettext is needed on non-GNU platforms. buildInputs = [ gettext ]; -- GitLab From 6d27c9d5c3f00e35c8532130121c1463c220f59f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:53:56 -0400 Subject: [PATCH 0605/5607] gcc: Fix building on 32-bit Glibc 2.16 http://hydra.nixos.org/build/3046633 --- pkgs/development/compilers/gcc/4.6/default.nix | 5 ++++- .../compilers/gcc/4.6/siginfo_t_fix.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index c94a9285b29..ec229a46a54 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -51,7 +51,10 @@ let version = "4.6.3"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; - patches = [ ] + patches = + [ # Fix building on Glibc 2.16. + ./siginfo_t_fix.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 diff --git a/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch b/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch new file mode 100644 index 00000000000..5b589819656 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch @@ -0,0 +1,16 @@ +From http://pastebin.com/VkgE27Pd + +--- a/gcc/config/i386/linux-unwind.h 2011-01-03 20:52:22.000000000 +0000 ++++ b/gcc/config/i386/linux-unwind.h 2012-07-06 12:23:51.562859470 +0100 +@@ -133,9 +133,9 @@ + { + struct rt_sigframe { + int sig; +- struct siginfo *pinfo; ++ siginfo_t *pinfo; + void *puc; +- struct siginfo info; ++ siginfo_t info; + struct ucontext uc; + } *rt_ = context->cfa; + /* The void * cast is necessary to avoid an aliasing warning. \ No newline at end of file -- GitLab From a18bf8bc7b54a0b03455585b4cc7c8f730930c05 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 10:58:06 -0400 Subject: [PATCH 0606/5607] Remove obsolete Xfce 4.6 --- .../xfce-4.6/applications/mousepad.nix | 18 ----- .../xfce-4.6/applications/ristretto.nix | 24 ------- .../xfce-4.6/applications/terminal.nix | 23 ------- .../xfce-4.6/applications/xfce4-mixer.nix | 38 ----------- .../applications/xfce4-power-manager.nix | 24 ------- .../xfce-4.6/art/xfce4-icon-theme.nix | 17 ----- pkgs/desktops/xfce-4.6/core/exo.nix | 21 ------ .../xfce-4.6/core/gtk-xfce-engine.nix | 19 ------ pkgs/desktops/xfce-4.6/core/libxfce4menu.nix | 18 ----- pkgs/desktops/xfce-4.6/core/libxfce4util.nix | 18 ----- pkgs/desktops/xfce-4.6/core/libxfcegui4.nix | 29 -------- pkgs/desktops/xfce-4.6/core/thunar.nix | 25 ------- pkgs/desktops/xfce-4.6/core/xfce-utils.nix | 20 ------ pkgs/desktops/xfce-4.6/core/xfce4-panel.nix | 24 ------- pkgs/desktops/xfce-4.6/core/xfce4-session.nix | 22 ------- .../desktops/xfce-4.6/core/xfce4-settings.nix | 24 ------- pkgs/desktops/xfce-4.6/core/xfconf.nix | 20 ------ pkgs/desktops/xfce-4.6/core/xfdesktop.nix | 22 ------- pkgs/desktops/xfce-4.6/core/xfwm4.nix | 23 ------- pkgs/desktops/xfce-4.6/default.nix | 66 ------------------- pkgs/top-level/all-packages.nix | 4 -- 21 files changed, 499 deletions(-) delete mode 100644 pkgs/desktops/xfce-4.6/applications/mousepad.nix delete mode 100644 pkgs/desktops/xfce-4.6/applications/ristretto.nix delete mode 100644 pkgs/desktops/xfce-4.6/applications/terminal.nix delete mode 100644 pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix delete mode 100644 pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix delete mode 100644 pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/exo.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/libxfce4menu.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/libxfce4util.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/libxfcegui4.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/thunar.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/xfce-utils.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/xfce4-panel.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/xfce4-session.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/xfce4-settings.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/xfconf.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/xfdesktop.nix delete mode 100644 pkgs/desktops/xfce-4.6/core/xfwm4.nix delete mode 100644 pkgs/desktops/xfce-4.6/default.nix diff --git a/pkgs/desktops/xfce-4.6/applications/mousepad.nix b/pkgs/desktops/xfce-4.6/applications/mousepad.nix deleted file mode 100644 index 5912b21c766..00000000000 --- a/pkgs/desktops/xfce-4.6/applications/mousepad.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, gtk }: - -stdenv.mkDerivation rec { - name = "mousepad-0.2.16"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2"; - sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9"; - }; - - buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 gtk ]; - - meta = { - homepage = http://www.xfce.org/projects/mousepad/; - description = "A simple text editor for Xfce"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/applications/ristretto.nix b/pkgs/desktops/xfce-4.6/applications/ristretto.nix deleted file mode 100644 index aefabcb65fb..00000000000 --- a/pkgs/desktops/xfce-4.6/applications/ristretto.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar -, exo, dbus_glib, libxfce4util, libxfcegui4, xfconf }: - -stdenv.mkDerivation rec { - name = "ristretto-0.0.22"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.gz"; - sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a"; - }; - - buildInputs = - [ pkgconfig intltool libexif gtk thunar exo dbus_glib - libxfce4util libxfcegui4 xfconf - ]; - - NIX_LDFLAGS = "-lX11"; - - meta = { - homepage = http://goodies.xfce.org/projects/applications/ristretto; - description = "A fast and lightweight picture-viewer for the Xfce desktop environment"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/applications/terminal.nix b/pkgs/desktops/xfce-4.6/applications/terminal.nix deleted file mode 100644 index bd198a12af4..00000000000 --- a/pkgs/desktops/xfce-4.6/applications/terminal.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl -, pkgconfig, ncurses -, intltool, vte -, exo, libxfce4util -, gtk -}: - -stdenv.mkDerivation { - name = "xfce-terminal-0.4.5"; - - src = fetchurl { - url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.5.tar.bz2; - sha256 = "14w8mhmyrq6dd9574zfvq0pymknljckq6qgcv1r6c1r22jydrzcj"; - }; - - buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ]; - - meta = { - homepage = http://www.xfce.org/projects/terminal; - description = "A modern terminal emulator primarily for the Xfce desktop environment"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix deleted file mode 100644 index 76cc5ea028f..00000000000 --- a/pkgs/desktops/xfce-4.6/applications/xfce4-mixer.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gstreamer, gst_plugins_base -, gtk, libxfce4util, libxfcegui4, xfce4panel, xfconf, makeWrapper }: - -let - - # The usual Gstreamer plugins package has a zillion dependencies - # that we don't need for a simple mixer, so build a minimal package. - gst_plugins_minimal = gst_plugins_base.override { - minimalDeps = true; - }; - -in - -stdenv.mkDerivation rec { - name = "xfce4-mixer-4.6.1"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/xfce4-mixer/4.6/${name}.tar.bz2"; - sha1 = "e86163782fc4fc31671c7cb212d23d34106ad3af"; - }; - - buildInputs = - [ pkgconfig intltool glib gstreamer gst_plugins_minimal gtk - libxfce4util libxfcegui4 xfce4panel xfconf makeWrapper - ]; - - postInstall = - '' - mkdir -p $out/nix-support - echo ${gst_plugins_minimal} > $out/nix-support/propagated-user-env-packages - ''; - - meta = { - homepage = http://www.xfce.org/projects/xfce4-mixer; - description = "A volume control application for the Xfce desktop environment"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix deleted file mode 100644 index 65e906f5d83..00000000000 --- a/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf -, libxfcegui4, libxfce4util, libnotify, xfce4panel }: - -stdenv.mkDerivation rec { - name = "xfce4-power-manager-0.8.5"; - - src = fetchurl { - url = "http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2"; - sha1 = "b1ce0f120733ec1a6267d50ba5c2990bbbbccfd4"; - }; - - buildInputs = - [ pkgconfig intltool gtk dbus_glib xfconf libxfcegui4 libxfce4util - libnotify xfce4panel - ]; - - NIX_CFLAGS_COMPILE = "-I${libxfcegui4}/include/xfce4"; - - meta = { - homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager; - description = "A power manager for the Xfce Desktop Environment"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix deleted file mode 100644 index f42790c6216..00000000000 --- a/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk }: - -stdenv.mkDerivation rec { - name = "xfce4-icon-theme-4.4.3"; - - src = fetchurl { - url = "http://archive.xfce.org/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2"; - sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7"; - }; - - buildInputs = [ pkgconfig intltool gtk ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Icons for Xfce"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/exo.nix b/pkgs/desktops/xfce-4.6/core/exo.nix deleted file mode 100644 index 5115a402c0d..00000000000 --- a/pkgs/desktops/xfce-4.6/core/exo.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util -, enableHAL ? true, hal, dbus_glib }: - -stdenv.mkDerivation rec { - name = "exo-0.3.107"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha"; - }; - - buildInputs = - [ pkgconfig intltool URI glib gtk libxfce4util ] ++ - stdenv.lib.optionals enableHAL [ hal dbus_glib ]; - - meta = { - homepage = http://www.xfce.org/projects/exo; - description = "Application library for the Xfce desktop environment"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix deleted file mode 100644 index 156da1c6483..00000000000 --- a/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk }: - -stdenv.mkDerivation rec { - name = "gtk-xfce-engine-2.6.0"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha1 = "a7be2f330833d150c5fb37f68a4c2138348b5446"; - }; - - buildInputs = - [ pkgconfig intltool gtk ]; - - meta = { - homepage = http://www.xfce.org/; - description = "GTK+ theme engine for Xfce"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix b/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix deleted file mode 100644 index fda09979819..00000000000 --- a/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, gtk, libxfce4util }: - -stdenv.mkDerivation rec { - name = "libxfce4menu-4.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2"; - sha1 = "32a85c1ad31360347d5a2f240c4ddc08b444d124"; - }; - - buildInputs = [ pkgconfig glib intltool gtk libxfce4util ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Xfce menu support library"; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/libxfce4util.nix b/pkgs/desktops/xfce-4.6/core/libxfce4util.nix deleted file mode 100644 index ca90822cfd0..00000000000 --- a/pkgs/desktops/xfce-4.6/core/libxfce4util.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool }: - -stdenv.mkDerivation rec { - name = "libxfce4util-4.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2"; - sha256 = "10wcw7r8cjb0farffic037pcjr5bwrjrm8s3jrcb7c0b038pwbmf"; - }; - - buildInputs = [ pkgconfig glib intltool ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Basic utility non-GUI functions for Xfce"; - license = "bsd"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix b/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix deleted file mode 100644 index 056853f9eb1..00000000000 --- a/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf -, libglade, libstartup_notification }: - -stdenv.mkDerivation rec { - name = "libxfcegui4-4.6.4"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2"; - sha1 = "a12c79f8fa14c5d1fc0fca5615a451b7d23f8695"; - }; - - # By default, libxfcegui4 tries to install into libglade's prefix. - # Install into our own prefix instead. - preConfigure = - '' - configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0" - ''; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util xfconf libglade - libstartup_notification - ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Basic GUI library for Xfce"; - license = "LGPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/thunar.nix b/pkgs/desktops/xfce-4.6/core/thunar.nix deleted file mode 100644 index 2fecb7814b1..00000000000 --- a/pkgs/desktops/xfce-4.6/core/thunar.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util -, dbus_glib, libstartup_notification, xfconf, hal, xfce4panel -, gamin }: - -stdenv.mkDerivation rec { - name = "thunar-1.0.2"; - - src = fetchurl { - url = http://archive.xfce.org/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2; - sha1 = "f7ae00c32402e4bc502aba15477b78e2c558c7c3"; - }; - - buildInputs = - [ pkgconfig intltool exo gtk libxfce4util - dbus_glib libstartup_notification xfconf xfce4panel gamin - ]; - - propagatedBuildInputs = [ hal ]; - - meta = { - homepage = http://thunar.xfce.org/; - description = "Xfce file manager"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/xfce-utils.nix b/pkgs/desktops/xfce-4.6/core/xfce-utils.nix deleted file mode 100644 index ed2bfc56108..00000000000 --- a/pkgs/desktops/xfce-4.6/core/xfce-utils.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 }: - -stdenv.mkDerivation rec { - name = "xfce-utils-4.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha1 = "6373886c3d70e576859741bde747a235567ffd8e"; - }; - - configureFlags = "--with-xsession-prefix=$(out)/share/xsessions"; - - buildInputs = [ pkgconfig intltool gtk libxfce4util libxfcegui4 ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Utilities and scripts for Xfce"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix deleted file mode 100644 index 7708d019b90..00000000000 --- a/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 -, libwnck, exo, libstartup_notification }: - -stdenv.mkDerivation rec { - name = "xfce4-panel-4.6.4"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8"; - }; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util exo libwnck - libstartup_notification - ]; - - propagatedBuildInputs = [ libxfcegui4 ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Xfce panel"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-session.nix b/pkgs/desktops/xfce-4.6/core/xfce4-session.nix deleted file mode 100644 index fc56be085c4..00000000000 --- a/pkgs/desktops/xfce-4.6/core/xfce4-session.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 -, libwnck, dbus_glib, xfconf, libglade, xorg }: - -stdenv.mkDerivation rec { - name = "xfce4-session-4.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b"; - }; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck dbus_glib - xfconf libglade xorg.iceauth - ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Session manager for Xfce"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix deleted file mode 100644 index 0935955231e..00000000000 --- a/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfcegui4 -, libglade, xfconf, xorg, libwnck, libnotify }: - -stdenv.mkDerivation rec { - name = "xfce4-settings-4.6.5"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha1 = "c036cc2f3100a46b2649e678dff7c0106b219263"; - }; - - buildInputs = - [ pkgconfig intltool exo gtk libxfce4util libxfcegui4 libglade - xfconf xorg.libXi xorg.libXcursor libwnck libnotify - #gtk libxfce4util libxfcegui4 libwnck dbus_glib - #xfconf libglade xorg.iceauth - ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Settings manager for Xfce"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/xfconf.nix b/pkgs/desktops/xfce-4.6/core/xfconf.nix deleted file mode 100644 index 2fc88bd1258..00000000000 --- a/pkgs/desktops/xfce-4.6/core/xfconf.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }: - -stdenv.mkDerivation rec { - name = "xfconf-4.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha1 = "2b9656a1b7f323d2600ddc929191afb50c8018f8"; - }; - - buildInputs = [ pkgconfig intltool glib libxfce4util ]; - - propagatedBuildInputs = [ dbus_glib ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Simple client-server configuration storage and query system for Xfce"; - license = "GPLv2"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/xfdesktop.nix b/pkgs/desktops/xfce-4.6/core/xfdesktop.nix deleted file mode 100644 index 90a69bd8692..00000000000 --- a/pkgs/desktops/xfce-4.6/core/xfdesktop.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 -, libwnck, xfconf, libglade, libxfce4menu, xfce4panel, thunar, exo }: - -stdenv.mkDerivation rec { - name = "xfdesktop-4.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb"; - }; - - buildInputs = - [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf - libglade libxfce4menu xfce4panel thunar exo - ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Xfce desktop manager"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/core/xfwm4.nix b/pkgs/desktops/xfce-4.6/core/xfwm4.nix deleted file mode 100644 index 6e88ef9cd0d..00000000000 --- a/pkgs/desktops/xfce-4.6/core/xfwm4.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util -, libxfcegui4, xfconf, libwnck, libstartup_notification, xorg }: - -stdenv.mkDerivation rec { - name = "xfwm4-4.6.2"; - - src = fetchurl { - url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2"; - sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11"; - }; - - buildInputs = - [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf - libwnck libstartup_notification - xorg.libXcomposite xorg.libXfixes xorg.libXdamage - ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Window manager for Xfce"; - license = "GPLv2+"; - }; -} diff --git a/pkgs/desktops/xfce-4.6/default.nix b/pkgs/desktops/xfce-4.6/default.nix deleted file mode 100644 index 1769c3f7a04..00000000000 --- a/pkgs/desktops/xfce-4.6/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ callPackage, pkgs }: - -rec { - inherit (pkgs) gtk glib; - - #### CORE - - exo = callPackage ./core/exo.nix { - inherit (pkgs.perlPackages) URI; - }; - - libxfce4util = callPackage ./core/libxfce4util.nix { }; - - libxfcegui4 = callPackage ./core/libxfcegui4.nix { - inherit (pkgs.gnome) libglade; - }; - - libxfce4menu = callPackage ./core/libxfce4menu.nix { }; - - xfconf = callPackage ./core/xfconf.nix { }; - - xfwm4 = callPackage ./core/xfwm4.nix { - inherit (pkgs.gnome) libglade libwnck; - }; - - xfceutils = callPackage ./core/xfce-utils.nix { }; - - xfce4session = callPackage ./core/xfce4-session.nix { - inherit (pkgs.gnome) libglade libwnck; - }; - - xfce4settings = callPackage ./core/xfce4-settings.nix { - inherit (pkgs.gnome) libglade libwnck; - }; - - xfce4panel = callPackage ./core/xfce4-panel.nix { - inherit (pkgs.gnome) libwnck; - }; - - xfdesktop = callPackage ./core/xfdesktop.nix { - inherit (pkgs.gnome) libwnck libglade; - }; - - thunar = callPackage ./core/thunar.nix { }; - - gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; - - #### APPLICATIONS - - terminal = callPackage ./applications/terminal.nix { - inherit (pkgs.gnome) vte; - }; - - mousepad = callPackage ./applications/mousepad.nix { }; - - ristretto = callPackage ./applications/ristretto.nix { }; - - xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { }; - - xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; - - #### ART - - xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; - -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d44816448e..64c14a3ac96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8437,10 +8437,6 @@ let xfce = xfce48; - xfce46 = recurseIntoAttrs - (let callPackage = newScope pkgs.xfce46; in - import ../desktops/xfce-4.6 { inherit callPackage pkgs; }); - xfce48 = recurseIntoAttrs (let callPackage = newScope pkgs.xfce48; in import ../desktops/xfce-4.8 { inherit callPackage pkgs; }); -- GitLab From 3b04eca150860fecd74024d08edbeb13b3188953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 21 Sep 2012 14:52:14 +0200 Subject: [PATCH 0607/5607] freeimage: update to 3.15.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch sent by Carles Pagès. --- pkgs/development/libraries/freeimage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index ec381dc433a..c3cfa6e8c87 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "freeimage-3.15.0"; + name = "freeimage-3.15.3"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3150.zip; - sha256 = "0diyj862sdqwjqb7v2nccf8cl6886v937jkw6dgszp86qpwsfx3n"; + url = mirror://sourceforge/freeimage/FreeImage3153.zip; + sha256 = "0i60fn1n9rw55dci0yw92zrw7k1jz3f9kv2z1wxmh84s5ngxa626"; }; buildInputs = [ unzip ]; prePatch = '' -- GitLab From cd1a5cd78486958308331f8ff48819cfd1b1aea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 21 Sep 2012 14:59:40 +0200 Subject: [PATCH 0608/5607] gimp: updating from 2.8.0 to 2.8.2 --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index bf29ae13e5e..44d9330043f 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs }: stdenv.mkDerivation rec { - name = "gimp-2.8.0"; + name = "gimp-2.8.2"; src = fetchurl { url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - md5 = "28997d14055f15db063eb92e1c8a7ebb"; + md5 = "b542138820ca3a41cbd63fc331907955"; }; buildInputs = -- GitLab From 50aac3247a28e18113d021c4bb9d22e4a75886f9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 11:17:04 -0400 Subject: [PATCH 0609/5607] linux: Update to 3.2.30 --- 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 adac94e328b..57995bc1473 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.29"; + version = "3.2.30"; 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 = "1rnsfw59xwzf18s7z28f5qa74ndf0pc2jca42pdnysgq1wjq631p"; + sha256 = "1yg353alkk7vddd8b2d7dlgpwaxjigk8i9qq1xifln3i842zinvw"; }; config = configWithPlatform stdenv.platform; -- GitLab From 7057acb3226980e8556b9c69a25acee60af74442 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 13:28:14 -0400 Subject: [PATCH 0610/5607] systemd: Update to 190 --- pkgs/os-specific/linux/systemd/default.nix | 10 ++++----- .../fail-after-reaching-respawn-limit.patch | 12 ----------- .../linux/systemd/name_to_handle_at.patch | 21 +++++++++++++++++++ 3 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch create mode 100644 pkgs/os-specific/linux/systemd/name_to_handle_at.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 796aa9c32f8..99b50ab1b33 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,23 +1,23 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils -, glib, kbd +, glib, kbd, libxslt }: assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-188"; + name = "systemd-190"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "0nr1cg1mizbwcafjcqw3c30mx6xdv596jpbgjlxr6myvc5hfsfg8"; + sha256 = "1p3pf8gvx43g62l9x85l8ym12wc373cmaysi41sahjndp2agicig"; }; - patches = [ ./fail-after-reaching-respawn-limit.patch ]; + patches = [ ./name_to_handle_at.patch ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl - /* cryptsetup */ libuuid m4 usbutils pciutils glib + /* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt ]; configureFlags = 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 deleted file mode 100644 index 7271b5578d5..00000000000 --- a/pkgs/os-specific/linux/systemd/fail-after-reaching-respawn-limit.patch +++ /dev/null @@ -1,12 +0,0 @@ -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; - } - diff --git a/pkgs/os-specific/linux/systemd/name_to_handle_at.patch b/pkgs/os-specific/linux/systemd/name_to_handle_at.patch new file mode 100644 index 00000000000..99a7cc95723 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/name_to_handle_at.patch @@ -0,0 +1,21 @@ +diff --git a/src/shared/missing.h b/src/shared/missing.h +index c5bb71a..14abe4e 100644 +--- a/src/shared/missing.h ++++ b/src/shared/missing.h +@@ -209,12 +209,12 @@ static inline pid_t gettid(void) { + #endif + + #ifdef __x86_64__ +-# ifndef __NR_name_to_handle +-# define __NR_name_to_handle 303 ++# ifndef __NR_name_to_handle_at ++# define __NR_name_to_handle_at 303 + # endif + #else +-# ifndef __NR_name_to_handle +-# define __NR_name_to_handle 341 ++# ifndef __NR_name_to_handle_at ++# define __NR_name_to_handle_at 341 + # endif + #endif + -- GitLab From 0874615fcce838176a1626a35498258baccdfd9d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 13:32:37 -0400 Subject: [PATCH 0611/5607] Remove User Mode Linux It hasn't built in a long time and it's obsolete IMHO. --- pkgs/os-specific/linux/kernel/generic.nix | 13 +++---------- pkgs/os-specific/linux/kernel/linux-3.0.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.1.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.2.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.3.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.4.nix | 2 +- pkgs/os-specific/linux/kernel/linux-3.5.nix | 2 +- pkgs/os-specific/linux/uml-utilities/builder.sh | 17 ----------------- .../os-specific/linux/uml-utilities/default.nix | 13 ------------- pkgs/top-level/all-packages.nix | 8 -------- pkgs/top-level/release.nix | 1 - 11 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 pkgs/os-specific/linux/uml-utilities/builder.sh delete mode 100644 pkgs/os-specific/linux/uml-utilities/default.nix diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 9e8ee74acb1..48f050f98cc 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -27,9 +27,6 @@ # optionally be compressed with gzip or bzip2. kernelPatches ? [] -, # Whether to build a User-Mode Linux kernel. - userModeLinux ? false - , # Allows you to set your own kernel version suffix (e.g., # "-my-kernel"). localVersion ? "" @@ -63,7 +60,7 @@ let in stdenv.mkDerivation { - name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}"; + name = "linux-${version}"; enableParallelBuilding = true; @@ -84,7 +81,7 @@ stdenv.mkDerivation { kernelConfig = kernelConfigFun config; # For UML and non-PC, just ignore all options that don't apply (We are lazy). - ignoreConfigErrors = (userModeLinux || stdenv.platform.name != "pc"); + ignoreConfigErrors = stdenv.platform.name != "pc"; buildNativeInputs = [ perl mktemp ]; buildInputs = lib.optional (stdenv.platform.uboot != null) @@ -98,7 +95,6 @@ stdenv.mkDerivation { # Should we trust platform.kernelArch? We can only do # that once we differentiate i686/x86_64 in platforms. arch = - if userModeLinux then "um" else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.isArm then "arm" else @@ -129,10 +125,7 @@ stdenv.mkDerivation { meta = { description = - (if userModeLinux then - "User-Mode Linux" - else - "The Linux kernel") + + "The Linux kernel" + (if kernelPatches == [] then "" else " (with patches: " + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches)) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index f2a0c326ef8..def318a1f3a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +args @ { stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index 76e2942c6a3..0ec50303ee2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +args @ { stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 57995bc1473..2f36792d353 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +args @ { stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index c56df955b79..395b93e9f3f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +args @ { stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 9cf27901142..dbff9bba07e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +args @ { stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 8eb4a1dec2c..9bcc6514f49 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -1,4 +1,4 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" +args @ { stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools , ... }: diff --git a/pkgs/os-specific/linux/uml-utilities/builder.sh b/pkgs/os-specific/linux/uml-utilities/builder.sh deleted file mode 100644 index 00b40278889..00000000000 --- a/pkgs/os-specific/linux/uml-utilities/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -buildinputs="" -source $stdenv/setup - -tar xvfj $src -cd tools -[ -n "$tunctl" ] && sed -e '1s/.*/TUNCTL = tunctl/' -i Makefile -[ -z "$mconsole" ] && sed -e 's/mconsole//' -i Makefile - -mkdir $out -mkdir $out/bin -mkdir $out/lib -mkdir $out/lib/uml -make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml -make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml install -ln -s $out/lib/uml/port-helper $out/bin/port-helper -[ -z "$tunctl" ] || [ -f $out/bin/tunctl ] || fail_no_tunctl -[ -z "$mconsole" ] || [ -f $out/bin/uml_mconsole ] || fail_no_mconsole diff --git a/pkgs/os-specific/linux/uml-utilities/default.nix b/pkgs/os-specific/linux/uml-utilities/default.nix deleted file mode 100644 index 4ed7c6e8a3a..00000000000 --- a/pkgs/os-specific/linux/uml-utilities/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{lib, stdenv, fetchurl, linuxHeaders , readline, tunctl ? false, mconsole ? false}: - -stdenv.mkDerivation { - inherit tunctl mconsole; - buildInputs = lib.optional tunctl linuxHeaders - ++ lib.optional mconsole readline; - name = "uml-utilities-20040114"; - builder = ./builder.sh; - src = fetchurl { - url = http://nixos.org/tarballs/uml_utilities_20040114.tar.bz2; - md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64c14a3ac96..e2481ffd5a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6189,14 +6189,6 @@ let udisks = callPackage ../os-specific/linux/udisks { }; - uml = linux.override { - userModeLinux = true; - }; - - umlutilities = callPackage ../os-specific/linux/uml-utilities { - tunctl = true; mconsole = true; - }; - untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 68c387d2a55..3b0a015d6b4 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -299,7 +299,6 @@ with (import ./release-lib.nix); tinycc = ["i686-linux"]; uae = linux; udev = linux; - uml = ["i686-linux"]; unrar = linux; upstart = linux; usbutils = linux; -- GitLab From 4952fa98eed104e66798663008a648c5b9e8162e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 13:39:20 -0400 Subject: [PATCH 0612/5607] inetutils: Update to 1.9.1 and fix compilation http://hydra.nixos.org/build/3052788 --- pkgs/tools/networking/inetutils/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 6734465dbba..24d73ff4d6f 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,18 +1,26 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "inetutils-1.8"; + name = "inetutils-1.9.1"; src = fetchurl { url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "1iqihfv54nzjmclivys2dpcyfhavgynj8pp6r44a97jbw2p0nl68"; + sha256 = "0azzg6njgq79byl6960kb0wihfhhzf49snslhxgvi30ribgfpa82"; }; buildInputs = [ ncurses /* for `talk' */ ]; configureFlags = "--with-ncurses-include-dir=${ncurses}/include"; - doCheck = true; + preConfigure = '' + # Fix for building on Glibc 2.16. Won't be needed once the + # gnulib in inetutils is updated. + sed -i '/gets is a security hole/d' lib/stdio.in.h + ''; + + # Test fails with "UNIX socket name too long", probably because our + # $TMPDIR is too long. + #doCheck = true; postInstall = '' # XXX: These programs are normally installed setuid but since it -- GitLab From 205e9235fc8d29a6c5d9f87bd0da2108341ebc24 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 13:43:56 -0400 Subject: [PATCH 0613/5607] zile: Update to 2.4.8 and fix compilation http://hydra.nixos.org/build/3052831 --- pkgs/applications/editors/zile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 0d765a0ad5c..f5a07d72c0e 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, boehmgc, perl, help2man }: stdenv.mkDerivation rec { - name = "zile-2.4.7"; + name = "zile-2.4.8"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "1ak7qjb7s4whxg8qpkg7yixfnhinwfmzgav7rzi0kjmm93z35xcc"; + sha256 = "0jdwyyncplxpb32amf3qs3vsc3fcqmlb2hiayz1cmkg3ckhg94xp"; }; buildInputs = [ ncurses boehmgc ]; -- GitLab From efbca8426532d64a33d9b4f72fc679a696cdb147 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 13:51:28 -0400 Subject: [PATCH 0614/5607] libtasn1: Update to 2.13 and fix compilation http://hydra.nixos.org/build/3052733 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index f70f7d34801..f5c07f47379 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.12"; + name = "libtasn1-2.13"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0p8w38l04fgm82iqgl1abhb1ajp04v116bi6fd7lc3n80657l98f"; + sha256 = "14asfhi35pwc67v7abbwim344h444237bjaqp92gwhhx7m44cvm5"; }; doCheck = true; -- GitLab From beb5b65e9cf621ec5c58177d7a4273ef4f6cb5fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 14:57:12 -0400 Subject: [PATCH 0615/5607] systemd: Make "systemctl daemon-reexec" do the right thing on NixOS --- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/os-specific/linux/systemd/reexec.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/systemd/reexec.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 99b50ab1b33..bfc16871857 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1p3pf8gvx43g62l9x85l8ym12wc373cmaysi41sahjndp2agicig"; }; - patches = [ ./name_to_handle_at.patch ]; + patches = [ ./name_to_handle_at.patch ./reexec.patch ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl diff --git a/pkgs/os-specific/linux/systemd/reexec.patch b/pkgs/os-specific/linux/systemd/reexec.patch new file mode 100644 index 00000000000..ff13a44ca0b --- /dev/null +++ b/pkgs/os-specific/linux/systemd/reexec.patch @@ -0,0 +1,15 @@ +Make "systemctl daemon-reexec" do the right thing on NixOS. + +diff --git a/src/core/main.c b/src/core/main.c +index 04fc0b3..0f5b0e9 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1819,7 +1819,7 @@ finish: + char_array_0(sfd); + + i = 0; +- args[i++] = SYSTEMD_BINARY_PATH; ++ args[i++] = "/run/current-system/systemd/lib/systemd/systemd"; + if (switch_root_dir) + args[i++] = "--switched-root"; + args[i++] = arg_running_as == SYSTEMD_SYSTEM ? "--system" : "--user"; -- GitLab From 1fffc949565afe75a3193b620aeef4fb27f2ec37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 15:29:05 -0400 Subject: [PATCH 0616/5607] Fix evaluation on non-Linux platforms --- pkgs/development/interpreters/perl/5.16/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index 13d2fa5f54b..eefb098d46b 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -2,7 +2,7 @@ let - libc = stdenv.gcc.libc or "/usr"; + libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr"; in -- GitLab From fae03557fb0a00e87d22ce94ff274b47730f0950 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Sep 2012 22:46:35 -0400 Subject: [PATCH 0617/5607] systemd: Update to 191 --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- .../linux/systemd/name_to_handle_at.patch | 21 ------------------- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/name_to_handle_at.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index bfc16871857..752efed6b58 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,14 +6,14 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-190"; + name = "systemd-191"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1p3pf8gvx43g62l9x85l8ym12wc373cmaysi41sahjndp2agicig"; + sha256 = "0r0xz8dksacm20516kakqf6xchydhcc1lkvz3m75z1gbl6sa581g"; }; - patches = [ ./name_to_handle_at.patch ./reexec.patch ]; + patches = [ ./reexec.patch ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl diff --git a/pkgs/os-specific/linux/systemd/name_to_handle_at.patch b/pkgs/os-specific/linux/systemd/name_to_handle_at.patch deleted file mode 100644 index 99a7cc95723..00000000000 --- a/pkgs/os-specific/linux/systemd/name_to_handle_at.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/shared/missing.h b/src/shared/missing.h -index c5bb71a..14abe4e 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -209,12 +209,12 @@ static inline pid_t gettid(void) { - #endif - - #ifdef __x86_64__ --# ifndef __NR_name_to_handle --# define __NR_name_to_handle 303 -+# ifndef __NR_name_to_handle_at -+# define __NR_name_to_handle_at 303 - # endif - #else --# ifndef __NR_name_to_handle --# define __NR_name_to_handle 341 -+# ifndef __NR_name_to_handle_at -+# define __NR_name_to_handle_at 341 - # endif - #endif - -- GitLab From a45a8698b3c832f715fec50d0c7c1d5ac674d748 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 22 Sep 2012 09:29:51 -0400 Subject: [PATCH 0618/5607] nodePackages.node-expat --- pkgs/top-level/node-packages.nix | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 30ade238365..277b7cadd85 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -471,24 +471,26 @@ let self = { ]; }; - "mime" = self."mime-1.2.6"; + "mime" = self."mime-*"; - "mime->= 0.0.1" = self.buildNodePackage rec { - name = "mime-1.2.7"; + "mime->= 0.0.1" = self."mime-*"; + + "mime-1.2.6" = self.buildNodePackage rec { + name = "mime-1.2.6"; src = fetchurl { url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6"; + sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; }; deps = [ ]; }; - "mime-1.2.6" = self.buildNodePackage rec { - name = "mime-1.2.6"; + "mime-*" = self.buildNodePackage rec { + name = "mime-1.2.7"; src = fetchurl { url = "http://registry.npmjs.org/mime/-/${name}.tgz"; - sha256 = "7460134d6b4686d64fd1e7b878d34e2bdd258ad29b6665cf62e6d92659e81591"; + sha256 = "a80244918c9c75fa4d0b37f311920c7d5270aab9a05aca9a74783764ad152df6"; }; deps = [ @@ -547,6 +549,20 @@ let self = { ]; }; + "node-expat" = self."node-expat-*"; + + "node-expat-*" = self.buildNodePackage rec { + name = "node-expat-1.6.1"; + src = fetchurl { + url = "http://registry.npmjs.org/node-expat/-/${name}.tgz"; + sha256 = "15c0566889ef8a54b2b626956b7dfc160469eb6c0d44a582a0b1077fadf034d2"; + }; + deps = [ + + ]; + buildInputs = [ pkgs.expat ]; + }; + "node-gyp" = self."node-gyp-*"; "node-gyp-*" = self.buildNodePackage rec { -- GitLab From 48395bd3e44fa33f66e82a8b22e113b33ce30d60 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 22 Sep 2012 09:32:37 -0400 Subject: [PATCH 0619/5607] nodePackages.knox --- 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 277b7cadd85..5c6301ed2e0 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -445,6 +445,19 @@ let self = { ]; }; + "knox" = self."knox-*"; + + "knox-*" = self.buildNodePackage rec { + name = "knox-0.3.1"; + src = fetchurl { + url = "http://registry.npmjs.org/knox/-/${name}.tgz"; + sha256 = "d62623482cc2f8b2fe08ff0c0cf2ed7f35a320e806ebdfa6ac36df5486018517"; + }; + deps = [ + self."mime" + ]; + }; + "less" = self."less-1.3.0"; "less-1.3.0" = self.buildNodePackage rec { -- GitLab From 04cacaf628f7dc17a123730d63a58e84f24b58d5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Sep 2012 05:10:42 +0400 Subject: [PATCH 0620/5607] Julia: fresher revision with a fresher dependency --- pkgs/development/compilers/julia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index c1b607b725b..a01aa3aded4 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20120904"; + date = "20120922"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; - dsfmt_ver = "2.1"; + dsfmt_ver = "2.2"; openblas_ver = "v0.2.2"; lapack_ver = "3.4.1"; arpack_ver = "3.1.2"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { 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"; + sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899"; }; openblas_src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "b842bf4ae4d80f28803ec54f3da412a0248046a9"; - sha256 = "4d67f4f4d35c76ea8981198e42feb1c30a50ac7e1e15b752fa41b26ebadcd828"; + rev = "e1ba1ebf09da42a5bd7f4ed18f1595ae06032b4c"; + sha256 = "187e67a7c6bf44469e0e0dda41072ac8f3a40380ea9364ed07a4cadc08965663"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib -- GitLab From 37418b3f704e9f37a24175f4a3128e15310b414f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Sep 2012 21:39:26 +0400 Subject: [PATCH 0621/5607] Add farstream support to gajim --- .../networking/instant-messengers/gajim/default.nix | 4 +++- pkgs/development/libraries/farstream/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index cfd89874f49..1def7e2b1f0 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -8,7 +8,8 @@ let pkgconfig makeWrapper libglade pyopenssl libXScrnSaver libXt xproto libXext xextproto libX11 gtkspell aspell scrnsaverproto pycrypto pythonDBus pythonSexy - docutils pyasn1 + docutils pyasn1 farstream gst_plugins_bad gstreamer + gst_ffmpeg gst_python ]; in rec { @@ -37,6 +38,7 @@ rec { sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim" done '') ["wrapBinContentsPython"]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index b2b8ca6255b..3babcb82833 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base -, pygobject, gst_python, gupnp_igd }: +, pygobject, gst_python, gupnp_igd +, gst_plugins_good, gst_plugins_bad, gst_ffmpeg +}: stdenv.mkDerivation rec { name = "farstream-0.1.2"; @@ -8,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps"; }; - buildInputs = [ libnice python pygobject gst_python gupnp_igd ]; + buildInputs = [ libnice python pygobject gupnp_igd ]; buildNativeInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gstreamer gst_plugins_base ]; + propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python + gst_plugins_good gst_plugins_bad gst_ffmpeg + ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/Farstream; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2481ffd5a2..47c2561b565 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8683,7 +8683,7 @@ let gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy - docutils gtk; + docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python; dbus = dbus.libs; inherit (gnome) libglade; inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 -- GitLab From 22e050f8c6680d8de85c94229f5bafdefc6d7958 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 23 Sep 2012 19:56:15 +0200 Subject: [PATCH 0622/5607] linux: In case of an ARM kernel build, add extra include directories They are required in order to build some modules, like that of cryptodev. --- pkgs/os-specific/linux/kernel/builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 4c095bf8bbc..14d8108ba16 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -140,6 +140,10 @@ installPhase() { (cd arch/$archDir/include && cp -a asm/* $includeDir/asm/ || true) (cd arch/$archDir/include && cp -a generated/asm/* $includeDir/asm/ || true) (cd arch/$archDir/include/asm/mach-generic && cp -a * $includeDir/ || true) + # include files for special arm architectures + if [ "$archDir" == "arm" ]; then + cp -a --parents arch/arm/mach-*/include $out/lib/modules/$version/build + fi fi fi -- GitLab From 57b578189b4b6c868dc17772e0655347a330e37e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 23 Sep 2012 20:50:24 +0200 Subject: [PATCH 0623/5607] Adding cryptodev-linux, and made openssl use it optionally. I'm trying to get the CESA of the sheevaplug available to openssl. --- .../development/libraries/openssl/default.nix | 8 +++-- pkgs/os-specific/linux/cryptodev/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/cryptodev/default.nix diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 575b57eb872..48574a332c8 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, perl +, withCryptodev ? false, cryptodevHeaders }: let name = "openssl-1.0.0i"; @@ -45,6 +46,8 @@ stdenv.mkDerivation { patches = patchesCross false; + buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; + buildNativeInputs = [ perl ]; # On x86_64-darwin, "./config" misdetects the system as @@ -52,7 +55,8 @@ stdenv.mkDerivation { configureScript = if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; - configureFlags = "shared --libdir=lib"; + configureFlags = "shared --libdir=lib" + + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; makeFlags = "MANDIR=$(out)/share/man"; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix new file mode 100644 index 00000000000..4d748903493 --- /dev/null +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, kernel, onlyHeaders ? false }: + +stdenv.mkDerivation rec { + name = "cryptodev-linux-1.5"; + + src = fetchurl { + url = "http://download.gna.org/cryptodev-linux/${name}.tar.gz"; + sha256 = "13hybl5p0ck0vgi2gxmiwa2810gcfk78kdy17ai8nczj8il15mn0"; + }; + + buildPhase = if (!onlyHeaders) then '' + make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \ + INSTALL_PATH=$out + '' else ":"; + + installPhase = stdenv.lib.optionalString (!onlyHeaders) '' + make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \ + INSTALL_PATH=$out SUBDIRS=`pwd` modules_install + '' + '' + mkdir -p $out/include/crypto + cp crypto/cryptodev.h $out/include/crypto + ''; + + meta = { + description = "Device that allows access to Linux kernel cryptographic drivers"; + homepage = http://home.gna.org/cryptodev-linux/; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47c2561b565..9988ae8da32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4605,6 +4605,10 @@ let openssl = callPackage ../development/libraries/openssl { fetchurl = fetchurlBoot; + cryptodevHeaders = linuxPackages.cryptodev.override { + fetchurl = fetchurlBoot; + onlyHeaders = true; + }; }; ortp = callPackage ../development/libraries/ortp { }; @@ -5869,6 +5873,8 @@ let blcr = callPackage ../os-specific/linux/blcr { }; + cryptodev = callPackage ../os-specific/linux/cryptodev { }; + e1000e = callPackage ../os-specific/linux/e1000e {}; exmap = callPackage ../os-specific/linux/exmap { }; -- GitLab From 762c6b1b76c1042b32bc5eb7696491a8a715605e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 23 Sep 2012 21:41:24 +0200 Subject: [PATCH 0624/5607] cryptodev: fixing build problems Some paths/vars were wrong. --- pkgs/os-specific/linux/cryptodev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 4d748903493..c64d47d0d4d 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { buildPhase = if (!onlyHeaders) then '' make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \ - INSTALL_PATH=$out + SUBDIRS=`pwd` INSTALL_PATH=$out '' else ":"; installPhase = stdenv.lib.optionalString (!onlyHeaders) '' make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \ - INSTALL_PATH=$out SUBDIRS=`pwd` modules_install + INSTALL_MOD_PATH=$out SUBDIRS=`pwd` modules_install '' + '' mkdir -p $out/include/crypto cp crypto/cryptodev.h $out/include/crypto -- GitLab From 400db72f1d0e657154646f1a2e9b7208a9364926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Mon, 24 Sep 2012 02:27:34 +0400 Subject: [PATCH 0625/5607] games/warsow: Updated to 1.0. --- pkgs/games/warsow/default.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index c584319bdc9..66c33842b89 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,32 +1,33 @@ -{ stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libvorbis -, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal +{ stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis +, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal }: stdenv.mkDerivation rec { name = "warsow-${version}"; - version = "0.62"; - mversion = "0.61"; # sometimes only engine is updated + version = "1.0"; + mversion = "1.0"; # sometimes only engine is updated src1 = fetchurl { - url = "http://www.zcdn.org/dl/warsow_${version}_sdk.zip"; - sha256 = "0nb1z55lzmwarnn71dcyg9b3k7r7wxagqxks8a7rnlq7acsnra71"; + url = "http://www.warsow.net/download?dl=sdk"; + name = "warsow_${version}_sdk.tar.gz"; + sha256 = "08hfhx3ggb8v8lsb62ki5rhdhscg8j9sndlnllinf85da1f4nf9f"; }; src2 = fetchurl { - url = "http://www.zcdn.org/dl/warsow_${mversion}_unified.zip"; - sha256 = "1b5bv4dsly7i7c4fqlkckv4da1knxl9m3kg8nlgkgr8waczgvazv"; + url = "http://www.warsow.net/download?dl=linux"; + name = "warsow_${mversion}_unified.tar.gz"; + sha256 = "1v455v4lpqda7lf2yviasdrlibvb6bsyxcadgl8bd4jcvr8x4czr"; }; unpackPhase = '' - mkdir warsow_${version}_sdk + tar xf "$src1" cd warsow_${version}_sdk - unzip $src1 - unzip $src2 + tar xf "$src2" mkdir -p source/release/ - mv warsow_${mversion}_unified/basewsw source/release/ + mv warsow_${mversion}/basewsw source/release/ cd source ''; patchPhase = '' substituteInPlace snd_openal/snd_main.c --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; - buildInputs = [ unzip pkgconfig zlib curl libjpeg libvorbis libXxf86dga - libXxf86vm libXinerama SDL mesa openal ]; + buildInputs = [ unzip pkgconfig zlib curl libjpeg libpng libvorbis libtheora + libXxf86dga libXxf86vm libXinerama SDL mesa openal ]; installPhase = '' dest=$out/opt/warsow cd release -- GitLab From 1fd867426d2bd8caed499f9f18b619fc26b9f38d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 11:57:52 +0200 Subject: [PATCH 0626/5607] systemd: fix build on 32 bit machines --- pkgs/os-specific/linux/systemd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 752efed6b58..34409c296e9 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,7 +13,13 @@ stdenv.mkDerivation rec { sha256 = "0r0xz8dksacm20516kakqf6xchydhcc1lkvz3m75z1gbl6sa581g"; }; - patches = [ ./reexec.patch ]; + patches = [ ./reexec.patch ] ++ + # Remove this patch after the next update. + stdenv.lib.optional (stdenv.system == "i686-linux") (fetchurl { + url = "https://bugs.freedesktop.org/attachment.cgi?id=67621"; + name = "fix-32-bit-build.patch"; + sha256 = "1i4xn6lc6iapaasd2lz717b1zrq5ds5g18i7m509fgfwy7w7x95l"; + }); buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl -- GitLab From df80a705afaef485f241ecaf01ad7db1475234f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 11:21:52 +0200 Subject: [PATCH 0627/5607] haskell-happy: add version 1.18.10 --- .../tools/parsing/happy/1.18.10.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 7 ++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/tools/parsing/happy/1.18.10.nix diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix new file mode 100644 index 00000000000..d342d3381c8 --- /dev/null +++ b/pkgs/development/tools/parsing/happy/1.18.10.nix @@ -0,0 +1,18 @@ +{ cabal, mtl, perl }: + +cabal.mkDerivation (self: { + pname = "happy"; + version = "1.18.10"; + sha256 = "0jq6p5vvdh4wbam80q2d6j2fa6bmbgnbmqk1w9904x06g7vj1jf1"; + isLibrary = false; + isExecutable = true; + buildDepends = [ mtl ]; + buildTools = [ perl ]; + meta = { + homepage = "http://www.haskell.org/happy/"; + description = "Happy is a parser generator 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 d4ad6e0f0d0..bece113741c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -123,7 +123,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok GLUT = self.GLUT_2_3_0_0; # 7.6 ok - haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 fail + haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok HTTP = self.HTTP_4000_2_5; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok @@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 + happy = self.happy_1_18_10; # 7.6 ok }; haskellPlatformArgs_2012_2_0_0 = self : { @@ -1763,7 +1763,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happy_1_18_6 = callPackage ../development/tools/parsing/happy/1.18.6.nix {}; happy_1_18_8 = callPackage ../development/tools/parsing/happy/1.18.8.nix {}; happy_1_18_9 = callPackage ../development/tools/parsing/happy/1.18.9.nix {}; - happy = self.happy_1_18_9; + happy_1_18_10 = callPackage ../development/tools/parsing/happy/1.18.10.nix {}; + happy = self.happy_1_18_10; happyMeta = callPackage ../development/tools/haskell/happy-meta {}; -- GitLab From 7621bd32ae77db106406986170058e32aa2f1796 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 11:58:41 +0200 Subject: [PATCH 0628/5607] haskell-QuickCheck: update to version 2.5.1.1 --- .../libraries/haskell/QuickCheck/{2.5.nix => 2.5.1.1.nix} | 8 ++++---- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/libraries/haskell/QuickCheck/{2.5.nix => 2.5.1.1.nix} (65%) diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix similarity index 65% rename from pkgs/development/libraries/haskell/QuickCheck/2.5.nix rename to pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix index 127d90ca5e7..24e16a4955f 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix @@ -1,10 +1,10 @@ -{ cabal, extensibleExceptions, random }: +{ cabal, random }: cabal.mkDerivation (self: { pname = "QuickCheck"; - version = "2.5"; - sha256 = "0a4ibyw5abm7ds6pds41147phjkccx8v60vqdj05c5n28hbzbgbh"; - buildDepends = [ extensibleExceptions random ]; + version = "2.5.1.1"; + sha256 = "1ff2mhm27l8cc8nrsbw2z65dc9m7h879jykl5g7yqip5l88j0jcq"; + buildDepends = [ random ]; meta = { homepage = "http://code.haskell.org/QuickCheck"; description = "Automatic testing of Haskell programs"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bece113741c..e09b743ef0d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -132,7 +132,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 + QuickCheck = self.QuickCheck_2_5_1_1; # 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 ok @@ -1261,9 +1261,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); QuickCheck_2_4_0_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.0.1.nix {}; QuickCheck_2_4_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.4.1.1.nix {}; QuickCheck_2_4_2 = callPackage ../development/libraries/haskell/QuickCheck/2.4.2.nix {}; - QuickCheck_2_5 = callPackage ../development/libraries/haskell/QuickCheck/2.5.nix {}; + QuickCheck_2_5_1_1 = callPackage ../development/libraries/haskell/QuickCheck/2.5.1.1.nix {}; QuickCheck1 = self.QuickCheck_1_2_0_1; - QuickCheck2 = self.QuickCheck_2_5; + QuickCheck2 = self.QuickCheck_2_5_1_1; QuickCheck = self.QuickCheck2; RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; -- GitLab From fb37bdc58322b47226dffd21f082710a9cdfac4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 11:58:57 +0200 Subject: [PATCH 0629/5607] haskell-threads: add version 0.5.0.1 --- .../libraries/haskell/threads/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/threads/default.nix diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix new file mode 100644 index 00000000000..8f5008032f6 --- /dev/null +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -0,0 +1,14 @@ +{ cabal, baseUnicodeSymbols, stm }: + +cabal.mkDerivation (self: { + pname = "threads"; + version = "0.5.0.1"; + sha256 = "0amyaxa70q6v021nab6v3cfqc40mwj5dr2fwla9d4bm6ppmq6lyy"; + buildDepends = [ baseUnicodeSymbols stm ]; + meta = { + homepage = "https://github.com/basvandijk/threads"; + description = "Fork threads and wait for their result"; + 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 e09b743ef0d..e7157bc507b 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); threadmanager = callPackage ../development/libraries/haskell/threadmanager {}; + threads = callPackage ../development/libraries/haskell/threads {}; + time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {}; -- GitLab From 5e85ad98cdce736d48c6573724adc061cdfd869b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:06 +0200 Subject: [PATCH 0630/5607] haskell-MissingH: update to version 1.2.0.0 --- pkgs/development/libraries/haskell/MissingH/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index 52e26fe1f83..659a1158d0f 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -1,15 +1,15 @@ { cabal, filepath, hslogger, HUnit, mtl, network, parsec, random -, regexCompat +, regexCompat, time }: cabal.mkDerivation (self: { pname = "MissingH"; - version = "1.1.1.0"; - sha256 = "1i2fdr6p0jnn9w865ngjcchbsamrvnvdf9c4vzhjhzy500z2k1ry"; + version = "1.2.0.0"; + sha256 = "0bqg1j2pvm0ixrbnsxrr5kgibhbp191irhcavqlwfwgaxhrpqnm1"; isLibrary = true; isExecutable = true; buildDepends = [ - filepath hslogger HUnit mtl network parsec random regexCompat + filepath hslogger HUnit mtl network parsec random regexCompat time ]; meta = { homepage = "http://software.complete.org/missingh"; -- GitLab From 85982d0e895df2bd1826c5614e0bcff47310c62e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:06 +0200 Subject: [PATCH 0631/5607] haskell-attoparsec-binary: update to version 0.2 --- .../libraries/haskell/attoparsec-binary/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix index f4e85d5ebd5..623ae104090 100644 --- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "attoparsec-binary"; - version = "0.1.0.1"; - sha256 = "1d3zjr8bh6d44v1vid0cvrrbyhn7xj4bn96vy36dzk7h7p87bzxa"; + version = "0.2"; + sha256 = "02vswxsgayw50xli7mbacsjmk1diifzkfgnyfn9ck5mk41dl9rh5"; buildDepends = [ attoparsec ]; - patches = [ ./attoparsec-binary-ghc7.6.1.patch ]; meta = { description = "Binary processing extensions to Attoparsec"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 4d9e6486c19ef671049baab48bc843b41b906dd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:06 +0200 Subject: [PATCH 0632/5607] haskell-bmp: update to version 1.2.2.1 --- pkgs/development/libraries/haskell/bmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 705b462a6d5..e018ac7a8d2 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "bmp"; - version = "1.2.1.1"; - sha256 = "0s5srqkaccrwh9gsxn9kmyh4jf0qf40ix8ipi0b70fbbffr97hmk"; + version = "1.2.2.1"; + sha256 = "0yxkkvpgavk9im9i9f6zpzc1n5nj2g4qsk4ck51aqz2fv6z1rhiy"; buildDepends = [ binary ]; meta = { homepage = "http://code.ouroborus.net/bmp"; -- GitLab From 55cbcc15ef83282c822f53930affc92a1679b5c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:06 +0200 Subject: [PATCH 0633/5607] haskell-cabal-file-th: update to version 0.2.3 --- pkgs/development/libraries/haskell/cabal-file-th/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index c57e46cb8bb..55b4fea36fe 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal-file-th"; - version = "0.2.2"; - sha256 = "1ql2gmg3mdfkmnk1m3966npr6l1in15fzlkbn7dr1cp4s90igqhy"; + version = "0.2.3"; + sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8"; buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/nkpart/cabal-file-th"; -- GitLab From 561062b21d9bb23b57a860382f76062d6a0f0f01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:06 +0200 Subject: [PATCH 0634/5607] haskell-dstring: update to version 0.4.0.4 --- pkgs/development/libraries/haskell/dstring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index e025b00f837..4b5dd2b3888 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dstring"; - version = "0.4.0.3"; - sha256 = "0wzj1wzls7w79ac84sc5msblh2dmfmcxm77drpdqdirl1pwdlq9c"; + version = "0.4.0.4"; + sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm"; buildDepends = [ baseUnicodeSymbols dlist ]; meta = { homepage = "https://github.com/basvandijk/dstring"; -- GitLab From 9633471a678bcfc502e1484c4c75bdcca68f6cac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:06 +0200 Subject: [PATCH 0635/5607] haskell-gloss: update to version 1.7.6.1 --- 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 a4b613dd756..e988eae9adf 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.5.2"; - sha256 = "1lasq106slq57k832pqhaq5wh7hwxn5bzg7rjk95rf3rrq5xb9f5"; + version = "1.7.6.1"; + sha256 = "1gwmrnwn1x0hs9jp2qsjp737wahbdsjrp2kp7gpz9pkq4a6jmjmx"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; -- GitLab From fb7be61740ac40f8a989a3dbbda7786a978d8370 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:06 +0200 Subject: [PATCH 0636/5607] haskell-hakyll: update to version 3.4.2.1 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index e0b7d4637d5..c3e10a31572 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.4.2.0"; - sha256 = "18yqbiw75wjzc48s5v2aisdc5w2q1rkijxa5p4f4i17flif72j2n"; + version = "3.4.2.1"; + sha256 = "0h2xs4qwy2lqdg4v7zbzfmkvr411j34fba3dm05skq7d908wjji0"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer -- GitLab From 0f15bcdc78e1a21ac3e5dcdef6ef1ea3c105e181 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0637/5607] haskell-hamlet: update to version 1.1.0.3 --- 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 31d1ad66d2e..3c638cf69fb 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.2"; - sha256 = "0knkc43ldz3jhn3pmsysqbzlsp8akh9kiyy2jncra9y0xhminpqy"; + version = "1.1.0.3"; + sha256 = "0mljr7jbixji69xwgzfm0ka5r2jvlg4vmkd5ih6r91jk83j04bf9"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; -- GitLab From a5c2666c4f24ceeb7fcc3c3409acb2d335e67561 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0638/5607] haskell-happstack-server: update to version 7.0.5 --- .../libraries/haskell/happstack/happstack-server.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 06b882c20bb..5d4b4365f39 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,19 +1,19 @@ { cabal, base64Bytestring, blazeHtml, extensibleExceptions , filepath, hslogger, html, monadControl, mtl, network, parsec -, sendfile, syb, systemFilepath, text, time, transformers +, sendfile, syb, systemFilepath, text, threads, time, transformers , transformersBase, utf8String, xhtml, zlib }: cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.0.4"; - sha256 = "168201z5slm6mrkckpdpshgaiz29k9j1j97vmbrybprj0zhcrl7r"; + version = "7.0.5"; + sha256 = "11ialzvjdqmf62yl5r9yxir8fg5agfg1fysf3c3ja5456k07b466"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath - text time transformers transformersBase utf8String xhtml zlib + text threads time transformers transformersBase utf8String xhtml + zlib ]; - jailbreak = true; meta = { homepage = "http://happstack.com"; description = "Web related tools and services"; -- GitLab From b2505f6eaf130482cabf860c79db6149de5e9afa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0639/5607] haskell-liblastfm: update to version 0.0.3.6 --- pkgs/development/libraries/haskell/liblastfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index 45cdfb09d66..17489b157a2 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "liblastfm"; - version = "0.0.3.5"; - sha256 = "185vk5648m2xf74fmv7ccrbzvqd5qmlfa9fnn0ywv3ikmf61y0fg"; + version = "0.0.3.6"; + sha256 = "0xmrciv489dvksgpg9g83kna34x1amsx45wvpngcpnx4m44fcp4w"; buildDepends = [ aeson curl mtl pureMD5 urlencoded utf8String xml ]; -- GitLab From a6f1f51ccdfe8745da1e8231b98529a87a3c11a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0640/5607] haskell-monad-logger: update to version 0.2.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 740b68edb96..0a5f52512c6 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.1"; - sha256 = "151brb5h92xc0mhfqcapmxib7vh2k36rsw493fxbn3256xkzc8gk"; + version = "0.2.1"; + sha256 = "00ssh60rxw7dg1dcfh8kr4mg9p7pvvvmjf9xd8kvxbrb9s3nkc4s"; buildDepends = [ fastLogger resourcet text transformers ]; meta = { homepage = "https://github.com/kazu-yamamoto/logger"; -- GitLab From 86d28b446036b7a80d10956d934f9cbebb0f4778 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0641/5607] haskell-path-pieces: update to version 0.1.2 --- pkgs/development/libraries/haskell/path-pieces/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index d4f52aef58e..5abc6309146 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "path-pieces"; - version = "0.1.1"; - sha256 = "17ymk2azgz2c1hwnzqd9xy77hh51mvrgz4zs7lz4ik6rnvvihraz"; + version = "0.1.2"; + sha256 = "1cxsa8lq1f2jf86iv6f17nraiav8k2vzjxln1y7z45qhcp1sbbaa"; buildDepends = [ text time ]; meta = { - homepage = "http://github.com/snoyberg/path-pieces"; description = "Components of paths"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From d140ba4a6fccf05ac4a4cdcfc03e7c9c73dd83ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0642/5607] haskell-pathtype: update to version 0.5.3 --- pkgs/development/libraries/haskell/pathtype/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix index f08ded72968..f0be81e64ae 100644 --- a/pkgs/development/libraries/haskell/pathtype/default.nix +++ b/pkgs/development/libraries/haskell/pathtype/default.nix @@ -1,10 +1,10 @@ -{ cabal, QuickCheck }: +{ cabal, QuickCheck, time }: cabal.mkDerivation (self: { pname = "pathtype"; - version = "0.5.2"; - sha256 = "0rbmq6kzz2l07q9a5k888scpn62hnw2hmzz4ysprhfgdnn5b2cvi"; - buildDepends = [ QuickCheck ]; + version = "0.5.3"; + sha256 = "11plb7xw4j8vjziw1q0ymx33p6185cxd2hqrxw2hgsfzf2b9dvqg"; + buildDepends = [ QuickCheck time ]; meta = { homepage = "http://code.haskell.org/pathtype"; description = "Type-safe replacement for System.FilePath etc"; -- GitLab From 2e88930b1b9b2c71af1312e5474fbd889f5bbad4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0643/5607] haskell-persistent-template: update to version 1.0.0.2 --- .../libraries/haskell/persistent-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index f87e6348963..8d09c593170 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.1"; - sha256 = "0dvhxcyzqv4h3n5nnaglgq2pipynax2nrsdsgj3wgyk1a5k8wdrw"; + version = "1.0.0.2"; + sha256 = "0skd1gfrxq8mpa2g56b2wn83zw4zca5q2dxyjf6d7k6sh9sc9iz8"; buildDepends = [ aeson monadControl persistent text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; -- GitLab From 77cfb32d179cadcf5d2f98c2c94ba38fa0ca0ad9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:07 +0200 Subject: [PATCH 0644/5607] haskell-persistent: update to version 1.0.1.2 --- 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 73bb01d7075..b4010959d77 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.1"; - sha256 = "05jzraw8g87vbd5qqrpvivzaz8k50sm9dlabd86a6n1hpcd7xaka"; + version = "1.0.1.2"; + sha256 = "0gw635mhbn6w8aswiw9j41rdpi7rhnnhay2qgvlc8103s0g5lp9j"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit -- GitLab From ec7e8fe127a17eb284be65f71b1b721dceef1ab6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0645/5607] haskell-repa-algorithms: update to version 3.2.2.1 --- .../development/libraries/haskell/repa-algorithms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index d8a1e61c5d7..2385066116a 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-algorithms"; - version = "3.2.1.1"; - sha256 = "19gc2vbkqxysnm0argksn8c3cv7vf30hkdycgv8fdfn0yc95xz0v"; + version = "3.2.2.1"; + sha256 = "1g6cf70bmkglx0b92kxazaaap75s55fqpp1g7qiskbj2vzvppsg3"; buildDepends = [ repa vector ]; extraLibraries = [ llvm ]; meta = { -- GitLab From 48b987139c9f55dee6afff58aed51a0252d6b8ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0646/5607] haskell-repa-examples: update to version 3.2.2.1 --- pkgs/development/libraries/haskell/repa-examples/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 1f3e66e5e08..6d87b10f429 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-examples"; - version = "3.2.1.1"; - sha256 = "0nbdp3vwg7ha9vhz7f2kys3jxdlwiihxz031cfpkv2si5ci3gy1b"; + version = "3.2.2.1"; + sha256 = "17v7ay33fwxjm0ip09jhh979rc6hzfxrrj1hkwj7x4x9gkd79yn7"; isLibrary = false; isExecutable = true; buildDepends = [ random repa repaAlgorithms repaIo vector ]; -- GitLab From 4635bf2bfff18462ef94c5af650da5f3dbaf59ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0647/5607] haskell-repa-io: update to version 3.2.2.1 --- pkgs/development/libraries/haskell/repa-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 293a7bc6d58..98111abcc14 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa-io"; - version = "3.2.1.1"; - sha256 = "156amnlqsxhwalnc4nypcd66znv2f8c71d5xi8ja5g8d9f1yg02g"; + version = "3.2.2.1"; + sha256 = "0wcg4a8z6qf7jg353b89ci4pzqvb7pnzgb6ml3av6l54n9rg4vsp"; buildDepends = [ binary bmp repa vector ]; meta = { homepage = "http://repa.ouroborus.net"; -- GitLab From dc15f8716eca76c3f93d15215b282d81b8d46115 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0648/5607] haskell-repa: update to version 3.2.2.1 --- pkgs/development/libraries/haskell/repa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index b6102d45572..e0a8e591a5b 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "3.2.1.1"; - sha256 = "0jzcy3xdlwmcjq1mpfqh0axcgbj3i03nxg7blw2sly8qrgfl0ri1"; + version = "3.2.2.1"; + sha256 = "0k8i4gm74gc19kfmg2790x1i6im58nqfblq2fq2bilh6rsj8hxh0"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; -- GitLab From 4eca3fc6006135b23b6da0aefd4023310d60b2d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0649/5607] haskell-repr: update to version 0.4.1.3 --- pkgs/development/libraries/haskell/repr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix index 2558f4fbd31..c44735eda00 100644 --- a/pkgs/development/libraries/haskell/repr/default.nix +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repr"; - version = "0.4.1.2"; - sha256 = "09rv23p1hvvfw5wnhiawgrpqgqa4i0d00skyj9z1jj6bfxk5avjs"; + version = "0.4.1.3"; + sha256 = "1y1zl81yjc9jrci83bm6bn8hrfqf6x25vxzkhrkydhhwcwqfqaj5"; buildDepends = [ baseUnicodeSymbols dstring random stringCombinators ]; -- GitLab From e7b6f8f0599725ab73a810f788ad1c18ede82fbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0650/5607] haskell-shakespeare-css: update to version 1.0.1.5 --- .../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 a64e9acc7d7..54bc170f069 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.4"; - sha256 = "0avixf7z3hcvgcijgrm7hisr8i8waa8nb435gv8lv5vvz8yq3k0n"; + version = "1.0.1.5"; + sha256 = "0arfc64wsyn0af34blbjgxxr9xxk9k61p7zy4b7m3ynnpxqh2hzn"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; -- GitLab From 94acf765accef0724ffd1e41d3b53449958d704f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0651/5607] haskell-shakespeare-js: update to version 1.0.0.6 --- 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 ff2f0c09e0c..bed71a7c14e 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.5"; - sha256 = "1d4na2q1q798ki5f84gpf89ri26qmrxqrwbw7mmlrfwkj1qw69rs"; + version = "1.0.0.6"; + sha256 = "0ilzg5g2pvq36cv5fhyv9sqz3nnj9gscrc2y4vlqkm6f1ks3gyg8"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; -- GitLab From 911aca1f74d5805c992f0c3f25901c0520504d70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0652/5607] haskell-shakespeare-text: update to version 1.0.0.5 --- .../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 fbc31e3eda1..4e9516d107c 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.4"; - sha256 = "14kas2m7kbv1f49qpx6z097r707l3gqp9lwvh0q42cc6rlwab5l7"; + version = "1.0.0.5"; + sha256 = "176yzx43sh0fnxpszn8kximd6i96yf2s374z55kvc1kspf7jk736"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; -- GitLab From 46b259a0cc94ca8d5bd93891041d9f622f51b856 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:08 +0200 Subject: [PATCH 0653/5607] haskell-shakespeare: update to version 1.0.1.4 --- 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 3cc2456a7d5..fca3d04a305 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.3"; - sha256 = "1m0ca3b73fiph939kpd94mxh4a606mv3hafbwg9j4is38mv5kn8d"; + version = "1.0.1.4"; + sha256 = "01gw31g75v8r8hjvkv7mxvx7736ib9x9nqpxavpbrfplyxgk2y31"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; -- GitLab From f548355ce8ac38a407990940b3e5ee0a7cd0babc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:09 +0200 Subject: [PATCH 0654/5607] haskell-string-combinators: update to version 0.6.0.4 --- .../libraries/haskell/string-combinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index 03587d24d02..bfc38fb07e8 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "string-combinators"; - version = "0.6.0.3"; - sha256 = "18jawxqvcj7zpvb0wf1zln12s03mp6nglhv5ccywrkb5x0r0557j"; + version = "0.6.0.4"; + sha256 = "0r1za5ypx9fz073h1yljjdkxmz0h77vg94bk827ndwkfgzgpzvh7"; buildDepends = [ baseUnicodeSymbols ]; meta = { homepage = "https://github.com/basvandijk/string-combinators"; -- GitLab From 56c3274d20db378ba44c61e531d04a95006fdff1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:09 +0200 Subject: [PATCH 0655/5607] haskell-vector-space-points: update to version 0.1.2.0 --- .../libraries/haskell/vector-space-points/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix index 7497ed59c4f..1debf3f0f71 100644 --- a/pkgs/development/libraries/haskell/vector-space-points/default.nix +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "vector-space-points"; - version = "0.1.1.1"; - sha256 = "08lar9ydni87w79y86xk2blddsgx5n6gwz3262w8z32dgy9lrmwx"; + version = "0.1.2.0"; + sha256 = "19azl6g14rsxs0qbik6x637qw9jv4xl01w65xd0xh7833mypmj6d"; buildDepends = [ newtype vectorSpace ]; meta = { description = "A type for points, as distinct from vectors"; -- GitLab From 878595c2a032fc505ba9d08620167fbcdf2ac478 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:06:09 +0200 Subject: [PATCH 0656/5607] haskell-hslogger: update to version 1.2.1 --- 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 4128f6b7d09..4443637def4 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.2.0"; - sha256 = "17ipnz7zd403x2gi2086chrgcnk76304hdxr5mv4phg4rm8w226y"; + version = "1.2.1"; + sha256 = "1vfdf7i6fd4mb3rn57z3wn7bhw4z5g47f4vggb4sms5rg4zqqly5"; isLibrary = true; isExecutable = true; buildDepends = [ mtl network time ]; -- GitLab From d2b8b9e45a7497c7b64444bde8e63a665c896cca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 12:08:09 +0200 Subject: [PATCH 0657/5607] haskell-defaults.nix: drop override of repaExamples attribute in older compilers --- pkgs/top-level/haskell-defaults.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 803b45061bd..4b2f5fc4613 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -41,7 +41,6 @@ ghc704Prefs = self : self.haskellPlatformArgs_2011_4_0_0 self // { haskellPlatform = self.haskellPlatform_2011_4_0_0; - 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; }; @@ -50,7 +49,6 @@ ghc703Prefs = self : self.haskellPlatformArgs_2011_2_0_1 self // { haskellPlatform = self.haskellPlatform_2011_2_0_1; - 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; }; @@ -61,7 +59,6 @@ ghc701Prefs = self : self.haskellPlatformArgs_2011_2_0_0 self // { haskellPlatform = self.haskellPlatform_2011_2_0_0; - 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; }; @@ -73,7 +70,6 @@ self : self.haskellPlatformArgs_2010_2_0_0 self // { haskellPlatform = self.haskellPlatform_2010_2_0_0; mtl1 = self.mtl_1_1_0_2; - 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; deepseq = self.deepseq_1_1_0_2; @@ -86,7 +82,6 @@ haskellPlatform = self.haskellPlatform_2010_1_0_0; mtl1 = self.mtl_1_1_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; - 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; }; @@ -100,7 +95,6 @@ mtl1 = self.mtl_1_1_0_2; extensibleExceptions = self.extensibleExceptions_0_1_1_0; text = self.text_0_11_0_6; - 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; }; deepseq = self.deepseq_1_1_0_2; monadPar = self.monadPar_0_1_0_3; -- GitLab From 964efb4adc39048a4989023d6d9ae07bc6cd907c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 13:25:19 +0200 Subject: [PATCH 0658/5607] magit: update to version 1.2.0 --- .../editors/emacs-modes/magit/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index f096d3b0057..580b2761fa9 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchurl, emacs, texinfo }: +{ stdenv, fetchurl, emacs, texinfo, unzip }: let - version = "1.1.1"; + version = "1.2.0"; in stdenv.mkDerivation { name = "magit-${version}"; src = fetchurl { - url = "http://github.com/downloads/magit/magit/magit-${version}.tar.gz"; - sha256 = "0zp5qxippmalin2fr73w2alf2w7ilcahmybzdvgn4ch2s3dgvzcz"; + url = "https://github.com/magit/magit/zipball/${version}"; + sha256 = "1877s8ikvcb457mmljmw366h6pgg4zzx98qfazhqj8snl4yqsj4i"; + name = "magit-${version}.zip"; }; - buildInputs = [emacs texinfo]; + buildInputs = [ emacs texinfo unzip ]; configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )"; + # Add (require 'magit-site-init) to your ~/.emacs file to set-up magit mode. + postInstall = '' + mv $out/etc/emacs/site-start.d/50magit.el $out/share/emacs/site-lisp/magit-site-init.el + sed -i -e 's|50magit|magit-site-init|' $out/share/emacs/site-lisp/magit-site-init.el + rmdir $out/etc/emacs/site-start.d $out/etc/emacs $out/etc + ''; + meta = { + homepage = "https://github.com/magit/magit"; description = "Magit, an Emacs interface to Git"; + license = "GPLv3+"; longDescription = '' With Magit, you can inspect and modify your Git repositories with @@ -30,8 +40,6 @@ stdenv.mkDerivation { save you from learning Git itself. ''; - license = "GPLv3+"; - homepage = "https://github.com/magit/magit"; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ simons ludo ]; }; -- GitLab From 625e2e45f7088b5dae373ef44adf33ba2991a5fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 13:28:31 +0200 Subject: [PATCH 0659/5607] git: update to version 1.7.12.1 --- .../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 b48c5f05d9e..916aa69b05f 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.12"; + version = "1.7.12.1"; 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 = "3b8661782dc280d3d4be5193bcb8a1895c1ba272cf02efb70857bbcc4415f505"; + sha256 = "a0c2b7e122ac2e40fe5b69baeeaac24b237a1341f08ba848cadaa835a0dbcfcd"; }; patches = [ ./docbook2texi.patch ]; -- GitLab From 436d8ce1f67f4cd5a645790d2bf2bc4a3717c1c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 14:53:19 +0200 Subject: [PATCH 0660/5607] alsa-utils: update to version 1.0.26 ftp://ftp.alsa-project.org/ appears to be offline. We download from a mirror until that issue has been resolved. --- pkgs/os-specific/linux/alsa-utils/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index ca3a45bddfd..5b0d61a07b0 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -1,16 +1,17 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses}: stdenv.mkDerivation rec { - name = "alsa-utils-1.0.25"; - + name = "alsa-utils-1.0.26"; + src = fetchurl { - url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; - sha256 = "0b1hbdq1bdkbz72zdfy5cgp75jqpysb0mqb0n9wy5gsbccpnlrrf"; + # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; + url = "http://gd.tuwien.ac.at/opsys/linux/alsa/utils/${name}.tar.bz2"; + sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq"; }; - + buildInputs = [ alsaLib ncurses ]; buildNativeInputs = [ gettext ]; - + configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d"; installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; -- GitLab From 612ed601f288769c86139298323eab07130cb9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 24 Sep 2012 15:23:43 +0200 Subject: [PATCH 0661/5607] gcc47: updating to 4.7.2 --- pkgs/development/compilers/gcc/4.7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 02733d04203..2a45dc50c6d 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -49,7 +49,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.7.1"; +let version = "4.7.2"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -164,7 +164,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0vs0v89zzgkngkw2p8kdynyk7j8ky4wf6zyrg3rsschpl1pky28n"; + sha256 = "115h03hil99ljig8lkrq4qk426awmzh0g99wrrggxf8g07bq74la"; }; inherit patches; -- GitLab From d1279b6a0b0ab540cc6803557227c3a9ff9218c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 24 Sep 2012 15:40:33 +0200 Subject: [PATCH 0662/5607] guile: Explicitly link against libgcc_s. --- pkgs/development/interpreters/guile/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index cc49ab87af8..52d8d432032 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -32,6 +32,10 @@ patches = [ ./disable-gc-sensitive-tests.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); + # Explicitly link against libgcc_s, to work around the infamous + # "libgcc_s.so.1 must be installed for pthread_cancel to work". + LDFLAGS = "-lgcc_s"; + postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" -- GitLab From ca6b9bdf17599ae0749a36f27fa363764c859a5a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Sep 2012 15:53:57 +0200 Subject: [PATCH 0663/5607] alsa-utils: choose yet another mirror again --- pkgs/os-specific/linux/alsa-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 5b0d61a07b0..7e4a97a1ab1 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"; - url = "http://gd.tuwien.ac.at/opsys/linux/alsa/utils/${name}.tar.bz2"; + url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2"; sha256 = "1rw1n3w8syqky9i7kwy5xd2rzfdbihxas32vwfxpb177lqx2lpzq"; }; -- GitLab From f1bfc3055d050c2149507048f1c521b4e4007f03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 22 Sep 2012 11:46:52 +0200 Subject: [PATCH 0664/5607] dovecot: drop obsolete versions 1.0.3 and 1.1.1 --- pkgs/servers/mail/dovecot/1.0.3.nix | 16 --------------- pkgs/servers/mail/dovecot/1.1.1.nix | 20 ------------------- .../mail/dovecot/{2.x.nix => default.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 5 +---- 4 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 pkgs/servers/mail/dovecot/1.0.3.nix delete mode 100644 pkgs/servers/mail/dovecot/1.1.1.nix rename pkgs/servers/mail/dovecot/{2.x.nix => default.nix} (91%) diff --git a/pkgs/servers/mail/dovecot/1.0.3.nix b/pkgs/servers/mail/dovecot/1.0.3.nix deleted file mode 100644 index 70e84fa51b0..00000000000 --- a/pkgs/servers/mail/dovecot/1.0.3.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl - , openssl - , pam -}: - -stdenv.mkDerivation { - name = "dovecot-1.0.3"; - - buildInputs = [openssl pam]; - - src = fetchurl { - url = http://dovecot.org/releases/1.0/dovecot-1.0.3.tar.gz; - sha256 = "14b3sbvj9xpm5mjwfavwrcwmzfdgian51ncspl8j83cd8j01jdjz"; - }; - -} diff --git a/pkgs/servers/mail/dovecot/1.1.1.nix b/pkgs/servers/mail/dovecot/1.1.1.nix deleted file mode 100644 index 103f79652fd..00000000000 --- a/pkgs/servers/mail/dovecot/1.1.1.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl - , openssl - , pam -}: - -let - version = "1.1.1"; -in - -stdenv.mkDerivation { - name = "dovecot-${version}"; - - buildInputs = [openssl pam]; - - src = fetchurl { - url = "http://dovecot.org/releases/1.1/dovecot-${version}.tar.gz"; - sha256 = "0plzrzz07k0cylk9323gs9fzlv176y6nd6am660b6dch4p884sck"; - }; - -} diff --git a/pkgs/servers/mail/dovecot/2.x.nix b/pkgs/servers/mail/dovecot/default.nix similarity index 91% rename from pkgs/servers/mail/dovecot/2.x.nix rename to pkgs/servers/mail/dovecot/default.nix index 1b4fbe7c7cc..675e2ae7479 100644 --- a/pkgs/servers/mail/dovecot/2.x.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://dovecot.org/; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; }; - + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9988ae8da32..d020dcba84f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5271,10 +5271,7 @@ let inherit stdenv lib dict; }; - dovecot = callPackage ../servers/mail/dovecot/1.0.3.nix { }; - dovecot_1_1_1 = callPackage ../servers/mail/dovecot/1.1.1.nix { }; - dovecot_2 = callPackage ../servers/mail/dovecot/2.x.nix { }; - dovecot_2_0 = pkgs.dovecot_2; # Actually, 2.1 + dovecot = callPackage ../servers/mail/dovecot { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; -- GitLab From e9315d4a1cdc2e9f832eac6a76403a448e8d1abc Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Mon, 24 Sep 2012 16:26:46 +0200 Subject: [PATCH 0665/5607] Enable the aspell plugin for KDE 4.7 (the default kde4). --- pkgs/desktops/kde-4.7/kdelibs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kdelibs.nix b/pkgs/desktops/kde-4.7/kdelibs.nix index 31df83e5ee9..429fbb2a709 100644 --- a/pkgs/desktops/kde-4.7/kdelibs.nix +++ b/pkgs/desktops/kde-4.7/kdelibs.nix @@ -1,4 +1,4 @@ -{ kde, gcc, cmake, perl +{ kde, gcc, cmake, perl, aspell , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , openexr, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt @@ -10,7 +10,7 @@ kde { buildInputs = [ acl attr attica avahi bzip2 enchant fam getopt giflib herqq jasper libdbusmenu_qt libXScrnSaver libxslt pcre polkit_qt_1 qca2 - shared_desktop_ontologies xz udev libxml2 libjpeg kerberos + shared_desktop_ontologies xz udev libxml2 libjpeg kerberos aspell ]; propagatedBuildInputs = [ qt4 soprano strigi phonon ]; -- GitLab From 732811700a849e53b4411ec9395b12c3ce5277db Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 24 Sep 2012 21:02:19 +0400 Subject: [PATCH 0666/5607] Added BareSIP --- .../instant-messengers/baresip/default.nix | 44 ++++++++++++++++++ pkgs/development/libraries/libre/default.nix | 22 +++++++++ .../libraries/librem/.default.nix.swp | Bin 0 -> 12288 bytes pkgs/development/libraries/librem/default.nix | 23 +++++++++ .../development/libraries/spandsp/default.nix | 18 +++++++ pkgs/development/libraries/srtp/default.nix | 8 +++- pkgs/top-level/all-packages.nix | 7 +++ 7 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/baresip/default.nix create mode 100644 pkgs/development/libraries/libre/default.nix create mode 100644 pkgs/development/libraries/librem/.default.nix.swp create mode 100644 pkgs/development/libraries/librem/default.nix create mode 100644 pkgs/development/libraries/spandsp/default.nix diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix new file mode 100644 index 00000000000..00b82d555fe --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig +, cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad +, gst_plugins_good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg +, gsm, speex, portaudio, spandsp, libuuid +}: +stdenv.mkDerivation rec { + version = "0.4.2"; + name = "baresip-${version}"; + src=fetchurl { + url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; + sha256 = "3ac15b3d3cf17b2417ba871e7eaaaf41ab10cb30b900adcee357d5e91ea033e7"; + }; + buildInputs = [zlib openssl libre librem pkgconfig + cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good + alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid + ]; + makeFlags = [ + "LIBRE_MK=${libre}/share/re/re.mk" + "LIBRE_INC=${libre}/include/re" + "LIBRE_SO=${libre}/lib" + "LIBREM_PATH=${librem}" + "SYSROOT=${stdenv.gcc.libc}" + "SYSROOT_ALT=${stdenv.gcc.gcc}" + ''PREFIX=$(out)'' + "USE_VIDEO=1" + + "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" + "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" + "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" + "USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1" + + "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" + "USE_ILBC=" "USE_OPUS=" "USE_SILK=" + ]; + NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; + meta = { + homepage = "http://www.creytiv.com/baresip.html"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + license = with stdenv.lib.licenses; bsd3; + }; +} diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix new file mode 100644 index 00000000000..208744fcdde --- /dev/null +++ b/pkgs/development/libraries/libre/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, zlib, openssl}: +stdenv.mkDerivation rec { + version = "0.4.2"; + name = "libre-${version}"; + src=fetchurl { + url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; + sha256 = "1c99ygs46qhd4a0ardxhdyjaw5p8clhzmsm8jydqxnmbakwy518m"; + }; + buildInputs = [zlib openssl]; + makeFlags = [ + "USE_ZLIB=1" "USE_OPENSSL=1" + "SYSROOT=${stdenv.gcc.libc}" + "SYSROOT_ALT=${stdenv.gcc.gcc}" + ''PREFIX=$(out)'' + ]; + meta = { + homepage = "http://www.creytiv.com/re.html"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + license = with stdenv.lib.licenses; bsd3; + }; +} diff --git a/pkgs/development/libraries/librem/.default.nix.swp b/pkgs/development/libraries/librem/.default.nix.swp new file mode 100644 index 0000000000000000000000000000000000000000..ad2094919ae23d9f8d275fbfce49973ae0c2ccc6 GIT binary patch literal 12288 zcmeI2&2G~`5XZM%p@2Z*!eud)0;t$Yo0hgA2R>R9DbT8E5l~QB+nd;p*LJ<@e6)(- z#EA=Uz>OQvfW(PM=z$9_fw&-M9k*&x6~wXCSo(Xto{ydR`4naB;?vq=ddHk5a9t$i z$II6%@4wt4{#8N}Cfk0f4WqAevBZjYvozX^5X*}Mw-O#l(hB`v+-^xLySco>gD4g} zR94{I2}^t~vnOu3yvfo)nGo=={Afo4NMIC!aWXwsDr%4G#x;8R()uW8v>^c`fCP{L z5L=0urF?j1$NROGW}n00|%gB!C2v01`j~NB{}^CxHQ>bWnjCrGfA8P;y$O zU0-=rDwl^H6GopwnMGEpE#2v%w_tv#Ks=GhL>#hK=*Dnn`_(Wo4w!02i8wCoz*d23 z!n8Mx&=cA*Yw5}iPpNppvbx=_=_I_b{Eq2F0_L|(Pl>?L0fH+AuDkGeDqM5(%2D1eDlqw&14y1cx$d9S`!o!HI$Z8?q!8W=}>j@p6Afx~)Zaq~sJcE4IO zsG&E@D~nGWjk?}L3c=cZDPS$#?FQ`a)DPTR7^fz;` za^~mzEm@x3_S`Znvc&CqZhwn)XW}_0@OFe0b6b6PyB7+ZwY&Y9(wxXJP?{#e2xM_; z1Gd`}yB+w1eiRN&#S*i%lLgDfsW!QCJe@<644KII>q+>-L78`+K_6B$%jOik%xQ}D eL!S5@rr-dYa0hbbpeN~m{z Date: Mon, 24 Sep 2012 23:49:11 +0400 Subject: [PATCH 0667/5607] Opportunistic measures to prevent the need to convert null to string; they may work or may not work for actually building --- .../instant-messengers/baresip/default.nix | 7 ++++--- pkgs/development/libraries/libre/default.nix | 7 ++++--- .../libraries/librem/.default.nix.swp | Bin 12288 -> 0 bytes pkgs/development/libraries/librem/default.nix | 7 ++++--- 4 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 pkgs/development/libraries/librem/.default.nix.swp diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 00b82d555fe..ba530374c71 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" "LIBRE_SO=${libre}/lib" "LIBREM_PATH=${librem}" - "SYSROOT=${stdenv.gcc.libc}" - "SYSROOT_ALT=${stdenv.gcc.gcc}" ''PREFIX=$(out)'' "USE_VIDEO=1" @@ -33,7 +31,10 @@ stdenv.mkDerivation rec { "USE_BV32=" "USE_COREAUDIO=" "USE_G711=" "USE_G722=" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" - ]; + ] + ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" + ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ; NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 208744fcdde..cc9139d664e 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { buildInputs = [zlib openssl]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" - "SYSROOT=${stdenv.gcc.libc}" - "SYSROOT_ALT=${stdenv.gcc.gcc}" ''PREFIX=$(out)'' - ]; + ] + ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" + ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ; meta = { homepage = "http://www.creytiv.com/re.html"; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/librem/.default.nix.swp b/pkgs/development/libraries/librem/.default.nix.swp deleted file mode 100644 index ad2094919ae23d9f8d275fbfce49973ae0c2ccc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2&2G~`5XZM%p@2Z*!eud)0;t$Yo0hgA2R>R9DbT8E5l~QB+nd;p*LJ<@e6)(- z#EA=Uz>OQvfW(PM=z$9_fw&-M9k*&x6~wXCSo(Xto{ydR`4naB;?vq=ddHk5a9t$i z$II6%@4wt4{#8N}Cfk0f4WqAevBZjYvozX^5X*}Mw-O#l(hB`v+-^xLySco>gD4g} zR94{I2}^t~vnOu3yvfo)nGo=={Afo4NMIC!aWXwsDr%4G#x;8R()uW8v>^c`fCP{L z5L=0urF?j1$NROGW}n00|%gB!C2v01`j~NB{}^CxHQ>bWnjCrGfA8P;y$O zU0-=rDwl^H6GopwnMGEpE#2v%w_tv#Ks=GhL>#hK=*Dnn`_(Wo4w!02i8wCoz*d23 z!n8Mx&=cA*Yw5}iPpNppvbx=_=_I_b{Eq2F0_L|(Pl>?L0fH+AuDkGeDqM5(%2D1eDlqw&14y1cx$d9S`!o!HI$Z8?q!8W=}>j@p6Afx~)Zaq~sJcE4IO zsG&E@D~nGWjk?}L3c=cZDPS$#?FQ`a)DPTR7^fz;` za^~mzEm@x3_S`Znvc&CqZhwn)XW}_0@OFe0b6b6PyB7+ZwY&Y9(wxXJP?{#e2xM_; z1Gd`}yB+w1eiRN&#S*i%lLgDfsW!QCJe@<644KII>q+>-L78`+K_6B$%jOik%xQ}D eL!S5@rr-dYa0hbbpeN~m{z Date: Mon, 24 Sep 2012 16:53:42 -0400 Subject: [PATCH 0668/5607] Drop Darwin patch in GNU patch Seems to build fine without it. http://hydra.nixos.org/build/3053575 --- pkgs/tools/text/gnupatch/darwin-fix.patch | 60 ----------------------- pkgs/tools/text/gnupatch/default.nix | 2 - 2 files changed, 62 deletions(-) delete mode 100644 pkgs/tools/text/gnupatch/darwin-fix.patch diff --git a/pkgs/tools/text/gnupatch/darwin-fix.patch b/pkgs/tools/text/gnupatch/darwin-fix.patch deleted file mode 100644 index 50d08534814..00000000000 --- a/pkgs/tools/text/gnupatch/darwin-fix.patch +++ /dev/null @@ -1,60 +0,0 @@ -Fix builds on Darwin: -http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html . - - -commit 2c4e3ecddec8a686bd50d238f4cefebb950298b7 -Author: Andreas Gruenbacher -Date: Fri Jan 1 15:58:15 2010 +0100 - - * Makefile.in (LIBSRCS, LIBM4FILES): Add the missing files strnlen.c, - strnlen.m4, and safe-read.m4. - -diff --git a/Makefile.in b/Makefile.in -index 3b3d78a..26dc281 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -91,6 +91,7 @@ LIBSRCS = \ - gl/lib/stripslash.c \ - gl/lib/strncasecmp.c \ - gl/lib/strndup.c \ -+ gl/lib/strnlen.c \ - gl/lib/xmalloc.c \ - gl/lib/xstrndup.c - - -Add the missing bits from Gnulib. - ---- /dev/null 2012-04-23 08:54:35.747205543 +0200 -+++ b/gl/lib/strnlen.c 2012-01-16 22:35:02.000000000 +0100 -@@ -0,0 +1,31 @@ -+/* Find the length of STRING, but scan at most MAXLEN characters. -+ Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc. -+ Written by Simon Josefsson. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2, or (at your option) -+ any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#include -+ -+#include -+ -+/* Find the length of STRING, but scan at most MAXLEN characters. -+ If no '\0' terminator is found in that many characters, return MAXLEN. */ -+ -+size_t -+strnlen (const char *string, size_t maxlen) -+{ -+ const char *end = memchr (string, '\0', maxlen); -+ return end ? (size_t) (end - string) : maxlen; -+} diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 0495134d112..502f0e07ccb 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0j10lq37ywcc4qiakan6wpm00abfrnnccq3ags129ad0z9b9zhjr"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; - buildInputs = stdenv.lib.optional doCheck ed; crossAttrs = { -- GitLab From 886ed14f0df3f1bc34e8f03b4c11e92a5d9d59a9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Sep 2012 16:57:29 -0400 Subject: [PATCH 0669/5607] Drop non-existent boostFull from release-small.nix --- pkgs/top-level/release-small.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 8003ad32105..56c6e1f987d 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -31,7 +31,6 @@ with (import ./release-lib.nix); binutils = linux; bind = linux; bison26 = linux; - boostFull = all; bsdiff = all; bzip2 = all; classpath = linux; -- GitLab From df5c2a866156743a15be0bf4f51bed4d840b861b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Sep 2012 17:01:15 -0400 Subject: [PATCH 0670/5607] IO::Compress: Update to fix the build http://hydra.nixos.org/build/3060018 --- pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix | 4 ++-- pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix index 6515efada6f..32dc5a01606 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Bzip2/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, bzip2 }: buildPerlPackage rec { - name = "Compress-Raw-Bzip2-2.049"; + name = "Compress-Raw-Bzip2-2.055"; src = fetchurl { url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; - sha256 = "7881473e0ab5ecc6ce609382e4f7466fb32217e928eef27e7084702bb07ac172"; + sha256 = "1qssagii3xy87lsnlq5y7cngasiiq7jmbi1s6lcwwfhv36ydlmx8"; }; # Don't build a private copy of bzip2. diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index c2c7b5f8363..f8cdc7b9279 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -1,11 +1,11 @@ { fetchurl, buildPerlPackage, zlib, stdenv }: buildPerlPackage rec { - name = "Compress-Raw-Zlib-2.051"; + name = "Compress-Raw-Zlib-2.056"; src = fetchurl { url = "mirror://cpan/modules/by-module/Compress/${name}.tar.gz"; - sha256 = "16c7e0d2ed339c0b5ffe787bbcc9fc063ce6f2145d8cd6a18d0c79fa68d36c09"; + sha256 = "08cbgbrfx718r1n9d8hzmv7ssnhw41b0pwg7fw6dcq3svqhmwkyl"; }; preConfigure = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eeba996990d..3e7eceae5c1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2027,10 +2027,10 @@ rec { }; IOCompress = buildPerlPackage rec { - name = "IO-Compress-2.037"; + name = "IO-Compress-2.055"; src = fetchurl { url = "mirror://cpan/modules/by-module/IO/${name}.tar.gz"; - sha256 = "07hs3afzg9ry6ir2f9rf3fg8b129cihs989mr0nh9wdvxgxqmr1q"; + sha256 = "0hxgic4m4wdwgwa15w5f2fhn9hd8jyrimd2rvhiav321zw9w3jg7"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; # Work around a self-referencing Makefile variable. -- GitLab From 9b8d21bd800acb03e242711f465d822a85f2f244 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Sep 2012 17:06:59 -0400 Subject: [PATCH 0671/5607] wget: Update to 1.14 Also fixes the gets() problem in wget. --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 799c5e9dd85..ebc97414a38 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, perl, LWP, gnutls ? null }: stdenv.mkDerivation rec { - name = "wget-1.13.4"; + name = "wget-1.14"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.gz"; - sha256 = "1kadjg63x1mm741dxdidwsn1rz0f7dkzbq59v0iww87jr45p3ir4"; + sha256 = "0sf26vlklxx20fjnj30fx6rijpcyvdl6cjmh6m2bjnvn7a78k9pk"; }; preConfigure = stdenv.lib.optionalString doCheck -- GitLab From f29762d5d6feb3b287c39e81948a9a4c135913b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Sep 2012 17:37:48 -0400 Subject: [PATCH 0672/5607] idutils: Fix gets() problem http://hydra.nixos.org/build/3060033 --- pkgs/tools/misc/idutils/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 4b81d48b027..b76b9a18715 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"; }; + preConfigure = + '' + # Fix for building on Glibc 2.16. Won't be needed once the + # gnulib in idutils is updated. + sed -i '/gets is a security hole/d' lib/stdio.in.h + ''; + buildInputs = stdenv.lib.optional stdenv.isLinux emacs; doCheck = true; -- GitLab From 1527b10016cdfec1aba9391169588f3b756c999b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 25 Sep 2012 10:34:45 +0400 Subject: [PATCH 0673/5607] Adding restund --- pkgs/servers/restund/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/restund/default.nix diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix new file mode 100644 index 00000000000..5cdfdfa2296 --- /dev/null +++ b/pkgs/servers/restund/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, zlib, openssl, libre, librem}: +stdenv.mkDerivation rec { + version = "0.4.2"; + name = "restund-${version}"; + src=fetchurl { + url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; + sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; + }; + buildInputs = [zlib openssl libre librem]; + makeFlags = [ + "LIBRE_MK=${libre}/share/re/re.mk" + "LIBRE_INC=${libre}/include/re" + "LIBRE_SO=${libre}/lib" + "LIBREM_PATH=${librem}" + ''PREFIX=$(out)'' + ] + ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" + ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ; + meta = { + homepage = "http://www.creytiv.com/restund.html"; + platforms = with stdenv.lib.platforms; linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + license = with stdenv.lib.licenses; bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f687ab34745..d1af38019b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5425,6 +5425,8 @@ let redstore = callPackage ../servers/http/redstore { }; + restund = callPackage ../servers/restund {}; + spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM; -- GitLab From def0189ccd6455d3950c3b3c53dd2c5986d4c3b3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 25 Sep 2012 10:47:00 +0400 Subject: [PATCH 0674/5607] Add support for authentication via user list in MySQL to restund --- pkgs/servers/restund/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 5cdfdfa2296..e817151e778 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, zlib, openssl, libre, librem}: +{stdenv, fetchurl, zlib, openssl, libre, librem, mysql}: stdenv.mkDerivation rec { version = "0.4.2"; name = "restund-${version}"; @@ -6,17 +6,19 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/restund-${version}.tar.gz"; sha256 = "db5260939d40cb2ce531075bef02b9d6431067bdd52f3168a6f25246bdf7b9f2"; }; - buildInputs = [zlib openssl libre librem]; + buildInputs = [zlib openssl libre librem mysql]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" "LIBRE_INC=${libre}/include/re" "LIBRE_SO=${libre}/lib" "LIBREM_PATH=${librem}" ''PREFIX=$(out)'' + "USE_MYSQL=1" ] ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" ; + NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; meta = { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux; -- GitLab From bae4524eee8f238acf30733ca7f08753545ac371 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 12:07:10 +0200 Subject: [PATCH 0675/5607] boost: delete obsolete version 1.50.0 --- pkgs/development/libraries/boost/1.50.nix | 86 ----------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 87 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.50.nix diff --git a/pkgs/development/libraries/boost/1.50.nix b/pkgs/development/libraries/boost/1.50.nix deleted file mode 100644 index 3d6c6010a20..00000000000 --- a/pkgs/development/libraries/boost/1.50.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? false -, enableExceptions ? false -, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) -}: - -let - - variant = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableRelease "release" ++ - stdenv.lib.optional enableDebug "debug"); - - threading = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableSingleThreaded "single" ++ - stdenv.lib.optional enableMultiThreaded "multi"); - - link = stdenv.lib.concatStringsSep "," - (stdenv.lib.optional enableShared "shared" ++ - stdenv.lib.optional enableStatic "static"); - - # To avoid library name collisions - layout = if taggedLayout then "tagged" else "system"; - - cflags = if (enablePIC && enableExceptions) then - "cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC" - else if (enablePIC) then - "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" - else if (enableExceptions) then - "cflags=-fexceptions" - else - ""; -in - -stdenv.mkDerivation { - name = "boost-1.50.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_50_0.tar.bz2"; - sha256 = "0ac5b82g6b5pdhzypgddql0i3i9vvrwf9iqp3lyp19hzr2wf5b69"; - }; - - 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 d1af38019b5..093bb835046 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3313,7 +3313,6 @@ let boost146 = callPackage ../development/libraries/boost/1.46.nix { }; 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 = boost151; -- GitLab From d3dc95834af027fb7ce30990992b013ede094c8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 12:06:36 +0200 Subject: [PATCH 0676/5607] boost-headers: update to version 1.51.0 --- .../boost/{1.50-headers.nix => 1.51-headers.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/boost/{1.50-headers.nix => 1.51-headers.nix} (62%) diff --git a/pkgs/development/libraries/boost/1.50-headers.nix b/pkgs/development/libraries/boost/1.51-headers.nix similarity index 62% rename from pkgs/development/libraries/boost/1.50-headers.nix rename to pkgs/development/libraries/boost/1.51-headers.nix index b901d73da73..4b1c1f80c54 100644 --- a/pkgs/development/libraries/boost/1.50-headers.nix +++ b/pkgs/development/libraries/boost/1.51-headers.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "boost-1.50.0-headers"; + name = "boost-1.51.0-headers"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_50_0.tar.bz2"; - sha256 = "0ac5b82g6b5pdhzypgddql0i3i9vvrwf9iqp3lyp19hzr2wf5b69"; + url = "mirror://sourceforge/boost/boost_1_51_0.tar.bz2"; + sha256 = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"; }; phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/include - tar xvf $src -C $out/include --strip-components=1 boost_1_50_0/boost + tar xf $src -C $out/include --strip-components=1 ./boost_1_51_0/boost ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 093bb835046..bb162c97f16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3317,8 +3317,8 @@ let boost = boost151; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; - boostHeaders150 = callPackage ../development/libraries/boost/1.50-headers.nix { }; - boostHeaders = boostHeaders150; + boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; + boostHeaders = boostHeaders151; botan = callPackage ../development/libraries/botan { }; -- GitLab From 23d5a7a0427b025cb7dd94f60142babf6c2abab3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 12:09:09 +0200 Subject: [PATCH 0677/5607] cyrus-sasl: add support for PAM on Linux --- pkgs/development/libraries/cyrus-sasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index a03f753a114..95f2bf0a7e4 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, db4, gettext }: +{ stdenv, fetchurl, openssl, db4, gettext, pam }: stdenv.mkDerivation rec { name = "cyrus-sasl-2.1.25"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe"; }; - buildInputs = [ openssl db4 gettext ]; + buildInputs = [ openssl db4 gettext ] ++ stdenv.lib.optional stdenv.isLinux pam; # Set this variable at build-time to make sure $out can be evaluated. preConfigure = '' -- GitLab From e07f0bbeb2950766bbc0c5a7ee7d3e8e5a0c03c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 12:40:38 +0200 Subject: [PATCH 0678/5607] cyrus-sasl: put daemon state to '/run/ssalauthd' instead of the default value '/var/state/ssalauthd' --- pkgs/development/libraries/cyrus-sasl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 95f2bf0a7e4..c5aefbe3214 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlagsArray=( --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2 + --with-saslauthd=/run/saslauthd --enable-login ) ''; -- GitLab From f2b6eee34e1660e55699717af470a3537062549e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 11:35:05 +0200 Subject: [PATCH 0679/5607] dovecot: cosmetic --- pkgs/servers/mail/dovecot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 675e2ae7479..cb29c9ebc89 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://dovecot.org/; + homepage = "http://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [viric simons]; platforms = with stdenv.lib.platforms; linux; -- GitLab From cb9627178763bafed8b2af48c0023b6f43c827f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:47 +0200 Subject: [PATCH 0680/5607] haskell-attoparsec-conduit: update to version 0.5.0.2 --- .../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 e887b2d539c..97a6c67f6b2 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.1"; - sha256 = "1qrg524gr9ajdxaqd9gmxpj45d7ga21q27ykr76kjdwxfpqaq6n8"; + version = "0.5.0.2"; + sha256 = "183p4jd2cfzvv9lhp4w5z4xrb3ki5l1h8kmlwv8523plnk7x7486"; buildDepends = [ attoparsec conduit text transformers ]; meta = { homepage = "http://github.com/snoyberg/conduit"; -- GitLab From 0e25ce427e586d44d8d691b2debcbe4b0ea899ff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:47 +0200 Subject: [PATCH 0681/5607] haskell-hamlet: update to version 1.1.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 3c638cf69fb..4fd567f75aa 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.3"; - sha256 = "0mljr7jbixji69xwgzfm0ka5r2jvlg4vmkd5ih6r91jk83j04bf9"; + version = "1.1.1"; + sha256 = "0003rp40px3zd5j2k8mm6igafbw8npn0zxm3ip27pq506ak2a0p9"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; -- GitLab From 1902ca085a6449953d547ad4fea151d5fcb504f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:47 +0200 Subject: [PATCH 0682/5607] haskell-json: update to version 0.6 --- pkgs/development/libraries/haskell/json/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index 63a6d176c94..09ebeb847b9 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "json"; - version = "0.5"; - sha256 = "12jbvq0lp7z5q6g94pv8s5455yydfyh9h2xlr76wqzfh3myvy6fl"; + version = "0.6"; + sha256 = "1f5l1992r2gm8fivqfljhgs3nix4qf7h3rji78rsq1kf3r9shz32"; buildDepends = [ mtl parsec syb ]; - patchPhase = "sed -i json.cabal -e '1iExtensions: FlexibleInstances'"; meta = { description = "Support for serialising Haskell to and from JSON"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 4ac7aeb60dd1b335fcc8c5ed4dcc1e8d5e49f56c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:48 +0200 Subject: [PATCH 0683/5607] haskell-split: update to version 0.2.1.1 --- pkgs/development/libraries/haskell/split/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/default.nix index 42d33d10a06..e106b2687f5 100644 --- a/pkgs/development/libraries/haskell/split/default.nix +++ b/pkgs/development/libraries/haskell/split/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "split"; - version = "0.2.0.0"; - sha256 = "1gk0nx6bw5j9gxaa6ki70wqszbllz7c1ccfnwg49fl3qfabg1i7c"; + version = "0.2.1.1"; + sha256 = "1zzp4dwf846s74a4lhw2gf4awsk9iblhl5zcg2zccgv1lr4w2dmz"; meta = { description = "Combinator library for splitting lists"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From c3c66b0167f26b5296e77a214aea0bbc8195e606 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:48 +0200 Subject: [PATCH 0684/5607] haskell-tls: update to version 0.9.11 --- 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 2154aa347d2..5f5452044df 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.10"; - sha256 = "1kiwb5skirdla32gjicgmjyk09p8f701jgs6krxbi38gmmfj1dxf"; + version = "0.9.11"; + sha256 = "1a0kfwhmlwl581yr63g2plw9680ry0030rqm3bxhvnjbb2xac3k9"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From ce340103d5b458db99271bd3c6a9afd4819ab353 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:48 +0200 Subject: [PATCH 0685/5607] haskell-warp: update to version 1.3.1.2 --- pkgs/development/libraries/haskell/warp/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 6a54909d6d4..b0c3c7205b3 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 +, conduit, hashable, httpTypes, liftedBase, network, networkConduit , simpleSendfile, transformers, unixCompat, void, wai }: cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.1.1"; - sha256 = "1y0p36nh43wilk110dxpvsws6blrjpik4w9aqj5i1r97wn7xg9ax"; + version = "1.3.1.2"; + sha256 = "11y1dwzvfhr4fhlh5j2ydwj4d3r92qm55rn9xwbfxmr0vmvm78b5"; buildDepends = [ - blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes - liftedBase network networkConduit simpleSendfile transformers - unixCompat void wai + blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable + httpTypes liftedBase network networkConduit simpleSendfile + transformers unixCompat void wai ]; meta = { homepage = "http://github.com/yesodweb/wai"; -- GitLab From ff32b5e738f53f18acd9c3de5896f2ab5e9a8d28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:48 +0200 Subject: [PATCH 0686/5607] haskell-yesod-core: update to version 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 5a6d6e1c41c..c0bef5018ba 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.2"; - sha256 = "1q0p4hnmd0mg3pqkydqcv61p3hrmnqnrsya005dyvxf320anya0y"; + version = "1.1.2"; + sha256 = "1pgwqghj9kc9kh90515nswz5ssbmm2y6miw5j6sx4dha0xncqvgs"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes -- GitLab From aad56b31e7857965ebdf78cbfb3a6c575d066eff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:48 +0200 Subject: [PATCH 0687/5607] haskell-yesod-form: update to version 1.1.3 --- 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 ce9e4c591e3..a562897cf14 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.2"; - sha256 = "0kjnnav7zb21iig3vhhy61jlz2wsk8r8b7dh251mla5l8pi3dq3r"; + version = "1.1.3"; + sha256 = "1af1wdzwbw1a2bf991pgx52d9dap3cqpsr5h4yy4mid6p980slrb"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent shakespeareCss -- GitLab From a1d08ed4f681e3af5c17a7abcf4f2a6e918eeedb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 13:12:48 +0200 Subject: [PATCH 0688/5607] haskell-yesod: update to version 1.1.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 3fa94ffa905..10d8013f1b3 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.3"; - sha256 = "07rj7dyicnklp6hs1m0kjj6xz983d1zryv2f3sqhf620bc2d70fx"; + version = "1.1.1"; + sha256 = "0666g2ap6ignqif9vwis2bnsb45jb19llw9z20nsfs0q3wj8ykn3"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 656badd501cc58d87418d4e1aefcaae9ec692367 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 14:44:39 +0200 Subject: [PATCH 0689/5607] cabal-install: install bash-completion instructions --- pkgs/tools/package-management/cabal-install/0.14.0.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix index ecbd46de52c..15fe5f1e22c 100644 --- a/pkgs/tools/package-management/cabal-install/0.14.0.nix +++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix @@ -9,6 +9,10 @@ cabal.mkDerivation (self: { buildDepends = [ Cabal filepath HTTP mtl network random time zlib ]; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; -- GitLab From 3a34ac175f090f45400ec827a476075b5552f746 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 15:05:49 +0200 Subject: [PATCH 0690/5607] pkgs/development/compilers/ghc/with-packages.nix: include bash completion files in the generated environment --- pkgs/development/compilers/ghc/with-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 9313c54b908..f4f567f30b3 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -59,6 +59,11 @@ stdenv.mkDerivation rec { ln -s $f $out/bin echo -n . done + for f in "$currentPath/etc/bash_completion.d/"*; do + mkdir -p $out/etc/bash_completion.d + ln -s $f $out/etc/bash_completion.d/ + echo -n . + done for f in "$currentPkgDir/"*.conf; do ln -s $f $linkedPkgDir echo -n . -- GitLab From b5416d6ed61ca78a1d743a75a78078f2590db1e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 15:15:38 +0200 Subject: [PATCH 0691/5607] darcs: install bash completion instructions --- pkgs/applications/version-management/darcs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index 3fb667b9461..a6b4b9a60de 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -15,6 +15,10 @@ cabal.mkDerivation (self: { zlib ]; extraLibraries = [ curl ]; + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv contrib/darcs_completion $out/etc/bash_completion.d/darcs + ''; meta = { homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; -- GitLab From 63b87a116e1829d451240bf282d4a4ec89ff496e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Sep 2012 15:35:54 +0200 Subject: [PATCH 0692/5607] hardlink: update to latest version --- pkgs/tools/system/hardlink/default.nix | 34 +++++++++++--------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 1655fdba6f4..192f7d871a1 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -1,33 +1,27 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, unzip }: let - rev = "269cc6"; - - src = fetchurl { - url = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.c;hb=${rev}"; - sha256 = "721c54e653772e11bf0d30fb02aa21b96b147a1b68c0acb4f05cb87e7718bc12"; - name = "hardlink.c"; - }; - - man = fetchurl { - url = "pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.1;hb=${rev}"; - sha256 = "2f7e18a0259a2ceae316592e8b18bee525eb7e83fe3bb6b881e5dafa24747f2d"; - name = "hardlink.1"; - }; + rev = "3ec908d539"; in stdenv.mkDerivation { - name = "hardlink-2010.1.${rev}"; + name = "hardlink-2012.9.${rev}"; - phases = ["buildPhase"]; + src = fetchurl { + url = "pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip"; + sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647"; + name = "hardlink-${rev}.zip"; + }; - buildPhase = '' + installPhase = '' mkdir -p $out/bin $out/share/man/man1 - gcc -O2 ${src} -o $out/bin/hardlink - install -m 444 ${man} $out/share/man/man1/hardlink.1 + gcc -O2 hardlink.c -o $out/bin/hardlink + mv hardlink.1 $out/share/man/man1/hardlink.1 ''; + buildInputs = [ unzip ]; + meta = { - homepage = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=summary"; + homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/"; description = "consolidate duplicate files via hardlinks"; license = stdenv.lib.licenses.gpl2Plus; -- GitLab From 1329ae018d82eda6a1c205e8cb52a138167ca874 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Tue, 25 Sep 2012 17:44:57 +0200 Subject: [PATCH 0693/5607] Bump plowshare version to git20120916 --- pkgs/tools/misc/plowshare/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index 5e684cfa377..d98dc33478a 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,16 +1,14 @@ { stdenv, fetchurl, makeWrapper, curl }: -let +stdenv.mkDerivation rec { - v = "20120807"; + name = "plowshare-${version}"; -in stdenv.mkDerivation { - - name = "plowshare-git${v}"; + version = "git20120916"; src = fetchurl { - url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz"; - sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si"; + url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz"; + sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067"; }; buildInputs = [ makeWrapper ]; -- GitLab From ad0b63265cb9b9446396dd5876d25fcb792d4f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 24 Sep 2012 00:26:46 +0200 Subject: [PATCH 0694/5607] picocom: adding picocom, 1.7 --- pkgs/tools/misc/picocom/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/misc/picocom/default.nix diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix new file mode 100644 index 00000000000..bb08091ad57 --- /dev/null +++ b/pkgs/tools/misc/picocom/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "picocom-1.7"; + + src = fetchurl { + url = "http://picocom.googlecode.com/files/${name}.tar.gz"; + sha256 = "17hjq713naq02xar711aw24qqd52p591mj1h5n97cni1ga7irwyh"; + }; + + installPhase = '' + ensureDir $out/bin $out/share/man/man8 + cp picocom $out/bin + cp picocom.8 $out/share/man/man8 + ''; + + meta = { + description = "Minimal dumb-terminal emulation program"; + homepage = http://code.google.com/p/picocom/; + license = "GPLv2+"; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb162c97f16..77fb3f4885c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7491,6 +7491,8 @@ let picard = callPackage ../applications/audio/picard { }; + picocom = callPackage ../tools/misc/picocom { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { openssl = if (config.pidgin.openssl or true) then openssl else null; gnutls = if (config.pidgin.gnutls or false) then gnutls else null; -- GitLab From 1bd6ee65561746b5c03c32b9f6cc67148a0463c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Sep 2012 19:35:03 +0200 Subject: [PATCH 0695/5607] Adding umurmur and protobuf-c. --- .../networking/umurmur/default.nix | 20 +++++++++++++++++ .../libraries/protobufc/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/networking/umurmur/default.nix create mode 100644 pkgs/development/libraries/protobufc/default.nix diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix new file mode 100644 index 00000000000..7c731874a5f --- /dev/null +++ b/pkgs/applications/networking/umurmur/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, openssl, protobufc, libconfig }: + +stdenv.mkDerivation rec { + name = "umurmur-0.2.10"; + + src = fetchurl { + url = "http://umurmur.googlecode.com/files/${name}.tar.gz"; + sha256 = "0c990jvm73a6lajr1qlzw0p6nkshkh2nqwjmz2sq79pj0hm9ckvy"; + }; + + buildInputs = [ openssl protobufc libconfig ]; + + configureFlags = "--with-ssl=openssl"; + + meta = { + description = "Minimalistic Murmur (Mumble server)"; + license = "BSD"; + homepage = http://code.google.com/p/umurmur/; + }; +} diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix new file mode 100644 index 00000000000..58c639ee604 --- /dev/null +++ b/pkgs/development/libraries/protobufc/default.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv, zlib, protobuf }: + +stdenv.mkDerivation rec { + name = "protobuf-c-0.15"; + + src = fetchurl { + url = "http://protobuf-c.googlecode.com/files/${name}.tar.gz"; + sha256 = "0dh0180lzqk6n1r0qk38kgdy4x15mpkg5j4g2r31qhx52f757jwg"; + }; + + buildInputs = [ protobuf ]; + + doCheck = true; + + meta = { + description = "C bindings for Google's Protocol Buffers"; + + license = "BSD"; + + homepage = http://code.google.com/p/protobuf-c/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77fb3f4885c..f150c1bff69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4674,6 +4674,8 @@ let protobuf = callPackage ../development/libraries/protobuf { }; + protobufc = callPackage ../development/libraries/protobufc { }; + pth = callPackage ../development/libraries/pth { }; ptlib = callPackage ../development/libraries/ptlib {}; @@ -7767,6 +7769,8 @@ let libzrtpcpp = libzrtpcpp_1_6; }; + umurmur = callPackage ../applications/networking/umurmur { }; + unison = callPackage ../applications/networking/sync/unison { inherit (ocamlPackages) lablgtk; enableX11 = config.unison.enableX11 or true; -- GitLab From 30e76124e68f03b0f41bf8d8cd325a96a0b00e8d Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 23 Sep 2012 23:55:07 +0200 Subject: [PATCH 0696/5607] platforms: adding sha1 to the sheevaplug The mv-cesa requires soft sha1 as fallback, to work. --- pkgs/top-level/platforms.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 1e2bb4b1ec7..14d4f87d285 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -50,6 +50,9 @@ rec { EXT4_FS m USB_STORAGE_CYPRESS_ATACB m + # mv cesa requires this sw fallback, for mv-sha1 + CRYPTO_SHA1 y + IP_PNP y IP_PNP_DHCP y NFS_FS y -- GitLab From be200637724d6bb1d693cb5f96eccbb4f506f43f Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 23 Sep 2012 23:55:42 +0200 Subject: [PATCH 0697/5607] mldonkey: update to 3.1.3 Claimed suport for ocaml 4.00.0 and finally, BT magnets. --- pkgs/applications/networking/p2p/mldonkey/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index f86901d5dde..2f739b056d4 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: stdenv.mkDerivation (rec { - name = "mldonkey-3.1.1"; + name = "mldonkey-3.1.3"; src = fetchurl { url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1cj0xvfx03jnpifcqxcgfjhkl3f70r86d8zn2flj9wvlnam98qlr"; + sha256 = "1qnr0qzliw4aynf2zhmm5hmrc9bd5vhdq3bi8n88j4nc86gry9bw"; }; meta = { @@ -15,9 +15,9 @@ stdenv.mkDerivation (rec { buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; configureFlags = [ "--disable-gui" ]; -} // (if (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") then +} // (if !ocaml.nativeCompilers then { - # Byte code compilation (the ocaml opt compiler is not supported in many platforms) + # Byte code compilation (the ocaml opt compiler is not supported in some platforms) buildPhase = "make mlnet.byte"; installPhase = '' mkdir -p $out/bin -- GitLab From 839f124ba1152034560a3e08ff50ef54cf42eb84 Mon Sep 17 00:00:00 2001 From: Lluis Batlle Date: Sun, 23 Sep 2012 23:56:48 +0200 Subject: [PATCH 0698/5607] ocaml: native code building for ARM on 3.12 and 4.00 I think it already works. I'll test more throughly tomorrow. --- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.0.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index a70ba649d1f..c719abc4abc 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -2,7 +2,7 @@ let useX11 = !stdenv.isArm && !stdenv.isMips; - useNativeCompilers = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/development/compilers/ocaml/4.00.0.nix b/pkgs/development/compilers/ocaml/4.00.0.nix index da065356e85..e25654a2481 100644 --- a/pkgs/development/compilers/ocaml/4.00.0.nix +++ b/pkgs/development/compilers/ocaml/4.00.0.nix @@ -2,7 +2,7 @@ let useX11 = !stdenv.isArm && !stdenv.isMips; - useNativeCompilers = !stdenv.isArm && !stdenv.isMips; + useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optionals optionalString; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f150c1bff69..ff265c03cc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1066,8 +1066,6 @@ let mktemp = callPackage ../tools/security/mktemp { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; - modemmanager = callPackage ../tools/networking/modemmanager {}; monit = builderDefsPackage ../tools/system/monit { @@ -2484,6 +2482,8 @@ let menhir = callPackage ../development/ocaml-modules/menhir { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { camomile = camomile_0_8_2; }; -- GitLab From 664ee28936392202ce0656db9d57a3fb24e8e931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Sep 2012 20:01:29 +0200 Subject: [PATCH 0699/5607] Adding libopus I still don't know any program that can use it. --- pkgs/development/libraries/libopus/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/libopus/default.nix diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix new file mode 100644 index 00000000000..d4c90ee33fb --- /dev/null +++ b/pkgs/development/libraries/libopus/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, fixedPoint ? false }: + +stdenv.mkDerivation rec { + name = "libopus-1.0.1"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/opus/opus-1.0.1.tar.gz"; + sha256 = "1vs133z6c03xi1a7b8bkqxlb6ipwchawwb52z1lgvh1amwy5ryl0"; + }; + + configureFlags = stdenv.lib.optionalString fixedPoint "--enable-fixed-point"; + + meta = { + description = "Open, royalty-free, highly versatile audio codec"; + license = "BSD"; + homepage = http://www.opus-codec.org/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff265c03cc4..ee46cce5d28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4270,6 +4270,8 @@ let liboop = callPackage ../development/libraries/liboop { }; + libopus = callPackage ../development/libraries/libopus { }; + libosip = callPackage ../development/libraries/osip {}; libotr = callPackage ../development/libraries/libotr { }; -- GitLab From 62c5eab5cd73e402d4ac35c59dda80c61de350c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Sep 2012 20:08:01 +0200 Subject: [PATCH 0700/5607] Adding opus-tools. At least a program that uses libopus. --- pkgs/applications/audio/opus-tools/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/audio/opus-tools/default.nix diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix new file mode 100644 index 00000000000..6b7e1e2aeff --- /dev/null +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, libogg, libao, pkgconfig, libopus}: + +stdenv.mkDerivation rec { + name = "opus-tools-0.1.5"; + src = fetchurl { + url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; + sha256 = "0184zfamg3qcjknk4liz4smws3mbv77gjhq2pn9xgcx9nw78srvn"; + }; + + buildInputs = [ libogg libao pkgconfig libopus ]; + + meta = { + description = "Tools to work with opus encoded audio streams"; + homepage = http://www.opus-codec.org/; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee46cce5d28..e164c16827b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7473,6 +7473,8 @@ let inherit (pkgs.kde4) kdelibs; }; + opusTools = callPackage ../applications/audio/opus-tools { }; + pan = callPackage ../applications/networking/newsreaders/pan { spellChecking = false; }; -- GitLab From 2a8e532e0a1aa15d523872f8828fe0ef0d7d8f13 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Sep 2012 17:30:43 -0400 Subject: [PATCH 0701/5607] qemu-kvm: Update to 1.2.0 This time it will work for sure! --- pkgs/os-specific/linux/qemu-kvm/default.nix | 8 ++--- .../qemu-kvm/qemu-img-fix-corrupt-vdi.patch | 27 --------------- .../linux/qemu-kvm/smb-tmpdir.patch | 33 ------------------- 3 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 pkgs/os-specific/linux/qemu-kvm/qemu-img-fix-corrupt-vdi.patch delete mode 100644 pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch diff --git a/pkgs/os-specific/linux/qemu-kvm/default.nix b/pkgs/os-specific/linux/qemu-kvm/default.nix index 032a35ece26..9223b7af917 100644 --- a/pkgs/os-specific/linux/qemu-kvm/default.nix +++ b/pkgs/os-specific/linux/qemu-kvm/default.nix @@ -4,20 +4,18 @@ assert stdenv.isLinux; -let version = "1.0.1"; in +let version = "1.2.0"; in stdenv.mkDerivation rec { name = "qemu-kvm-${version}"; src = fetchurl { url = "mirror://sourceforge/kvm/qemu-kvm/${version}/${name}.tar.gz"; - sha256 = "0kxzwaw8h71mqcm46angpyx8gd58ascrxnr861k068xg89ix5g2p"; + sha256 = "018vb5nmk2fsm143bs2bl2wirhasd4b10d7jchl32zik4inbk2p9"; }; - patches = [ ./smb-tmpdir.patch ./qemu-img-fix-corrupt-vdi.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 446a69a146b..00000000000 --- 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); diff --git a/pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch b/pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch deleted file mode 100644 index 6d6c7831d15..00000000000 --- a/pkgs/os-specific/linux/qemu-kvm/smb-tmpdir.patch +++ /dev/null @@ -1,33 +0,0 @@ -Honour $TMPDIR for the qemu-smb temporary directory. - -diff -rc -x '*~' qemu-kvm-0.12.2-orig/net/slirp.c qemu-kvm-0.12.2/net/slirp.c -*** qemu-kvm-0.12.2-orig/net/slirp.c 2010-02-01 19:05:24.000000000 +0100 ---- qemu-kvm-0.12.2/net/slirp.c 2010-02-01 19:05:54.000000000 +0100 -*************** -*** 476,486 **** - struct in_addr vserver_addr) - { - static int instance; -! char smb_conf[128]; -! char smb_cmdline[128]; - FILE *f; - -! snprintf(s->smb_dir, sizeof(s->smb_dir), "/tmp/qemu-smb.%ld-%d", - (long)getpid(), instance++); - if (mkdir(s->smb_dir, 0700) < 0) { - qemu_error("could not create samba server dir '%s'\n", s->smb_dir); ---- 476,489 ---- - struct in_addr vserver_addr) - { - static int instance; -! char smb_conf[1024]; -! char smb_cmdline[1024]; - FILE *f; - -! char *tmpdir = getenv("TMPDIR"); -! -! snprintf(s->smb_dir, sizeof(s->smb_dir), "%s/qemu-smb.%ld-%d", -! tmpdir ? tmpdir : "/tmp", - (long)getpid(), instance++); - if (mkdir(s->smb_dir, 0700) < 0) { - qemu_error("could not create samba server dir '%s'\n", s->smb_dir); -- GitLab From b3d20690a105cf1efbe8bddff3b5ba060fbe21e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Sep 2012 21:31:16 -0400 Subject: [PATCH 0702/5607] For consistency, don't use the -v flag when copying a directory $src --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 703ea53db8e..5cc82b08321 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -445,7 +445,7 @@ unpackFile() { *) if [ -d "$curSrc" ]; then stripHash $curSrc - cp -prvd $curSrc $strippedName + cp -prd $curSrc $strippedName else if [ -z "$unpackCmd" ]; then echo "source archive $curSrc has unknown type" -- GitLab From 5ba1df3811b0e9c48c460ceef318bca02be247ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 25 Sep 2012 18:26:49 +0200 Subject: [PATCH 0703/5607] mosh: update to 1.2.2 --- pkgs/tools/networking/mosh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 60a9e5cab87..e5d9a656494 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -2,11 +2,11 @@ , makeWrapper, perl }: stdenv.mkDerivation rec { - name = "mosh-1.1.3"; + name = "mosh-1.2.2"; src = fetchurl { url = "https://github.com/downloads/keithw/mosh/${name}.tar.gz"; - sha256 = "1vkf7h8mcmfn9dgcwrww05mdijrl7321xv9wlhf7j99nwmklc8sk"; + sha256 = "1763s6f398hmdgy73brpknwahnys28zk3pm37n66sr8iyz2cq8xp"; }; buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl ]; -- GitLab From e710915ffc681b06a61ab2257e44c1cd8abbd0ef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Sep 2012 21:05:12 -0400 Subject: [PATCH 0704/5607] systemd: Update to 192 --- pkgs/os-specific/linux/systemd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 34409c296e9..e5858d06b30 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,19 +6,19 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-191"; + name = "systemd-192"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "0r0xz8dksacm20516kakqf6xchydhcc1lkvz3m75z1gbl6sa581g"; + sha256 = "03y3y1w3x7bx67jvdxryhns3h1g6nrllln46gqipp35n99alki2m"; }; patches = [ ./reexec.patch ] ++ # Remove this patch after the next update. stdenv.lib.optional (stdenv.system == "i686-linux") (fetchurl { url = "https://bugs.freedesktop.org/attachment.cgi?id=67621"; - name = "fix-32-bit-build.patch"; - sha256 = "1i4xn6lc6iapaasd2lz717b1zrq5ds5g18i7m509fgfwy7w7x95l"; + name = "fix-32-bit-build.patch"; + sha256 = "1i4xn6lc6iapaasd2lz717b1zrq5ds5g18i7m509fgfwy7w7x95l"; }); buildInputs = -- GitLab From b5a605c26908be611d189e7ea7dc6ec5c0f3aa09 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 12:04:05 -0400 Subject: [PATCH 0705/5607] Fix the Glibc kernel at 2.6.35 rather than whatever the kernel header happen to be --- pkgs/development/libraries/glibc/2.13/common.nix | 2 +- pkgs/development/libraries/glibc/2.16/common.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 6e409158f0b..2333e42246b 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation ({ then "--enable-profile" else "--disable-profile") ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ - "--enable-kernel=${kernelHeaders.versionForGlibc}" + "--enable-kernel=2.6.35" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.16/common.nix index 5624be5b549..84bbefee840 100644 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ b/pkgs/development/libraries/glibc/2.16/common.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation ({ then "--enable-profile" else "--disable-profile") ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [ - "--enable-kernel=${kernelHeaders.versionForGlibc}" + "--enable-kernel=2.6.35" ] ++ stdenv.lib.optionals (cross != null) [ (if cross.withTLS then "--with-tls" else "--without-tls") (if cross.float == "soft" then "--without-fp" else "--with-fp") -- GitLab From ab53df106fb51b3dfa33629e882493f5a6705f7c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 14:14:07 -0400 Subject: [PATCH 0706/5607] Get the 3.3.5 kernel headers to build in the stdenv bootstrap We don't have xz early in the bootstrap, so use the bz2 tarball. Also add SHELL=bash to get it to build. --- .../linux/kernel-headers/3.3.5.nix | 10 +-- .../linux/kernel-headers/default.nix | 66 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 72 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel-headers/default.nix diff --git a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix b/pkgs/os-specific/linux/kernel-headers/3.3.5.nix index f4dd28dab03..c3d50578d91 100644 --- a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix +++ b/pkgs/os-specific/linux/kernel-headers/3.3.5.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { name = "linux-headers-${version}"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0i74jn47f6vs5kcvk8abvz3k08z32c9bbqw0sdjkdxwvr4jbczpv"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; + sha256 = "0144qc3ginldm2i6sy8g55y4k1yw3dy3dnl1hiv7v7rlqnljx5d5"; }; targetConfig = if (cross != null) then cross.config else null; @@ -33,15 +33,15 @@ stdenv.mkDerivation { extraIncludeDirs = if cross != null then - (if cross.arch == "powerpc" then ["ppc"] else []) + (if cross.arch == "powerpc" then ["ppc"] else []) else if stdenv.system == "powerpc-linux" then ["ppc"] else []; buildPhase = '' if test -n "$targetConfig"; then export ARCH=$platform fi - make ${kernelHeadersBaseConfig} - make mrproper headers_check + make ${kernelHeadersBaseConfig} SHELL=bash + make mrproper headers_check SHELL=bash ''; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix deleted file mode 100644 index f6004ccb151..00000000000 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, perl, cross ? null }: - -assert cross == null -> stdenv.isLinux; - -let - version = "2.6.35.14"; - kernelHeadersBaseConfig = if cross == null then - stdenv.platform.kernelHeadersBaseConfig - else - cross.platform.kernelHeadersBaseConfig; -in - -stdenv.mkDerivation { - name = "linux-headers-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v2.6/longterm/v2.6.35/linux-${version}.tar.bz2"; - sha256 = "1wzml7s9karfbk2yi36g1r8fyaq4d4f16yizc68zgchv0xzj39zl"; - }; - - targetConfig = if (cross != null) then cross.config else null; - - platform = - if cross != null then cross.platform.kernelArch else - if stdenv.system == "i686-linux" then "i386" else - if stdenv.system == "x86_64-linux" then "x86_64" else - if stdenv.system == "powerpc-linux" then "powerpc" else - if stdenv.isArm then "arm" else - if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else - abort "don't know what the kernel include directory is called for this platform"; - - buildInputs = [perl]; - - extraIncludeDirs = - if cross != null then - (if cross.arch == "powerpc" then ["ppc"] else []) - else if stdenv.system == "powerpc-linux" then ["ppc"] else []; - - buildPhase = '' - if test -n "$targetConfig"; then - export ARCH=$platform - fi - make ${kernelHeadersBaseConfig} - make mrproper headers_check - ''; - - installPhase = '' - make INSTALL_HDR_PATH=$out headers_install - - # Some builds (e.g. KVM) want a kernel.release. - mkdir -p $out/include/config - echo "${version}-default" > $out/include/config/kernel.release - ''; - - # !!! hacky - fixupPhase = '' - ln -s asm $out/include/asm-$platform - if test "$platform" = "i386" -o "$platform" = "x86_64"; then - ln -s asm $out/include/asm-x86 - fi - ''; - - passthru = { - versionForGlibc = "2.6.35"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe416542b03..8b248e175c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5642,7 +5642,7 @@ let libnl = callPackage ../os-specific/linux/libnl { }; - linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; + linuxHeaders = linuxHeaders33; linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { }; -- GitLab From b7b45c60df22db1a75c7e6a0707139d699e724c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 14:29:56 -0400 Subject: [PATCH 0707/5607] Update Linux headers to 3.5 --- .../os-specific/linux/kernel-headers/{3.3.5.nix => 3.5.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/os-specific/linux/kernel-headers/{3.3.5.nix => 3.5.nix} (91%) diff --git a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix b/pkgs/os-specific/linux/kernel-headers/3.5.nix similarity index 91% rename from pkgs/os-specific/linux/kernel-headers/3.3.5.nix rename to pkgs/os-specific/linux/kernel-headers/3.5.nix index c3d50578d91..f230e29832b 100644 --- a/pkgs/os-specific/linux/kernel-headers/3.3.5.nix +++ b/pkgs/os-specific/linux/kernel-headers/3.5.nix @@ -3,7 +3,7 @@ assert cross == null -> stdenv.isLinux; let - version = "3.3.5"; + version = "3.5.4"; kernelHeadersBaseConfig = if cross == null then stdenv.platform.kernelHeadersBaseConfig else @@ -15,10 +15,10 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "0144qc3ginldm2i6sy8g55y4k1yw3dy3dnl1hiv7v7rlqnljx5d5"; + sha256 = "1x2qab82w0wpd82nms68zybygvlphv9yp6nzm93rgs7ck2qjhvlr"; }; - targetConfig = if (cross != null) then cross.config else null; + targetConfig = if cross != null then cross.config else null; platform = if cross != null then cross.platform.kernelArch else diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b248e175c7..648adad6216 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5642,9 +5642,9 @@ let libnl = callPackage ../os-specific/linux/libnl { }; - linuxHeaders = linuxHeaders33; + linuxHeaders = linuxHeaders35; - linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { }; + linuxHeaders35 = callPackage ../os-specific/linux/kernel-headers/3.5.nix { }; linuxHeaders26Cross = forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { inherit stdenv fetchurl perl; -- GitLab From cc02b6cc19287e02f8ff2151a98a645151adda19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 26 Sep 2012 20:56:56 +0200 Subject: [PATCH 0708/5607] Updating the google talk plugin to 3.6.1 since 3.5.1 is no longer available for download. Although, it does not work correctly on my system. --- .../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 a3f255b5d3e..e2e64dbbeb9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,18 +45,18 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - version = "3.5.1.0"; + version = "3.6.1.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "0ml4yirzdcladw11fq5d8lwqfqgb1fh9vpbzbzmhplvyj6mvkqrj"; + sha256 = "1h6qa9vh1bbhsxsihm56nqg9is9vnrvnjl8cjz3hqym2w160ycbv"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "1kfd26zygb76iqnr8n3f7k7n9h5bz0rf716n80crqzyasv51mn57"; + sha256 = "0d6dfivmm0azfpv283bqs04w6098z8w4cnjgivp80mfd6ndjv8x2"; } else throw "Google Talk does not support your platform."; -- GitLab From 99df2b42a719d9729508c1e2e6f59835f5d7c743 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 14:59:48 -0400 Subject: [PATCH 0709/5607] libtiff: Update to 3.9.7 --- pkgs/development/libraries/libtiff/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 35f77584f0f..ba5966d13d4 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,27 +1,18 @@ { stdenv, fetchurl, zlib, libjpeg }: -let version = "3.9.6"; in +let version = "3.9.7"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; - + src = fetchurl { urls = [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" ]; - sha256 = "0cv8ml3fnkjx60163j69a9cklzlh8wxbvbql78s78q13as8i3fhg"; + sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm"; }; - patchFlags = "-p0"; - - patches = - [ (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/tiff/files/tiff-3.9.5-CVE-2012-1173.patch?revision=1.2"; - sha256 = "07v22lbx9vlqj1f5r2fzcjcr37b97mw5ayjnisgmk4nd1yjxv5qn"; - }) - ]; - propagatedBuildInputs = [ zlib libjpeg ]; enableParallelBuilding = true; -- GitLab From 013b137325430bd8d13beccfa2874d0f44169989 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:04:27 -0400 Subject: [PATCH 0710/5607] expat: Update to 2.1.0 --- .../libraries/expat/cve-2009-3560.patch | 18 ------------------ pkgs/development/libraries/expat/default.nix | 14 ++++++-------- 2 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/expat/cve-2009-3560.patch diff --git a/pkgs/development/libraries/expat/cve-2009-3560.patch b/pkgs/development/libraries/expat/cve-2009-3560.patch deleted file mode 100644 index 71da9e39351..00000000000 --- a/pkgs/development/libraries/expat/cve-2009-3560.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch?revision=1.1 - -http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560 -http://bugs.gentoo.org/show_bug.cgi?id=303727 -http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/ - ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser, - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 35a2945207b..6b675230119 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "expat-2.0.1"; - +stdenv.mkDerivation rec { + name = "expat-2.1.0"; + src = fetchurl { - url = mirror://sourceforge/expat/expat-2.0.1.tar.gz; - sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4"; + url = "mirror://sourceforge/expat/${name}.tar.gz"; + sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2"; }; - patches = [ ./cve-2009-3560.patch ]; - meta = { - homepage = http://expat.sourceforge.net/; + homepage = http://www.libexpat.org/; description = "A stream-oriented XML parser library written in C"; }; } -- GitLab From d9e4b08c08aae7f64a6534fdc1bb43913899b027 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:04:41 -0400 Subject: [PATCH 0711/5607] freetype: Update to 2.4.10 --- pkgs/development/libraries/freetype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 975366a7961..00b0ea61138 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "freetype-2.4.9"; - + name = "freetype-2.4.10"; + src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "1far9006qbw5gvjn8ph1kyfhly4j7x7vycigb8vx96cfsk0ll864"; + sha256 = "0bwrkqpygayfc1rf6rr1nb8l3svgn1fmjz8davg2hnf46cn293hc"; }; configureFlags = "--disable-static"; -- GitLab From 943346d9d040946dc060299a60c192a62ce196cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:07:11 -0400 Subject: [PATCH 0712/5607] fontconfig: Update to 2.10.1 --- pkgs/development/libraries/fontconfig/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 5ab3bf2e235..1d0b0b28eb2 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, freetype, expat }: +{ stdenv, fetchurl, pkgconfig, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.9.0"; - + name = "fontconfig-2.10.1"; + src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.gz"; - sha256 = "06ml04gyfacasxmrqdjfkckbj5f18d988j3wmz6vsi7h3h3jazna"; + sha256 = "08h252crb3aqciwdk81jypmz2i7618dzqn3zlr87w1f017wjp4f3"; }; - - buildInputs = [ freetype ]; + + buildInputs = [ pkgconfig freetype ]; + propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; @@ -32,5 +33,5 @@ stdenv.mkDerivation rec { description = "A library for font customization and configuration"; homepage = http://fontconfig.org/; license = "bsd"; - }; + }; } -- GitLab From d8b7b65bb13aa9266dbcc7497bfa71d5d3e14ad9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:07:43 -0400 Subject: [PATCH 0713/5607] Slight cleanup --- pkgs/development/libraries/fontconfig/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 1d0b0b28eb2..116fe3c0c20 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; # We should find a better way to access the arch reliably. - crossArch = if (stdenv ? cross && stdenv.cross != null) - then stdenv.cross.arch else null; + crossArch = stdenv.cross.arch or null; preConfigure = '' if test -n "$crossConfig"; then -- GitLab From bda3c649c4d0a9c62c652dd4fb6749d505a489be Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:17:01 -0400 Subject: [PATCH 0714/5607] mesa: Update to 8.0.4 --- pkgs/development/libraries/mesa/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1c5285c6f5d..f72638677d1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -7,14 +7,14 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else -let version = "8.0.2"; in +let version = "8.0.4"; in stdenv.mkDerivation { name = "mesa-${version}"; src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - md5 = "a368104e5700707048dc3e8691a9a7a1"; + md5 = "d546f988adfdf986cff45b1efa2d8a46"; }; patches = @@ -41,7 +41,6 @@ stdenv.mkDerivation { description = "An open source implementation of OpenGL"; homepage = http://www.mesa3d.org/; license = "bsd"; - platforms = stdenv.lib.platforms.mesaPlatforms; maintainers = [ stdenv.lib.maintainers.simons ]; }; -- GitLab From 62cd9ea8698b62d2be05e8f2518e9d3450258309 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:17:31 -0400 Subject: [PATCH 0715/5607] pango: Update to 1.30.1 --- pkgs/development/libraries/pango/1.30.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pango/1.30.x.nix b/pkgs/development/libraries/pango/1.30.x.nix index d58efd79f78..7168c1b6c9d 100644 --- a/pkgs/development/libraries/pango/1.30.x.nix +++ b/pkgs/development/libraries/pango/1.30.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: stdenv.mkDerivation rec { - name = "pango-1.30.0"; + name = "pango-1.30.1"; src = fetchurl { url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz"; - sha256 = "7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff"; + sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; -- GitLab From 948aa32e468068367e51713654adcb2c6bcb932c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:17:54 -0400 Subject: [PATCH 0716/5607] atk: Update to 2.6.0 --- pkgs/development/libraries/atk/{2.4.x.nix => 2.6.x.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/atk/{2.4.x.nix => 2.6.x.nix} (83%) diff --git a/pkgs/development/libraries/atk/2.4.x.nix b/pkgs/development/libraries/atk/2.6.x.nix similarity index 83% rename from pkgs/development/libraries/atk/2.4.x.nix rename to pkgs/development/libraries/atk/2.6.x.nix index 94b0b146654..eba56776bd2 100644 --- a/pkgs/development/libraries/atk/2.4.x.nix +++ b/pkgs/development/libraries/atk/2.6.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, glib }: stdenv.mkDerivation rec { - name = "atk-2.4.0"; + name = "atk-2.6.0"; src = fetchurl { - url = "mirror://gnome/sources/atk/2.4/${name}.tar.xz"; - sha256 = "091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d"; + url = "mirror://gnome/sources/atk/2.6/${name}.tar.xz"; + sha256 = "eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"; }; buildNativeInputs = [ pkgconfig perl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e090fd0c97..ff73023f81c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3820,7 +3820,7 @@ let glib_networking = callPackage ../development/libraries/glib-networking {}; - atk = callPackage ../development/libraries/atk/2.4.x.nix { }; + atk = callPackage ../development/libraries/atk/2.6.x.nix { }; atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { }; -- GitLab From 21222798582c8ce8efdb28ad6e75ae3c780b44b5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:39:32 -0400 Subject: [PATCH 0717/5607] gtk+: Update to 2.24.13 --- pkgs/development/libraries/gtk+/2.24.x.nix | 20 +- .../libraries/gtk+/old-icons.patch | 270 ------------------ 2 files changed, 7 insertions(+), 283 deletions(-) delete mode 100644 pkgs/development/libraries/gtk+/old-icons.patch diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix index 12b270d637b..2bf657e04e7 100644 --- a/pkgs/development/libraries/gtk+/2.24.x.nix +++ b/pkgs/development/libraries/gtk+/2.24.x.nix @@ -7,24 +7,18 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; -stdenv.mkDerivation { - name = "gtk+-2.24.10"; +stdenv.mkDerivation rec { + name = "gtk+-2.24.13"; src = fetchurl { - url = mirror://gnome/sources/gtk+/2.24/gtk+-2.24.10.tar.xz; - sha256 = "128fb8vmsqmfmpf1r8na65281jwkqix4q7wix399xqfnp4dy6mpa"; + url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; + sha256 = "35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d"; }; - patches = - [ # Fix broken icons such as the back/forward buttons in Firefox. - # http://bugs.gentoo.org/339319 - ./old-icons.patch - ]; - enableParallelBuilding = true; - + buildNativeInputs = [ perl pkgconfig ]; - + propagatedBuildInputs = [ xlibs.xlibs glib atk pango gdk_pixbuf cairo xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi @@ -35,7 +29,7 @@ stdenv.mkDerivation { configureFlags = "--with-xinput=yes"; postInstall = "rm -rf $out/share/gtk-doc"; - + meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/development/libraries/gtk+/old-icons.patch b/pkgs/development/libraries/gtk+/old-icons.patch deleted file mode 100644 index e53d87474d0..00000000000 --- a/pkgs/development/libraries/gtk+/old-icons.patch +++ /dev/null @@ -1,270 +0,0 @@ -diff -ru gtk+-2.24.5-orig/gtk/Makefile.in gtk+-2.24.5/gtk/Makefile.in ---- gtk+-2.24.5-orig/gtk/Makefile.in 2011-06-16 01:56:37.000000000 +0200 -+++ gtk+-2.24.5/gtk/Makefile.in 2011-07-07 15:38:06.000000000 +0200 -@@ -1616,7 +1616,173 @@ - stock-icons/24/folder-remote.png \ - stock-icons/24/user-home.png \ - stock-icons/24/user-desktop.png \ -- stock-icons/24/text-x-generic.png -+ stock-icons/24/text-x-generic.png \ -+ stock-icons/16/gtk-quit.png \ -+ stock-icons/16/gtk-info.png \ -+ stock-icons/16/gtk-file.png \ -+ stock-icons/16/gtk-open.png \ -+ stock-icons/16/gtk-print-preview.png \ -+ stock-icons/16/gtk-print.png \ -+ stock-icons/16/gtk-properties.png \ -+ stock-icons/16/gtk-revert-to-saved-ltr.png \ -+ stock-icons/16/gtk-revert-to-saved-rtl.png \ -+ stock-icons/16/gtk-save-as.png \ -+ stock-icons/16/gtk-new.png \ -+ stock-icons/16/gtk-harddisk.png \ -+ stock-icons/16/gtk-clear.png \ -+ stock-icons/16/gtk-copy.png \ -+ stock-icons/16/gtk-cut.png \ -+ stock-icons/16/gtk-delete.png \ -+ stock-icons/16/gtk-find-and-replace.png \ -+ stock-icons/16/gtk-find.png \ -+ stock-icons/16/gtk-paste.png \ -+ stock-icons/16/gtk-redo-ltr.png \ -+ stock-icons/16/gtk-redo-rtl.png \ -+ stock-icons/16/gtk-select-all.png \ -+ stock-icons/16/gtk-undo-ltr.png \ -+ stock-icons/16/gtk-undo-rtl.png \ -+ stock-icons/16/gtk-directory.png \ -+ stock-icons/16/gtk-unindent-ltr.png \ -+ stock-icons/16/gtk-unindent-rtl.png \ -+ stock-icons/16/gtk-indent-ltr.png \ -+ stock-icons/16/gtk-indent-rtl.png \ -+ stock-icons/16/gtk-justify-center.png \ -+ stock-icons/16/gtk-justify-fill.png \ -+ stock-icons/16/gtk-justify-left.png \ -+ stock-icons/16/gtk-justify-right.png \ -+ stock-icons/16/gtk-bold.png \ -+ stock-icons/16/gtk-italic.png \ -+ stock-icons/16/gtk-strikethrough.png \ -+ stock-icons/16/gtk-underline.png \ -+ stock-icons/16/gtk-goto-bottom.png \ -+ stock-icons/16/gtk-go-down.png \ -+ stock-icons/16/gtk-goto-first-ltr.png \ -+ stock-icons/16/gtk-home.png \ -+ stock-icons/16/gtk-jump-to-ltr.png \ -+ stock-icons/16/gtk-jump-to-rtl.png \ -+ stock-icons/16/gtk-goto-last-ltr.png \ -+ stock-icons/16/gtk-go-forward-ltr.png \ -+ stock-icons/16/gtk-go-back-ltr.png \ -+ stock-icons/16/gtk-goto-top.png \ -+ stock-icons/16/gtk-go-up.png \ -+ stock-icons/16/gtk-about.png \ -+ stock-icons/16/gtk-help.png \ -+ stock-icons/16/gtk-missing-image.png \ -+ stock-icons/16/gtk-add.png \ -+ stock-icons/16/gtk-remove.png \ -+ stock-icons/16/gtk-floppy.png \ -+ stock-icons/16/gtk-cdrom.png \ -+ stock-icons/16/gtk-media-pause.png \ -+ stock-icons/16/gtk-media-play-ltr.png \ -+ stock-icons/16/gtk-media-play-rtl.png \ -+ stock-icons/16/gtk-media-stop.png \ -+ stock-icons/16/gtk-media-record.png \ -+ stock-icons/16/gtk-media-rewind-ltr.png \ -+ stock-icons/16/gtk-media-forward-ltr.png \ -+ stock-icons/16/gtk-media-previous-ltr.png \ -+ stock-icons/16/gtk-media-next-ltr.png \ -+ stock-icons/16/gtk-network.png \ -+ stock-icons/16/gtk-print-error.png \ -+ stock-icons/16/gtk-print-report.png \ -+ stock-icons/16/gtk-print-paused.png \ -+ stock-icons/16/gtk-print-warning.png \ -+ stock-icons/16/gtk-stop.png \ -+ stock-icons/16/gtk-execute.png \ -+ stock-icons/16/gtk-spell-check.png \ -+ stock-icons/16/gtk-fullscreen.png \ -+ stock-icons/16/gtk-refresh.png \ -+ stock-icons/16/gtk-leave-fullscreen.png \ -+ stock-icons/16/gtk-sort-ascending.png \ -+ stock-icons/16/gtk-sort-descending.png \ -+ stock-icons/16/gtk-close.png \ -+ stock-icons/16/gtk-zoom-fit.png \ -+ stock-icons/16/gtk-zoom-in.png \ -+ stock-icons/16/gtk-zoom-100.png \ -+ stock-icons/16/gtk-zoom-out.png \ -+ stock-icons/24/gtk-quit.png \ -+ stock-icons/24/gtk-info.png \ -+ stock-icons/24/gtk-file.png \ -+ stock-icons/24/gtk-open.png \ -+ stock-icons/24/gtk-print-preview.png \ -+ stock-icons/24/gtk-print.png \ -+ stock-icons/24/gtk-properties.png \ -+ stock-icons/24/gtk-revert-to-saved-ltr.png \ -+ stock-icons/24/gtk-revert-to-saved-rtl.png \ -+ stock-icons/24/gtk-save-as.png \ -+ stock-icons/24/gtk-new.png \ -+ stock-icons/24/gtk-harddisk.png \ -+ stock-icons/24/gtk-clear.png \ -+ stock-icons/24/gtk-copy.png \ -+ stock-icons/24/gtk-cut.png \ -+ stock-icons/24/gtk-delete.png \ -+ stock-icons/24/gtk-find-and-replace.png \ -+ stock-icons/24/gtk-find.png \ -+ stock-icons/24/gtk-paste.png \ -+ stock-icons/24/gtk-redo-ltr.png \ -+ stock-icons/24/gtk-redo-rtl.png \ -+ stock-icons/24/gtk-select-all.png \ -+ stock-icons/24/gtk-undo-ltr.png \ -+ stock-icons/24/gtk-undo-rtl.png \ -+ stock-icons/24/gtk-directory.png \ -+ stock-icons/24/gtk-unindent-ltr.png \ -+ stock-icons/24/gtk-unindent-rtl.png \ -+ stock-icons/24/gtk-indent-ltr.png \ -+ stock-icons/24/gtk-indent-rtl.png \ -+ stock-icons/24/gtk-justify-center.png \ -+ stock-icons/24/gtk-justify-fill.png \ -+ stock-icons/24/gtk-justify-left.png \ -+ stock-icons/24/gtk-justify-right.png \ -+ stock-icons/24/gtk-bold.png \ -+ stock-icons/24/gtk-italic.png \ -+ stock-icons/24/gtk-strikethrough.png \ -+ stock-icons/24/gtk-underline.png \ -+ stock-icons/24/gtk-goto-bottom.png \ -+ stock-icons/24/gtk-go-down.png \ -+ stock-icons/24/gtk-goto-first-ltr.png \ -+ stock-icons/24/gtk-home.png \ -+ stock-icons/24/gtk-jump-to-ltr.png \ -+ stock-icons/24/gtk-jump-to-rtl.png \ -+ stock-icons/24/gtk-goto-last-ltr.png \ -+ stock-icons/24/gtk-go-forward-ltr.png \ -+ stock-icons/24/gtk-go-back-ltr.png \ -+ stock-icons/24/gtk-goto-top.png \ -+ stock-icons/24/gtk-go-up.png \ -+ stock-icons/24/gtk-about.png \ -+ stock-icons/24/gtk-help.png \ -+ stock-icons/24/gtk-missing-image.png \ -+ stock-icons/24/gtk-add.png \ -+ stock-icons/24/gtk-remove.png \ -+ stock-icons/24/gtk-floppy.png \ -+ stock-icons/24/gtk-cdrom.png \ -+ stock-icons/24/gtk-media-pause.png \ -+ stock-icons/24/gtk-media-play-ltr.png \ -+ stock-icons/24/gtk-media-play-rtl.png \ -+ stock-icons/24/gtk-media-stop.png \ -+ stock-icons/24/gtk-media-record.png \ -+ stock-icons/24/gtk-media-rewind-ltr.png \ -+ stock-icons/24/gtk-media-forward-ltr.png \ -+ stock-icons/24/gtk-media-previous-ltr.png \ -+ stock-icons/24/gtk-media-next-ltr.png \ -+ stock-icons/24/gtk-network.png \ -+ stock-icons/24/gtk-print-error.png \ -+ stock-icons/24/gtk-print-report.png \ -+ stock-icons/24/gtk-print-paused.png \ -+ stock-icons/24/gtk-print-warning.png \ -+ stock-icons/24/gtk-stop.png \ -+ stock-icons/24/gtk-execute.png \ -+ stock-icons/24/gtk-spell-check.png \ -+ stock-icons/24/gtk-fullscreen.png \ -+ stock-icons/24/gtk-refresh.png \ -+ stock-icons/24/gtk-leave-fullscreen.png \ -+ stock-icons/24/gtk-sort-ascending.png \ -+ stock-icons/24/gtk-sort-descending.png \ -+ stock-icons/24/gtk-close.png \ -+ stock-icons/24/gtk-zoom-fit.png \ -+ stock-icons/24/gtk-zoom-in.png \ -+ stock-icons/24/gtk-zoom-100.png \ -+ stock-icons/24/gtk-zoom-out.png \ -+ stock-icons/48/gtk-dialog-error.png -+ - - @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \ - @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache -@@ -2887,7 +3053,91 @@ - && $(LN_S) folder.png user-desktop.png \ - && $(RM) user-home.png \ - && $(LN_S) folder.png user-home.png \ -+ && $(LN_S) application-exit.png gtk-quit.png \ -+ && $(LN_S) dialog-information.png gtk-info.png \ -+ && $(LN_S) document-new.png gtk-file.png \ -+ && $(LN_S) document-open.png gtk-open.png \ -+ && $(LN_S) document-print-preview.png gtk-print-preview.png \ -+ && $(LN_S) document-print.png gtk-print.png \ -+ && $(LN_S) document-properties.png gtk-properties.png \ -+ && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \ -+ && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \ -+ && $(LN_S) document-save-as.png gtk-save-as.png \ -+ && $(LN_S) document-x-generic.png gtk-new.png \ -+ && $(LN_S) drive-harddisk.png gtk-harddisk.png \ -+ && $(LN_S) edit-clear.png gtk-clear.png \ -+ && $(LN_S) edit-copy.png gtk-copy.png \ -+ && $(LN_S) edit-cut.png gtk-cut.png \ -+ && $(LN_S) edit-delete.png gtk-delete.png \ -+ && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \ -+ && $(LN_S) edit-find.png gtk-find.png \ -+ && $(LN_S) edit-paste.png gtk-paste.png \ -+ && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \ -+ && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \ -+ && $(LN_S) edit-select-all.png gtk-select-all.png \ -+ && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \ -+ && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \ -+ && $(LN_S) folder.png gtk-directory.png \ -+ && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \ -+ && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \ -+ && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \ -+ && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \ -+ && $(LN_S) format-justify-center.png gtk-justify-center.png \ -+ && $(LN_S) format-justify-fill.png gtk-justify-fill.png \ -+ && $(LN_S) format-justify-left.png gtk-justify-left.png \ -+ && $(LN_S) format-justify-right.png gtk-justify-right.png \ -+ && $(LN_S) format-text-bold.png gtk-bold.png \ -+ && $(LN_S) format-text-italic.png gtk-italic.png \ -+ && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \ -+ && $(LN_S) format-text-underline.png gtk-underline.png \ -+ && $(LN_S) go-bottom.png gtk-goto-bottom.png \ -+ && $(LN_S) go-down.png gtk-go-down.png \ -+ && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \ -+ && $(LN_S) go-home.png gtk-home.png \ -+ && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \ -+ && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \ -+ && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \ -+ && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \ -+ && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \ -+ && $(LN_S) go-top.png gtk-goto-top.png \ -+ && $(LN_S) go-up.png gtk-go-up.png \ -+ && $(LN_S) help-about.png gtk-about.png \ -+ && $(LN_S) help-contents.png gtk-help.png \ -+ && $(LN_S) image-missing.png gtk-missing-image.png \ -+ && $(LN_S) list-add.png gtk-add.png \ -+ && $(LN_S) list-remove.png gtk-remove.png \ -+ && $(LN_S) media-floppy.png gtk-floppy.png \ -+ && $(LN_S) media-optical.png gtk-cdrom.png \ -+ && $(LN_S) media-playback-pause.png gtk-media-pause.png \ -+ && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \ -+ && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \ -+ && $(LN_S) media-playback-stop.png gtk-media-stop.png \ -+ && $(LN_S) media-record.png gtk-media-record.png \ -+ && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \ -+ && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \ -+ && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \ -+ && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \ -+ && $(LN_S) network-idle.png gtk-network.png \ -+ && $(LN_S) printer-error.png gtk-print-error.png \ -+ && $(LN_S) printer-info.png gtk-print-report.png \ -+ && $(LN_S) printer-paused.png gtk-print-paused.png \ -+ && $(LN_S) printer-warning.png gtk-print-warning.png \ -+ && $(LN_S) process-stop.png gtk-stop.png \ -+ && $(LN_S) system-run.png gtk-execute.png \ -+ && $(LN_S) tools-check-spelling.png gtk-spell-check.png \ -+ && $(LN_S) view-fullscreen.png gtk-fullscreen.png \ -+ && $(LN_S) view-refresh.png gtk-refresh.png \ -+ && $(LN_S) view-restore.png gtk-leave-fullscreen.png \ -+ && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \ -+ && $(LN_S) view-sort-descending.png gtk-sort-descending.png \ -+ && $(LN_S) window-close.png gtk-close.png \ -+ && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \ -+ && $(LN_S) zoom-in.png gtk-zoom-in.png \ -+ && $(LN_S) zoom-original.png gtk-zoom-100.png \ -+ && $(LN_S) zoom-out.png gtk-zoom-out.png \ - ) done \ -+ && (cd stock-icons/48 \ -+ && $(LN_S) dialog-error.png gtk-dialog-error.png) \ - && touch stamp-icons - - gtkbuiltincache.h: @REBUILD@ stamp-icons -- GitLab From 9f9a561107c5008b5284cb5f6e3edee38a3e64fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 15:51:57 -0400 Subject: [PATCH 0718/5607] xkeyboard-config; Update to 2.7 --- pkgs/data/misc/xkeyboard-config/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index d4d5437e89f..67bb79725fb 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }: stdenv.mkDerivation rec { - name = "xkeyboard-config-2.5.1"; + name = "xkeyboard-config-2.7"; src = fetchurl { - url = "mirror://xorg/individual/data/${name}.tar.bz2"; - sha256 = "14ncsbzi8l1dw0ypd36az9kxvrsqfspl3w51zj5p52f373ffi07b"; + url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2"; + sha256 = "08c3mjdgp7c2v6lj5bymaczcazklsd7s1lxslxbngzmh5yhphd74"; }; buildInputs = [ gettext ]; -- GitLab From 2fed9dfbc538b601730848ceb6352248f2b8466c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 16:11:26 -0400 Subject: [PATCH 0719/5607] Some X.org updates (include xorg-server to 1.12.4) --- pkgs/servers/x11/xorg/default.nix | 94 ++++++++++++------------- pkgs/servers/x11/xorg/tarballs-7.7.list | 30 ++++---- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 3567f1ad0d9..847ffb92ba0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -68,11 +68,11 @@ let })) // {inherit ;}; dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) { - name = "dri2proto-2.6"; + name = "dri2proto-2.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/dri2proto-2.6.tar.bz2; - sha256 = "02drlfqvjm2q7dvkkwli3fs2crb6rdb3kyd13vwx7z0rijrc10md"; + url = mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2; + sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -478,11 +478,11 @@ let })) // {inherit ;}; glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) { - name = "glproto-1.4.15"; + name = "glproto-1.4.16"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/glproto-1.4.15.tar.bz2; - sha256 = "0wf1vq9g4pyzahb23ywx554pm5bpax49lz188fk6m5p8wbmmc0wr"; + url = mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2; + sha256 = "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -748,11 +748,11 @@ let })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) { - name = "libXrandr-1.3.2"; + name = "libXrandr-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXrandr-1.3.2.tar.bz2; - sha256 = "10cvv78ws8jznma4s45dzqz0ldcxk30qgsqrc4wxfcsjmcba5b3y"; + url = mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2; + sha256 = "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -978,11 +978,11 @@ let })) // {inherit libXau ;}; randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) { - name = "randrproto-1.3.2"; + name = "randrproto-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2; - sha256 = "0wfwcq85wbm0g5r0snc7prgki1wi3kxrxhcxinyr54n45ihh03fr"; + url = mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2; + sha256 = "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1118,14 +1118,14 @@ let })) // {inherit libX11 libXau libXext libXmu ;}; xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) { - name = "xbacklight-1.1.2"; + name = "xbacklight-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xbacklight-1.1.2.tar.bz2; - sha256 = "02b5jfys2msla2yvg5s0knzyxg2104r25czkwd49i8g8kp804bxg"; + url = mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2; + sha256 = "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji"; }; - buildInputs = [pkgconfig libX11 libXrandr ]; - })) // {inherit libX11 libXrandr ;}; + buildInputs = [pkgconfig libxcb xcbutil ]; + })) // {inherit libxcb xcbutil ;}; xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) { name = "xbitmaps-1.1.1"; @@ -1338,11 +1338,11 @@ let })) // {inherit ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.7.0"; + name = "xf86-input-evdev-2.7.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-2.7.0.tar.bz2; - sha256 = "1ivf5n821chckrgp89mpb18zi00v1hyrkc1hr82q0x6g1kpgxq9y"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2; + sha256 = "01557w1kmsaqdsc42pxyypig10l5r5vh9axz9g22hg9cc09r8f7b"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; })) // {inherit inputproto udev xorgserver xproto ;}; @@ -1378,21 +1378,21 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.6.1"; + name = "xf86-input-synaptics-1.6.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-1.6.1.tar.bz2; - sha256 = "0g5b1s6q1dg38l8y47cwg7cs5nivwj0agmp71g273ws0lfg4bc8s"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2; + sha256 = "082rlbyw63sashjbwd7dd0a0smp5n8yv9bihy19c706lhnhddxy3"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) { - name = "xf86-input-vmmouse-12.8.0"; + name = "xf86-input-vmmouse-12.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2; - sha256 = "16l65mnjb1xxav6c5q0xhhqih81bzify2c5qrhqc2j3waq5yr9m8"; + url = mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2; + sha256 = "1gwrna96f0p4gpjhin8yx01y5xvns2j15f7hw1jvqf7fpzv01kzv"; }; buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ]; })) // {inherit inputproto randrproto xorgserver xproto ;}; @@ -1438,21 +1438,21 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-6.14.4"; + name = "xf86-video-ati-6.14.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-ati-6.14.4.tar.bz2; - sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"; + url = mirror://xorg/individual/driver/xf86-video-ati-6.14.6.tar.bz2; + sha256 = "0dpcdgw7vmx53l3byp900na5s980v1nw11a7y5yps67hwjrqclma"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) { - name = "xf86-video-cirrus-1.4.0"; + name = "xf86-video-cirrus-1.5.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-1.4.0.tar.bz2; - sha256 = "0blnbspj4936wy46lp346s4b08dfcray6yicsxvv5b4699fzl1rb"; + url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2; + sha256 = "0my54x52fsa82bsh196hz79750xjlv8ddbvin7230ck7pnf44md9"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1468,11 +1468,11 @@ let })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) { - name = "xf86-video-fbdev-0.4.2"; + name = "xf86-video-fbdev-0.4.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-0.4.2.tar.bz2; - sha256 = "1mc23w0bfmak5216411xh58nrs93jlxmi6l412hmqzhxnjs73clk"; + url = mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2; + sha256 = "0ca8khgy3wv0fys7s4087apvnp8j86blxj5m5m70l10hs5x06yzz"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;}; @@ -1518,11 +1518,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.19.0"; + name = "xf86-video-intel-2.20.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-intel-2.19.0.tar.bz2; - sha256 = "1g742szymajh88a5dw08sxcr45bmxgc4w3m6hddv9qscn5hks4rj"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.20.8.tar.bz2; + sha256 = "1rw3rb3zjvx3qyppynj3mi8zs4rpx2b193znxssrv39vp4mnn4ia"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; @@ -1588,11 +1588,11 @@ let })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) { - name = "xf86-video-nv-2.1.18"; + name = "xf86-video-nv-2.1.20"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-nv-2.1.18.tar.bz2; - sha256 = "05glbi9jc7j9nm4sf4qvl3z87s48ibm3i283lqz85kbphg62dxvc"; + url = mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2; + sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; @@ -1708,11 +1708,11 @@ let })) // {inherit randrproto videoproto xorgserver xproto ;}; xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) { - name = "xf86-video-vesa-2.3.1"; + name = "xf86-video-vesa-2.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-2.3.1.tar.bz2; - sha256 = "0wqms28kkz2fvghqhqwp6w8zj7k5cgwnhzvkc7j4v268bf6h78g4"; + url = mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2; + sha256 = "1qqf97baii1dcsm3y8gqw674j4r8llhkbqsavhyn11iwmvzifjhl"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ]; })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; @@ -1928,11 +1928,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.12.2"; + name = "xorg-server-1.12.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2; - sha256 = "1xf57hcq6r17zxyfnx9r1wd0ir1bw13ff8bsiszwrw9jyhi9x7ya"; + url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2; + sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 861b88e9daf..1560e4bfd28 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -4,7 +4,7 @@ mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/dri2proto-2.6.tar.bz2 +mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2 @@ -44,7 +44,7 @@ mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/glproto-1.4.15.tar.bz2 +mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2 mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 @@ -74,7 +74,7 @@ mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXrandr-1.3.2.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 @@ -88,7 +88,7 @@ mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/randrproto-1.3.2.tar.bz2 +mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 @@ -101,7 +101,7 @@ mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xbacklight-1.1.2.tar.bz2 +mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 @@ -115,29 +115,29 @@ mirror://xorg/X11R7.7/src/everything/xextproto-7.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-input-evdev-2.7.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.7.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-joystick-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-keyboard-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-mouse-1.7.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-input-synaptics-1.6.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-input-vmmouse-12.8.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.6.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-ati-6.14.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-cirrus-1.4.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-fbdev-0.4.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-intel-2.19.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.20.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-nv-2.1.18.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-openchrome-0.2.906.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-r128-6.8.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-savage-2.3.4.tar.bz2 @@ -149,7 +149,7 @@ mirror://xorg/X11R7.7/src/everything/xf86-video-tdfx-1.4.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-tga-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-trident-1.3.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xf86-video-vesa-2.3.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vesa-2.3.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-12.0.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-voodoo-1.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 @@ -167,7 +167,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xorg-server-1.12.2.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 -- GitLab From 27bd526654c2d876324b2192b71d671c8ee39a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 26 Sep 2012 22:34:55 +0200 Subject: [PATCH 0720/5607] freeswitch: updating to stable 1.2.3 I'll avoid using the git version; I'm less sure if it's better than the released stable. --- pkgs/servers/sip/freeswitch/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 5b341b7deb9..a1d9940c887 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,21 +1,16 @@ -{ fetchgit, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg -, libzrtpcpp, autoconf, automake, libtool }: +{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg +, libzrtpcpp }: stdenv.mkDerivation rec { - name = "freeswitch-git-0db52e6"; + name = "freeswitch-1.2.3"; - src = fetchgit { - url = "git://git.freeswitch.org/freeswitch.git"; - rev = "0db52e6e556fce584f1850c3a3b87c8f46ff87c5"; - sha256 = "5cc7161c1ba64c5faf3dda2669e9aafd529eaa66be2fd83f284304444bcab9ff"; + src = fetchurl { + url = http://files.freeswitch.org/freeswitch-1.2.3.tar.bz2; + sha256 = "0kfvn5f75c6r6yp18almjz9p6llvpm66gpbxcjswrg3ddgbkzg0k"; }; - preConfigure = '' - ./bootstrap.sh - ''; - buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg - autoconf automake libtool libzrtpcpp ]; + libzrtpcpp ]; meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; -- GitLab From 0446a79473049a92ff2a7987fccda74f62f3dc3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 17:00:55 -0400 Subject: [PATCH 0721/5607] Fix icewm build on libX11-1.5.0 --- .../window-managers/icewm/default.nix | 2 ++ .../window-managers/icewm/deprecated.patch | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/window-managers/icewm/deprecated.patch diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 0b541d8104d..3b1c3b4ad37 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na"; }; + patches = [ ./deprecated.patch ]; + NIX_LDFLAGS = "-lfontconfig"; # The fuloong2f is not supported by 1.3.6 still diff --git a/pkgs/applications/window-managers/icewm/deprecated.patch b/pkgs/applications/window-managers/icewm/deprecated.patch new file mode 100644 index 00000000000..7d22dfe719b --- /dev/null +++ b/pkgs/applications/window-managers/icewm/deprecated.patch @@ -0,0 +1,23 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch?revision=1.1 + +Description: Don't use "deprecated" as identifier, will FTBFS if another + library defines functions as deprecated. +Author: Andreas Moog +Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179 +Forwarded: Yes + +--- icewm-1.3.7.orig/src/base.h ++++ icewm-1.3.7/src/base.h +@@ -2,9 +2,9 @@ + #define __BASE_H + + #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 +-#define deprecated __attribute__((deprecated)) ++#define ICEWM_deprecated __attribute__((deprecated)) + #else +-#define deprecated ++#define ICEWM_deprecated + #endif + + /*** Atomar Data Types ********************************************************/ -- GitLab From 599517668cdcb1bbd8707c707734dc973c59984f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 17:27:20 -0400 Subject: [PATCH 0722/5607] Fix Firefox config option processing --- pkgs/top-level/all-packages.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e164c16827b..f18d1115a54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7876,20 +7876,21 @@ let inherit stdenv makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; plugins = let - enableAdobeFlash = config.browserNameenableAdobeFlash or true; - enableGnash = config.browserNameenableGnash or false; + cfg = stdenv.lib.attrByPath [ browserName ] {} config; + enableAdobeFlash = cfg.enableAdobeFlash or true; + enableGnash = cfg.enableGnash or false; in assert !(enableGnash && enableAdobeFlash); ([ ] ++ lib.optional enableGnash gnash ++ lib.optional enableAdobeFlash flashplayer # RealPlayer is disabled by default for legal reasons. - ++ lib.optional (system != "i686-linux" && config.browserNameenableRealPlayer or false) RealPlayer - ++ lib.optional (config.browserNameenableDjvu or false) (djview4) - ++ lib.optional (config.browserNameenableMPlayer or false) (MPlayerPlugin browser) - ++ lib.optional (config.browserNameenableGeckoMediaPlayer or false) gecko_mediaplayer - ++ lib.optional (supportsJDK && config.browserNamejre or false && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional (config.browserNameenableGoogleTalkPlugin or false) google_talk_plugin + ++ lib.optional (system != "i686-linux" && cfg.enableRealPlayer or false) RealPlayer + ++ lib.optional (cfg.enableDjvu or false) (djview4) + ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) + ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer + ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin + ++ lib.optional (cfg.eenableGoogleTalkPlugin or false) google_talk_plugin ); libs = if config.browserNameenableQuakeLive or false -- GitLab From 775d62748feecb2541ecda1e322ccb8743cb0e3c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 17:28:53 -0400 Subject: [PATCH 0723/5607] Make Firefox 15 the default --- .../networking/browsers/firefox/13.0.nix | 188 ------------------ 1 file changed, 188 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/13.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/13.0.nix b/pkgs/applications/networking/browsers/firefox/13.0.nix deleted file mode 100644 index fbbf3275ad1..00000000000 --- a/pkgs/applications/networking/browsers/firefox/13.0.nix +++ /dev/null @@ -1,188 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper - -, # 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 = "13.0.1"; - - xulVersion = "13.0.1"; # 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"; - sha1 = "3752f13f26a51dd2e42d2805a707a842e6f8d1b1"; - }; - - 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 - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # 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])) - }' ';' - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; # */ - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - 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/{xpcshell,plugin-container}; 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 - ]; - - 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"; - - # 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; - ''; # */ - - 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; - }; - }; -} -- GitLab From 2ca9fc3a32beb1b797acea8497cc0c394d5ff457 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 17:29:07 -0400 Subject: [PATCH 0724/5607] Make Firefox 15 the default (for realz this time) --- pkgs/top-level/all-packages.nix | 8 +------- pkgs/top-level/release.nix | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f18d1115a54..547f74f931d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6911,7 +6911,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox12Pkgs; + firefoxPkgs = pkgs.firefox15Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; @@ -6925,12 +6925,6 @@ let firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; }; - firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix { - inherit (gnome) libIDL; - }; - - firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; }); - firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3b0a015d6b4..0f8ea5574e3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,6 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; - firefox13Pkgs.firefox = linux; firefox15Pkgs.firefox = linux; gnome = { -- GitLab From d8e8ff1fe979f7efd73ea2264efaf7fd239bc855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 26 Sep 2012 23:45:35 +0200 Subject: [PATCH 0725/5607] Typo, fix the googleTalkPlugin --- 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 547f74f931d..3aeb726a855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7884,7 +7884,7 @@ let ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer ++ lib.optional (supportsJDK && cfg.jre or false && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional (cfg.eenableGoogleTalkPlugin or false) google_talk_plugin + ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ); libs = if config.browserNameenableQuakeLive or false -- GitLab From 5046d0628f1ec187b56fd847fd5dc1a41d04df50 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 18:11:23 -0400 Subject: [PATCH 0726/5607] cups: Update to 1.6.1 --- pkgs/misc/cups/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index bf4e4d1d7e5..63018380580 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let - version = "1.5.2"; -in +let version = "1.6.1"; in + stdenv.mkDerivation { name = "cups-${version}"; @@ -11,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1yw7l5rq93zg91akqf68b871frrs4q0krc9cx43ly7v3ih8all5i"; + sha256 = "143pk8a0kqqr7m9j0b8c9h2nn0zf6awpivk7wq7iclz68h8snhjq"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] -- GitLab From d9152f013345d3d9b2c1b1acc5efcea6eba9f3e9 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 27 Sep 2012 01:29:53 +0200 Subject: [PATCH 0727/5607] fix build of smpeg --- pkgs/development/libraries/smpeg/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 3e7baf77df8..e259e22ff01 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -10,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0"; }; + enableParallelBuilding = true; + buildInputs = [ SDL autoconf automake libtool gtk m4 pkgconfig mesa ]; preConfigure = '' touch NEWS AUTHORS ChangeLog - autoreconf -fvi -I acinclude + sh autogen.sh ''; postInstall = '' -- GitLab From 1c35a0ca484404f935abc9af027365813d5cb97b Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 27 Sep 2012 01:35:40 +0200 Subject: [PATCH 0728/5607] adding python libraries serial and game which are both dependencies of plover steno engine which needs more testing --- pkgs/top-level/python-packages.nix | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a55a869f88c..376cb2b3bbf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -784,6 +784,36 @@ let pythonPackages = python.modules // rec { }; }); + game = buildPythonPackage rec { + name = "pygame-1.9.1"; + src = fetchurl { + url = http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz; + sha256 = "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52"; + }; + patches = [ ./pygame.patch ]; + # auto confirming missing dependencies: + # PORTMIDI and PORTTIME still missing + patchPhase = '' + sed -i 's@raw_input(.*@"1"@' config_unix.py + unset patchPhase + patchPhase + ''; + installCommand = "python setup.py install --prefix=$out"; + + propagatedBuildInputs = [ + pkgs.SDL + pkgs.SDL_mixer + pkgs.SDL_gfx + pkgs.SDL_net + pkgs.SDL_sound + pkgs.SDL_ttf + pkgs.SDL_image + pkgs.smpeg + pkgs.libpng + pkgs.libjpeg + ]; + }; + genshi = buildPythonPackage { name = "genshi-0.6"; @@ -3009,6 +3039,15 @@ let pythonPackages = python.modules // rec { }; }; + serial = buildPythonPackage rec { + name = "pyserial-2.5"; + doCheck = false; + src = fetchurl { + url = http://heanet.dl.sourceforge.net/project/pyserial/pyserial/2.5/pyserial-2.5.tar.gz; + sha256 = "04gmpfb43ppc8cf1bvkz8r1gl0nrxc38kpfdqs40ib0d1ql25pgd"; + }; + }; + tracing = buildPythonPackage rec { name = "tracing-0.6"; -- GitLab From 5b7d7b11f3f1798fc16f28a97f1344085b33b288 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 26 Sep 2012 22:21:14 -0400 Subject: [PATCH 0729/5607] dbus: Update to 1.6.4 --- pkgs/development/libraries/dbus/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index c943fe87fb3..0b8029c94db 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: let - version = "1.4.16"; + version = "1.6.4"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "1ii93d0lzj5xm564dcq6ca4s0nvm5i9fx3jp0s7i9hlc5wkfd3hx"; + sha256 = "1wacqyfkcpayg7f8rvx9awqg275n5pksxq5q7y21lxjx85x6pfjz"; }; patches = [ ./ignore-missing-includedirs.patch ]; @@ -21,6 +21,10 @@ in rec { buildInputs = [ expat ]; + # FIXME: dbus has optional systemd integration when checking + # at_console policies. How to enable this without introducing a + # circular dependency between dbus and systemd? + inherit src patches configureFlags; preConfigure = @@ -58,6 +62,8 @@ in rec { ''; postConfigure = "cd tools"; + + installFlags = "localstatedir=$TMPDIR/var"; }; # I'm too lazy to separate daemon and libs now. -- GitLab From f81253e743eab7577e84d91250dec65b93ce7bc7 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 27 Sep 2012 09:45:07 +0200 Subject: [PATCH 0730/5607] Add haskell-distributed-process and dependencies. --- .../haskell/distributed-process/default.nix | 22 +++++++++++++++++++ .../haskell/distributed-static/default.nix | 15 +++++++++++++ .../haskell/network-transport/default.nix | 15 +++++++++++++ .../haskell/rank1dynamic/default.nix | 15 +++++++++++++ pkgs/top-level/haskell-packages.nix | 8 +++++++ 5 files changed, 75 insertions(+) create mode 100644 pkgs/development/libraries/haskell/distributed-process/default.nix create mode 100644 pkgs/development/libraries/haskell/distributed-static/default.nix create mode 100644 pkgs/development/libraries/haskell/network-transport/default.nix create mode 100644 pkgs/development/libraries/haskell/rank1dynamic/default.nix diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix new file mode 100644 index 00000000000..25b53834f94 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -0,0 +1,22 @@ +{ cabal, binary, dataAccessor, distributedStatic, mtl +, networkTransport, random, rank1dynamic, stm, syb, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process"; + version = "0.3.1"; + sha256 = "048j27mpdmknz2s4ja3q2mla1d2sjbvrpmzx0lz2qas123qz1siq"; + buildDepends = [ + binary dataAccessor distributedStatic mtl networkTransport random + rank1dynamic stm syb time transformers + ]; + noHaddock = true; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process"; + description = "Cloud Haskell: Erlang-style concurrency in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix new file mode 100644 index 00000000000..0778089bdd0 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -0,0 +1,15 @@ +{ cabal, binary, rank1dynamic }: + +cabal.mkDerivation (self: { + pname = "distributed-static"; + version = "0.2.0.0"; + sha256 = "04s3iils9ji8bwizvm36r5ihnd11098346br0919dv1x6g67a610"; + buildDepends = [ binary rank1dynamic ]; + meta = { + homepage = "http://www.github.com/haskell-distributed/distributed-process"; + description = "Compositional, type-safe, polymorphic static values and closures"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix new file mode 100644 index 00000000000..9e3ab7e7796 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -0,0 +1,15 @@ +{ cabal, binary, transformers }: + +cabal.mkDerivation (self: { + pname = "network-transport"; + version = "0.2.0.2"; + sha256 = "1pipykqwbjmbkgkmk0ss2pvfp72rkxwmz49d1j5xi8b0rlfgw05c"; + buildDepends = [ binary transformers ]; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process"; + description = "Network abstraction layer"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix new file mode 100644 index 00000000000..b243279d64e --- /dev/null +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -0,0 +1,15 @@ +{ cabal, binary }: + +cabal.mkDerivation (self: { + pname = "rank1dynamic"; + version = "0.1.0.0"; + sha256 = "19wyklhf5sghip0i71sza7lv50lj2dawfxy6k67njxr1y56ky92w"; + buildDepends = [ binary ]; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process"; + description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; + 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 e7157bc507b..8a9377c50c6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -652,6 +652,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; + distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; + + distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; + distributive = callPackage ../development/libraries/haskell/distributive {}; dlist = callPackage ../development/libraries/haskell/dlist {}; @@ -1138,6 +1142,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + networkTransport = callPackage ../development/libraries/haskell/network-transport {}; + newtype = callPackage ../development/libraries/haskell/newtype {}; nonNegative = callPackage ../development/libraries/haskell/non-negative {}; @@ -1277,6 +1283,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {}; + rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {}; + ranges = callPackage ../development/libraries/haskell/ranges {}; rvar = callPackage ../development/libraries/haskell/rvar {}; -- GitLab From 42cf8b10021ebbaf997b3d65cf9ec58a1552fb87 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 27 Sep 2012 09:50:02 +0200 Subject: [PATCH 0731/5607] Add distributed-process-simplelocalnet and dependencies. --- .../default.nix | 21 +++++++++++++++++++ .../haskell/network-multicast/default.nix | 14 +++++++++++++ .../haskell/network-transport-tcp/default.nix | 15 +++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++++ 4 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix create mode 100644 pkgs/development/libraries/haskell/network-multicast/default.nix create mode 100644 pkgs/development/libraries/haskell/network-transport-tcp/default.nix diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix new file mode 100644 index 00000000000..650f82a99ec --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -0,0 +1,21 @@ +{ cabal, binary, dataAccessor, distributedProcess, network +, networkMulticast, networkTransport, networkTransportTcp +, transformers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process-simplelocalnet"; + version = "0.2.0.5"; + sha256 = "04cx5pb3pf4wpmqx1zhdc9lrfs0mb8zk7p1qxxlsqg0x63f3353w"; + buildDepends = [ + binary dataAccessor distributedProcess network networkMulticast + networkTransport networkTransportTcp transformers + ]; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process"; + description = "Simple zero-configuration backend for Cloud Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix new file mode 100644 index 00000000000..3a461a51f53 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-multicast/default.nix @@ -0,0 +1,14 @@ +{ cabal, network }: + +cabal.mkDerivation (self: { + pname = "network-multicast"; + version = "0.0.7"; + sha256 = "18qlg4cg7ci1z3mbqh5z16mxkjir0079a0rgm4qk6jbmsnvfsq43"; + buildDepends = [ network ]; + meta = { + description = "Simple multicast library"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix new file mode 100644 index 00000000000..61ebc4ec1d9 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -0,0 +1,15 @@ +{ cabal, dataAccessor, network, networkTransport }: + +cabal.mkDerivation (self: { + pname = "network-transport-tcp"; + version = "0.2.0.3"; + sha256 = "0jlw59ib6yzkv2qggza571k2nhxnwvwj42zdgzz6wh2bgdyihayw"; + buildDepends = [ dataAccessor network networkTransport ]; + meta = { + homepage = "http://github.com/haskell-distributed/distributed-process"; + description = "TCP instantation of Network.Transport"; + 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 8a9377c50c6..41965315970 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -654,6 +654,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; + distributedProcessSimplelocalnet = callPackage ../development/libraries/haskell/distributed-process-simplelocalnet {}; + distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; distributive = callPackage ../development/libraries/haskell/distributive {}; @@ -1142,8 +1144,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + networkMulticast = callPackage ../development/libraries/haskell/network-multicast {}; + networkTransport = callPackage ../development/libraries/haskell/network-transport {}; + networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; + newtype = callPackage ../development/libraries/haskell/newtype {}; nonNegative = callPackage ../development/libraries/haskell/non-negative {}; -- GitLab From 0a2f397ce0da851c1aac0279e5cccdfbe55126c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 10:53:25 +0200 Subject: [PATCH 0732/5607] systemd: fix build on Linux/i686 --- pkgs/os-specific/linux/systemd/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index e5858d06b30..82d0e4c17a5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,13 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03y3y1w3x7bx67jvdxryhns3h1g6nrllln46gqipp35n99alki2m"; }; - patches = [ ./reexec.patch ] ++ - # Remove this patch after the next update. - stdenv.lib.optional (stdenv.system == "i686-linux") (fetchurl { - url = "https://bugs.freedesktop.org/attachment.cgi?id=67621"; - name = "fix-32-bit-build.patch"; - sha256 = "1i4xn6lc6iapaasd2lz717b1zrq5ds5g18i7m509fgfwy7w7x95l"; - }); + patches = [ ./reexec.patch ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl -- GitLab From bed032887911c7f4a672891a7411dea879625d4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 10:54:44 +0200 Subject: [PATCH 0733/5607] systemd: add myself as a maintainer --- pkgs/os-specific/linux/systemd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 82d0e4c17a5..1d44b899edf 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -88,8 +88,9 @@ stdenv.mkDerivation rec { passthru.interfaceVersion = 2; meta = { - homepage = http://www.freedesktop.org/wiki/Software/systemd; + homepage = "http://www.freedesktop.org/wiki/Software/systemd"; description = "A system and service manager for Linux"; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } -- GitLab From d06f4cf0000c8e188ad12de58dfb2455c1fdd1cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0734/5607] haskell-Boolean: update to version 0.1.0 --- pkgs/development/libraries/haskell/Boolean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index 58bdf8b9970..c54c84080d6 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Boolean"; - version = "0.0.1"; - sha256 = "dafcfb2e9d7f7aa24a3d3ceb385424176297cdf6f6044028d42d0fea1cae7765"; + version = "0.1.0"; + sha256 = "1843fddsc7x3mf6h69xpg7yjkpaws4v57zg02424mj86m5x6jfgz"; meta = { description = "Generalized booleans"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 2f2658d4ffabae2bdc64f24c3707b6e58d4c5466 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0735/5607] haskell-dataenc: update to version 0.14.0.4 --- pkgs/development/libraries/haskell/dataenc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index d2428600ce9..2ece14dcfdc 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dataenc"; - version = "0.14.0.3"; - sha256 = "1k6k9cpx5ma32gvzf2mdbz4kfiblwfah9875qr13zkl4has9y0pd"; + version = "0.14.0.4"; + sha256 = "0xnn90nyz4m0rbzykkr5p9270s8dq2bfiz5j7qyzyy5m8vbl15bw"; isLibrary = true; isExecutable = true; meta = { -- GitLab From ee606adc9e957fafd517304a1208a74fe05afb6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0736/5607] haskell-directory-tree: update to version 0.11.0 --- .../libraries/haskell/directory-tree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 65148f10a22..5c8b357593e 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "directory-tree"; - version = "0.10.1"; - sha256 = "02acmfdw1yjb0h9dpjy04xxclsasm1p0m6w1dvccd4x2aqc6ybbw"; + version = "0.11.0"; + sha256 = "07vqwnzbwfjvlwcl50x5jl9yzvqfln0m4k4lam9r5n49wv7p01c9"; buildDepends = [ filepath ]; meta = { - homepage = "http://coder.bsimmons.name/blog/2009/05/directory-tree-module-released/"; + homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From 9ec744961f5f0c69c985eab67c7e0edbe71be4d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0737/5607] haskell-ghc-events: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/ghc-events/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 0b5fc5c107a..dfbf5181d40 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -2,13 +2,12 @@ cabal.mkDerivation (self: { pname = "ghc-events"; - version = "0.4.0.0"; - sha256 = "0q1r5jxk8ma8rg65n4iixl5zyk4nxpzi4ywf0jz8y1nbbhbas7g2"; + version = "0.4.0.1"; + sha256 = "1ic8r3hn1m500xwq1n8wz7fp65vm43n7dkjnn341xdmpd1546wlc"; isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; noHaddock = true; - jailbreak = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 219109de4e76d50f729d2d3fb7a8625bb1f40f22 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0738/5607] haskell-hs-bibutils: update to version 4.14 --- pkgs/development/libraries/haskell/hs-bibutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index c96e6aeaac6..dbbe28d274a 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.12"; - sha256 = "0akxi69as7k5c0955yla9wcl1xvcvgzpzy3p1jj781w1lf89p537"; + version = "4.14"; + sha256 = "1icdaayahwgfmckd93k26kic2wdgyl65lv08rnwydsi5vlqww32x"; buildDepends = [ syb ]; meta = { - homepage = "http://code.haskell.org/hs-bibutils"; + homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; description = "Haskell bindings to bibutils, the bibliography conversion utilities"; license = "GPL"; platforms = self.ghc.meta.platforms; -- GitLab From ba6b7c53c4df3be5ef67b05a63dc29a0d1a5c6da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0739/5607] haskell-http-conduit: update to version 1.6.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 3597204eda6..4aad24d1cc7 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.4"; - sha256 = "1gnr65nkgn99cvll71zka6wrpg9ihhn38mg89841q1w2y0xf1mb0"; + version = "1.6.1"; + sha256 = "1yzsa6gqhq6s4b2drhx4jd6qdfawf1swrjyffi2bfq1vq8i9ikf2"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie -- GitLab From ced4dd874a75cd99e073ce8f95a5d5a7520c3b31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0740/5607] haskell-hxt: update to version 9.3.1.0 --- pkgs/development/libraries/haskell/hxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 203bb89ef09..3ffd3a0c1b0 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.2.2"; - sha256 = "0ichjpshq10b11dyfv1q7rs2m190x3gplx6k54amlxv45nwd1s6r"; + version = "9.3.1.0"; + sha256 = "0nv7d7ffwq81671c7gyzaqx7xgrgs42svbq5xraij4jbq5406719"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec -- GitLab From ef710f5c4d9bfb083482e6be18f749e80ffa4326 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0741/5607] haskell-random-fu: update to version 0.2.3.1 --- pkgs/development/libraries/haskell/random-fu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index 72936308464..520f232d81f 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "random-fu"; - version = "0.2.3.0"; - sha256 = "17vn1dz4z00xjpsxjx2dfjnz4qhbn5cbkm2s142kdskiphgxi2f8"; + version = "0.2.3.1"; + sha256 = "06b4v7012fj1kmnz6i63vbwl9gkhzgk556gmcc62k14299ks8pci"; buildDepends = [ erf gamma monadLoops mtl randomShuffle randomSource rvar syb transformers vector -- GitLab From 0ff49d3405a3f97ff90fbb2759bca63fb420036f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0742/5607] haskell-snap-server: update to version 0.9.2.3 --- pkgs/development/libraries/haskell/snap/server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 4971fec3b1d..c17b8e50e61 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { filepath MonadCatchIOTransformers mtl network snapCore text time transformers unixCompat ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; -- GitLab From 669de74d36ea14424cae64488652f237051a7a06 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0743/5607] haskell-snap: update to version 0.9.2.1 --- pkgs/development/libraries/haskell/snap/snap.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 9ff0bceb3c3..83e149391c5 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { snapServer stm syb text time transformers unorderedContainers utf8String vector vectorAlgorithms xmlhtml ]; + jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; -- GitLab From 6a695af99b8562d9bd471100246cce0b3a5b7730 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0744/5607] haskell-vector-space: update to version 0.8.3 --- pkgs/development/libraries/haskell/vector-space/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index 2957959f005..3a3cc4a561e 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.8.2"; - sha256 = "09gndxxscyc9w85fih370gag8yd1xbfg94nxkwdvhzvbkns9k2ad"; + version = "0.8.3"; + sha256 = "1wiwzbzp2fcavps0fqc9rwm50b2yv0ysgs78d29mvwcya1ywwxgw"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { - homepage = "http://haskell.org/haskellwiki/vector-space"; description = "Vector & affine spaces, linear maps, and derivatives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From 8432dddfe8ff4b20bf7d4726b3fc2edd6146d81e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 12:21:07 +0200 Subject: [PATCH 0745/5607] haskell-warp: update to version 1.3.2 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index b0c3c7205b3..bb168f7d990 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.1.2"; - sha256 = "11y1dwzvfhr4fhlh5j2ydwj4d3r92qm55rn9xwbfxmr0vmvm78b5"; + version = "1.3.2"; + sha256 = "14yib72x3z6fylpkzpr77cvvnr4bn1vdadh2pq6rknszspl6g7iq"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile -- GitLab From 310c7be3a1822d8e8c27506e9d26ef7b7397e1ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 13:41:44 +0200 Subject: [PATCH 0746/5607] Revert "adding python libraries serial and game which are both dependencies of plover steno engine which needs more testing". The patch lacks the required file "pygame.patch". --- pkgs/top-level/python-packages.nix | 39 ------------------------------ 1 file changed, 39 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 376cb2b3bbf..a55a869f88c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -784,36 +784,6 @@ let pythonPackages = python.modules // rec { }; }); - game = buildPythonPackage rec { - name = "pygame-1.9.1"; - src = fetchurl { - url = http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz; - sha256 = "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52"; - }; - patches = [ ./pygame.patch ]; - # auto confirming missing dependencies: - # PORTMIDI and PORTTIME still missing - patchPhase = '' - sed -i 's@raw_input(.*@"1"@' config_unix.py - unset patchPhase - patchPhase - ''; - installCommand = "python setup.py install --prefix=$out"; - - propagatedBuildInputs = [ - pkgs.SDL - pkgs.SDL_mixer - pkgs.SDL_gfx - pkgs.SDL_net - pkgs.SDL_sound - pkgs.SDL_ttf - pkgs.SDL_image - pkgs.smpeg - pkgs.libpng - pkgs.libjpeg - ]; - }; - genshi = buildPythonPackage { name = "genshi-0.6"; @@ -3039,15 +3009,6 @@ let pythonPackages = python.modules // rec { }; }; - serial = buildPythonPackage rec { - name = "pyserial-2.5"; - doCheck = false; - src = fetchurl { - url = http://heanet.dl.sourceforge.net/project/pyserial/pyserial/2.5/pyserial-2.5.tar.gz; - sha256 = "04gmpfb43ppc8cf1bvkz8r1gl0nrxc38kpfdqs40ib0d1ql25pgd"; - }; - }; - tracing = buildPythonPackage rec { name = "tracing-0.6"; -- GitLab From a596022d805403de73339493d7cd1ff5438cc852 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 13:46:50 +0200 Subject: [PATCH 0747/5607] apache-httpd: update to version 2.4.3 --- 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 c9161bf5909..44fa145b605 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.3"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2"; + sha256 = "17i4zdcjfvxks0p1fbqvab37kr8d6zscqaqan8pqkw8iq6wh48fq"; }; buildInputs = [perl] ++ -- GitLab From 74c0850efd49681a9eac8fac5430a1ce688c95b3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 15:28:14 +0200 Subject: [PATCH 0748/5607] spamassassin: site-wide rules are in $out/share/spamassassin; user-rules in /etc/spamassassin --- pkgs/servers/mail/spamassassin/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 0f5cefb84c2..7c1c3bc5f9c 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -27,9 +27,13 @@ buildPerlPackage rec { # for the PERL5LIB environment variable. Needs further investigation. makeFlags = "PERL_BIN=${perl}/bin/perl PERL_TAINT=no"; + makeMakerFlags = "CONFDIR=/etc/spamassassin LOCALSTATEDIR=/var/lib/spamassassin"; + doCheck = false; postInstall = '' + mv "rules/"* $out/share/spamassassin/ + for n in "$out/bin/"*; do wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" done -- GitLab From dfaab992c26021bbe415f2410b1d3980a9e868a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 27 Sep 2012 15:29:01 +0200 Subject: [PATCH 0749/5607] spamassassin: enable more plugins and provide gpg for sa-update --- pkgs/servers/mail/spamassassin/default.nix | 24 +++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 7c1c3bc5f9c..0e623f7ac04 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, buildPerlPackage, perl, HTMLParser, NetDNS, NetAddrIP, DBFile -, HTTPDate, MailDKIM, makeWrapper +, HTTPDate, MailDKIM, LWP, IOSocketSSL, IOSocketInet6, makeWrapper, gnupg1 }: -# TODO: +# TODO: Add the Perl modules ... +# +# DBI +# Encode::Detect +# IP::Country::Fast +# Mail::SPF +# Net::Ident +# Razor2::Client::Agent # -# - Mail::SPF -# - IP::Country -# - Razor2 -# - Net::Ident -# - DBI -# - LWP::UserAgent -# - Encode::Detect buildPerlPackage rec { name = "SpamAssassin-3.3.2"; @@ -20,8 +20,8 @@ buildPerlPackage rec { sha256 = "01d2jcpy423zfnhg123wlhzysih1hmb93nxfspiaajzh9r5rn8y7"; }; - buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate - MailDKIM ]; + buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM + LWP IOSocketSSL IOSocketInet6 ]; # Enabling 'taint' mode is desirable, but that flag disables support # for the PERL5LIB environment variable. Needs further investigation. @@ -35,7 +35,7 @@ buildPerlPackage rec { mv "rules/"* $out/share/spamassassin/ for n in "$out/bin/"*; do - wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" + wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg1}/bin" done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3aeb726a855..7edc90f5940 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5432,7 +5432,7 @@ let spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile - HTTPDate MailDKIM; + HTTPDate MailDKIM LWP IOSocketSSL IOSocketInet6; }; samba = callPackage ../servers/samba { }; -- GitLab From 4a6a87eedcb92958b7a01454e98dbc408bbde1c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Sep 2012 12:38:48 -0400 Subject: [PATCH 0750/5607] Fix builds depending on libXft --- pkgs/development/libraries/freetype/default.nix | 5 +++++ pkgs/servers/x11/xorg/overrides.nix | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 00b0ea61138..b8a73b97f46 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = + '' + ln -s freetype2/freetype $out/include/freetype + ''; + meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 912308647e2..636104b005a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -109,21 +109,19 @@ in compositeproto = attrs: attrs // { propagatedBuildInputs = [ xorg.fixesproto ]; }; - + libXcomposite = attrs: attrs // { propagatedBuildInputs = [ xorg.libXfixes ]; }; - + libXaw = attrs: attrs // { propagatedBuildInputs = [ xorg.libXmu ]; }; - + libXft = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11 xorg.renderproto ]; - # probably, fontconfig and freetype could be added - # pkgconfig seems to be nice, too... - propagatedBuildInputs = [ xorg.libXrender ]; + propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; -- GitLab From 4cdca52f7e53d407bec15976b0685cd601069c23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Sep 2012 16:16:52 -0400 Subject: [PATCH 0751/5607] glib: Update to 2.34.0 --- pkgs/development/libraries/glib/{2.32.x.nix => 2.34.x.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/glib/{2.32.x.nix => 2.34.x.nix} (90%) diff --git a/pkgs/development/libraries/glib/2.32.x.nix b/pkgs/development/libraries/glib/2.34.x.nix similarity index 90% rename from pkgs/development/libraries/glib/2.32.x.nix rename to pkgs/development/libraries/glib/2.34.x.nix index 8fd77b02589..6925571020c 100644 --- a/pkgs/development/libraries/glib/2.32.x.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -12,11 +12,11 @@ # $out/bin/gtester-report' to postInstall if this is solved stdenv.mkDerivation rec { - name = "glib-2.32.4"; + name = "glib-2.34.0"; src = fetchurl { - url = "mirror://gnome/sources/glib/2.32/${name}.tar.xz"; - sha256 = "1qpscyqi2kfskdqfzm5gp04wilcx979gq34cbabvcbx2znj45mx5"; + url = "mirror://gnome/sources/glib/2.34/${name}.tar.xz"; + sha256 = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144"; }; # configure script looks for d-bus but it is only needed for tests diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff73023f81c..e19d590cc36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3814,7 +3814,7 @@ let gtkmm; }; - glib = callPackage ../development/libraries/glib/2.32.x.nix { }; + glib = callPackage ../development/libraries/glib/2.34.x.nix { }; glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { }; -- GitLab From b7cadbb7d2390bbef4d661e6fa29ef73d4219f88 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Sep 2012 16:17:06 -0400 Subject: [PATCH 0752/5607] gobject-introspection: Update to 1.34.0 --- .../libraries/gobject-introspection/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index de9059dbd15..fe1d519f562 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,12 +1,7 @@ { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python }: -let - baseName = "gobject-introspection"; - v = "0.10.8"; -in - stdenv.mkDerivation rec { - name = "${baseName}-${v}"; + name = "gobject-introspection-1.34.0"; buildInputs = [ flex bison glib pkgconfig python ]; propagatedBuildInputs = [ libffi ]; @@ -16,8 +11,8 @@ stdenv.mkDerivation rec { configureFlags = "--disable-tests"; src = fetchurl { - url = "mirror://gnome/sources/${baseName}/0.10/${name}.tar.bz2"; - sha256 = "5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e"; + url = "mirror://gnome/sources/gobject-introspection/1.34/${name}.tar.xz"; + sha256 = "80e211ea95404fc7c5fa3b04ba69ee0b29af70847af315155ab06b8cff832c85"; }; postInstall = "rm -rf $out/share/gtk-doc"; -- GitLab From 6cbb674895e0ed0e44a18910f702137ee47923da Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Sep 2012 17:22:56 -0400 Subject: [PATCH 0753/5607] gtk+: Update to 3.6.0 --- pkgs/development/libraries/gtk+/{3.2.x.nix => 3.6.x.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/gtk+/{3.2.x.nix => 3.6.x.nix} (89%) diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.6.x.nix similarity index 89% rename from pkgs/development/libraries/gtk+/3.2.x.nix rename to pkgs/development/libraries/gtk+/3.6.x.nix index df59c017626..22d1287222b 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.6.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-3.2.3"; + name = "gtk+-3.6.0"; src = fetchurl { - url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz; - sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2"; + url = "mirror://gnome/sources/gtk+/3.6/${name}.tar.xz"; + sha256 = "e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049"; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e19d590cc36..a10996da3ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3839,7 +3839,7 @@ let gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.6.x.nix { }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtksharp2; -- GitLab From 40eaa8657cce28e9ebc15f744c79f6d663abde93 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Sep 2012 17:23:36 -0400 Subject: [PATCH 0754/5607] Add Harfbuzz, an OpenType text shaping engine --- .../libraries/harfbuzz/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/harfbuzz/default.nix diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix new file mode 100644 index 00000000000..5755e747a6b --- /dev/null +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, glib, freetype }: + +stdenv.mkDerivation rec { + name = "harfbuzz-0.9.4"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; + sha256 = "2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc"; + }; + + buildInputs = [ pkgconfig glib freetype ]; + + meta = { + description = "An OpenType text shaping engine"; + homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a10996da3ab..dc10d34cff3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3871,6 +3871,8 @@ let # TODO : Add MIT Kerberos and let admin choose. kerberos = heimdal; + harfbuzz = callPackage ../development/libraries/harfbuzz { }; + hawknl = callPackage ../development/libraries/hawknl { }; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { }; -- GitLab From f021420036c48619b0696c983168c2cb688dff8d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 Sep 2012 17:42:46 -0400 Subject: [PATCH 0755/5607] Revert "gtk+: Update to 3.6.0" This reverts commit 6cbb674895e0ed0e44a18910f702137ee47923da. --- pkgs/development/libraries/gtk+/{3.6.x.nix => 3.2.x.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/gtk+/{3.6.x.nix => 3.2.x.nix} (89%) diff --git a/pkgs/development/libraries/gtk+/3.6.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix similarity index 89% rename from pkgs/development/libraries/gtk+/3.6.x.nix rename to pkgs/development/libraries/gtk+/3.2.x.nix index 22d1287222b..df59c017626 100644 --- a/pkgs/development/libraries/gtk+/3.6.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-3.6.0"; + name = "gtk+-3.2.3"; src = fetchurl { - url = "mirror://gnome/sources/gtk+/3.6/${name}.tar.xz"; - sha256 = "e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049"; + url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz; + sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2"; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc10d34cff3..0b68f0e44da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3839,7 +3839,7 @@ let gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { }; - gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.6.x.nix { }); + gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { }); gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { gtksharp = gtksharp2; -- GitLab From 9ffe9d4e09a8d830740d4049f90054e358e25a06 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Sep 2012 10:35:15 +0200 Subject: [PATCH 0756/5607] haskell-hxt: jailbreak to support recent versions of the 'network' library --- pkgs/development/libraries/haskell/hxt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 3ffd3a0c1b0..ee79d374d42 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec ]; + jailbreak = true; meta = { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "A collection of tools for processing XML with Haskell"; -- GitLab From 84413b00e2dce1e914840152a14039b346bd699c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Sep 2012 10:46:38 +0200 Subject: [PATCH 0757/5607] haskell-DSH: update to version 0.7.8.2 --- pkgs/development/libraries/haskell/DSH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index 725fe95cc8d..3275db0e0d8 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "DSH"; - version = "0.7.8.1"; - sha256 = "1yz8rh3hkqc465slfzi7jqhjd1xrmcghjxl7zprxw082p2qvj8g5"; + version = "0.7.8.2"; + sha256 = "1rs42c05q4s46a1a03srzdq0aijwalhilzifc8ryq4qwjgh7vkwz"; buildDepends = [ convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text xhtml -- GitLab From be459eddd8b8f33070e3bbe513a7ce867a232dc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Sep 2012 10:46:39 +0200 Subject: [PATCH 0758/5607] haskell-hs-bibutils: update to version 4.15 --- pkgs/development/libraries/haskell/hs-bibutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index dbbe28d274a..8acb621fe3f 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hs-bibutils"; - version = "4.14"; - sha256 = "1icdaayahwgfmckd93k26kic2wdgyl65lv08rnwydsi5vlqww32x"; + version = "4.15"; + sha256 = "1h2vqi6ymhx9wpfv5qzvq4fhc4iand93shsncp8nszk64acmz9z9"; buildDepends = [ syb ]; meta = { homepage = "http://gorgias.mine.nu/repos/hs-bibutils/"; -- GitLab From 88a859891ce98f4ca6fe05ed9ed86c3de1814e5f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Sep 2012 10:46:39 +0200 Subject: [PATCH 0759/5607] haskell-rank1dynamic: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/rank1dynamic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix index b243279d64e..602f0cc2574 100644 --- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "rank1dynamic"; - version = "0.1.0.0"; - sha256 = "19wyklhf5sghip0i71sza7lv50lj2dawfxy6k67njxr1y56ky92w"; + version = "0.1.0.1"; + sha256 = "18rlih5bndlm5v4nnv8g2rgvab5n22vd8mcjd0m4wq8fmqkb3x9d"; buildDepends = [ binary ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; -- GitLab From 71a51e3d47c5f2acedd167b7b13300f37816ba02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Sep 2012 10:46:39 +0200 Subject: [PATCH 0760/5607] haskell-simple-sendfile: update to version 0.2.8 --- .../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 d99762df2b2..2a55427a6aa 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.7"; - sha256 = "0chjcn6j5irzjqid3nhh2ya395aqavcar3ygzd01z96ha1nl4dbw"; + version = "0.2.8"; + sha256 = "11lw8m21cy40hd9nzp80d9jawgv9hd3sfvizjcfbvdc2lpq6m17j"; buildDepends = [ network ]; meta = { description = "Cross platform library for the sendfile system call"; -- GitLab From 70ee9a6bb6f4f7ca8ef1dfbf2ad45d3b2b7e91bb Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 28 Sep 2012 17:02:19 +0200 Subject: [PATCH 0761/5607] aircrack-ng: updating hash --- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 9ecaf183f1f..ea4f517000a 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchsvn { url = "http://trac.aircrack-ng.org/svn/trunk"; inherit rev; - sha256 = "0rwj2nk4nyy0l9dg6rpg2h5gpvcygs5irj4i6fdcsr8xf0blq7yw"; + sha256 = "d16fd3a4e918fd6a855c0d0ae0c863247a45189e6ec35c0c7082d3d07b6438db"; }; buildInputs = [libpcap openssl zlib]; -- GitLab From 1bcbffc8c5cff2c957961405703173963b2b4e87 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 28 Sep 2012 17:06:07 +0200 Subject: [PATCH 0762/5607] afew, alot: version update; adding new python package flake8 --- pkgs/top-level/python-packages.nix | 41 +++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a55a869f88c..ed7a03ac1ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -33,11 +33,13 @@ let pythonPackages = python.modules // rec { afew = buildPythonPackage rec { - name = "afew-1.0pre"; + rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199"; + name = "afew-1.0_${rev}"; + src = fetchurl { - url = "https://github.com/teythoon/afew/tarball/master"; + url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "949710f8dcf503f42f2a2d77ea71e48ccf70155a764f75ad29cc93edc120809b"; + sha256 = "74926d9ddfa69534cfbd08a82f0acccab2c649558062654d5d2ff2999d201384"; }; propagatedBuildInputs = [ notmuch pkgs.dbacl ]; @@ -59,12 +61,13 @@ let pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - name = "alot-0.3.1"; + rev = "27c91058c49d8755d2813d5b78094f40f36ec905"; + name = "alot-0.3.3_${rev}"; src = fetchurl { - url = "https://github.com/pazz/alot/tarball/master"; + url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "06683de36688615d3d526198c93133e1131897c888ffa31e83f1ad292eae57af"; + sha256 = "67e1033aa91818b7fa4c3911430a4da0f73aca92c3e3832c010038cbf263eec2"; }; doCheck = false; @@ -73,7 +76,7 @@ let pythonPackages = python.modules // rec { postInstall = '' wrapProgram $out/bin/alot \ - --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib + --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file511}/lib:${pkgs.gpgme}/lib ''; meta = { @@ -700,6 +703,26 @@ let pythonPackages = python.modules // rec { }; + flake8 = buildPythonPackage (rec { + name = "flake8-1.4"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; + md5 = "64acc2c905178f6d6817d88574407fb5"; + }; + + doCheck = false; + + meta = { + description = "code checking using pep8 and pyflakes."; + homepage = http://pypi.python.org/pypi/flake8; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; + }; + }); + + flask = buildPythonPackage { name = "flask-0.9"; @@ -2727,13 +2750,13 @@ let pythonPackages = python.modules // rec { urwid = buildPythonPackage (rec { - name = "urwid-1.0.1"; + name = "urwid-1.0.2"; doCheck = false; src = fetchurl { url = "http://excess.org/urwid/${name}.tar.gz"; - md5 = "828f7144b94920205e755c249d2e297f"; + md5 = "00542bbd15fae7ea60b02a7570edee2b"; }; meta = { -- GitLab From c9585528288c0c330486d29cddce1a7e10aa1a59 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 11:47:01 -0400 Subject: [PATCH 0763/5607] systemd: Update to 193 --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1d44b899edf..abacee62ff3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,11 +6,11 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-192"; + name = "systemd-193"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "03y3y1w3x7bx67jvdxryhns3h1g6nrllln46gqipp35n99alki2m"; + sha256 = "1k8fmii15127y4b2kc9id2vkmrjdsbq3kv6fi308k72azbhnpnxr"; }; patches = [ ./reexec.patch ]; @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/wiki/Software/systemd"; description = "A system and service manager for Linux"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ]; }; } -- GitLab From 7f053d6157d7348e8d773cf4429d8767ee3d8192 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 12:15:12 -0400 Subject: [PATCH 0764/5607] Remove HAL It's obsolete. There was only one package still using it (nut) but it builds fine without it. --- pkgs/applications/misc/nut/default.nix | 5 +- pkgs/os-specific/linux/hal/default.nix | 63 ------------------------ pkgs/os-specific/linux/hal/hal-evt.nix | 20 -------- pkgs/os-specific/linux/hal/info.nix | 15 ------ pkgs/os-specific/linux/hal/synaptics.nix | 19 ------- pkgs/top-level/all-packages.nix | 8 --- 6 files changed, 3 insertions(+), 127 deletions(-) delete mode 100644 pkgs/os-specific/linux/hal/default.nix delete mode 100644 pkgs/os-specific/linux/hal/hal-evt.nix delete mode 100644 pkgs/os-specific/linux/hal/info.nix delete mode 100644 pkgs/os-specific/linux/hal/synaptics.nix diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 3d4e5136021..51ae8633a7c 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, pkgconfig, neon, libusb, hal, openssl, udev}: +{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev }: stdenv.mkDerivation { name = "nut-2.6.1"; + src = fetchurl { url = http://www.networkupstools.org/source/2.6/nut-2.6.1.tar.gz; sha256 = "f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00"; }; - buildInputs = [pkgconfig neon libusb hal openssl udev]; + buildInputs = [ pkgconfig neon libusb openssl udev ]; configureFlags = [ "--with-all" diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix deleted file mode 100644 index f1757be94cf..00000000000 --- a/pkgs/os-specific/linux/hal/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, pciutils, expat -, libusb, dbus, dbus_glib, glib, libuuid, perl -, perlXMLParser, gettext, zlib, gperf, consolekit, policykit -, libsmbios, dmidecode, udev, utillinux, pmutils, usbutils -, eject, upstart -}: - -assert stdenv ? glibc; - -let - isPC = stdenv.isi686 || stdenv.isx86_64; - changeDmidecode = if isPC then - "--replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode" - else ""; -in -stdenv.mkDerivation rec { - name = "hal-0.5.14"; - - src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "00ld3afcbh4ckb8sli63mm2w69zh6ip4axhy1lxyybgiabxaqfij"; - }; - - buildInputs = [ - pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib - libuuid perl perlXMLParser gettext zlib gperf - consolekit policykit - ]; - - # !!! Hm, maybe the pci/usb.ids location should be in /etc, so that - # we don't have to rebuild HAL when we update the PCI/USB IDs. - configureFlags = '' - --with-pci-ids=${pciutils}/share - --with-usb-ids=${usbutils}/share - --localstatedir=/var - --with-eject=${eject}/bin/eject - --with-linux-input-header=${stdenv.glibc}/include/linux/input.h - --enable-umount-helper - ''; - - propagatedBuildInputs = [ libusb ] - ++ stdenv.lib.optional isPC libsmbios; - - preConfigure = '' - for i in hald/linux/probing/probe-smbios.c hald/linux/osspec.c \ - hald/linux/coldplug.c hald/linux/blockdev.c \ - tools/hal-storage-mount.c ./tools/hal-storage-shared.c \ - tools/hal-system-power-pm-is-supported.c \ - tools/linux/hal-*-linux - do - substituteInPlace $i \ - ${changeDmidecode} \ - ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \ - --replace /bin/mount ${utillinux}/bin/mount \ - --replace /bin/umount ${utillinux}/bin/umount \ - --replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \ - --replace /usr/sbin/pm ${pmutils}/sbin/pm \ - --replace /sbin/shutdown ${upstart}/sbin/shutdown - done - ''; - - installFlags = "slashsbindir=$(out)/sbin"; -} diff --git a/pkgs/os-specific/linux/hal/hal-evt.nix b/pkgs/os-specific/linux/hal/hal-evt.nix deleted file mode 100644 index a49f4fcc0f8..00000000000 --- a/pkgs/os-specific/linux/hal/hal-evt.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, libxml2, pkgconfig, boolstuff, hal, dbus_glib }: - -stdenv.mkDerivation { - name = "hal-evt-0.1.4"; - - src = fetchurl { - url = http://savannah.nongnu.org/download/halevt/halevt-0.1.4.tar.gz; - sha256 = "173dphyzpicjz5pnw0d6wmibvib5h99nh1gmyvcqpgvf8la5vrps"; - }; - - buildInputs = [ libxml2 pkgconfig boolstuff hal dbus_glib ]; - - meta = { - description = "Execute commands on hal events"; - homepage = http://www.nongnu.org/halevt/; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/hal/info.nix b/pkgs/os-specific/linux/hal/info.nix deleted file mode 100644 index 1a4e41c776f..00000000000 --- a/pkgs/os-specific/linux/hal/info.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, pkgconfig}: - -stdenv.mkDerivation rec { - name = "hal-info-20091130"; - - src = fetchurl { - url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "092jhzpxa2h8djf8pijql92m70q87yds22686ryrfna3xbm90niv"; - }; - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/hal; - description = "Hardware data and quirks for HAL"; - }; -} diff --git a/pkgs/os-specific/linux/hal/synaptics.nix b/pkgs/os-specific/linux/hal/synaptics.nix deleted file mode 100644 index 20c4d1ec24f..00000000000 --- a/pkgs/os-specific/linux/hal/synaptics.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv}: -stdenv.mkDerivation { - name = "hal-info-synaptics"; - buildCommand = '' - mkdir -p $out/share/hal/fdi/information/15-osvendor/ - cat << EOF > $out/share/hal/fdi/information/15-osvendor/10-x11-synaptics.fdi - - - - - synaptics - true - event - - - -EOF - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b68f0e44da..64b8eeaff51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5624,14 +5624,6 @@ let gpm = callPackage ../servers/gpm { }; - hal = callPackage ../os-specific/linux/hal { }; - - halevt = callPackage ../os-specific/linux/hal/hal-evt.nix { }; - - hal_info = callPackage ../os-specific/linux/hal/info.nix { }; - - hal_info_synaptics = callPackage ../os-specific/linux/hal/synaptics.nix { }; - hdparm = callPackage ../os-specific/linux/hdparm { }; hibernate = callPackage ../os-specific/linux/hibernate { }; -- GitLab From 006002d16f24068668fef77ea8b2f3c653d22b4d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 15:09:14 -0400 Subject: [PATCH 0765/5607] Remove cups-pdf-filter It has been obsoleted by the cups-filters package. --- pkgs/misc/cups/pdf-filter.nix | 39 --------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/misc/cups/pdf-filter.nix diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix deleted file mode 100644 index 8a08eadc6a4..00000000000 --- a/pkgs/misc/cups/pdf-filter.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cups, poppler }: - -stdenv.mkDerivation { - name = "cups-pdf-filter-${cups.version}"; - - inherit (cups) src; - - buildInputs = [ pkgconfig cups poppler ]; - - preConfigure = '' - sed -e 's@\.\./cups/$(LIBCUPS)@@' -e 's@$(LIBCUPSIMAGE)@@' -i filter/Makefile - ''; - - NIX_LDFLAGS="-L${cups}/lib"; - - configureFlags = '' - --localstatedir=/var --enable-dbus - --enable-image --with-pdftops=pdftops''; - - buildPhase = '' - cd filter - make pdftops - ''; - - installPhase = '' - mkdir -pv $out/lib/cups/filter $out/share/cups/mime - cp -v pdftops $out/lib/cups/filter - echo >$out/share/cups/mime/pdftops.convs 'application/pdf application/vnd.cups-postscript 66 pdftops' - ''; - - - meta = { - homepage = http://www.cups.org/; - description = "Image and pdf filters for CUPS"; - license = "GPLv2"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64b8eeaff51..ee87c4da796 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8663,8 +8663,6 @@ let cups = callPackage ../misc/cups { }; - cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; - gutenprint = callPackage ../misc/drivers/gutenprint { }; gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; -- GitLab From 35cc2c32bbb1d9f5f06c57f06435f052424a1d56 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Sep 2012 21:45:00 +0200 Subject: [PATCH 0766/5607] haskell-parallel-io: add version 0.3.2 --- .../libraries/haskell/parallel-io/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/parallel-io/default.nix diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix new file mode 100644 index 00000000000..1cb682d2b91 --- /dev/null +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -0,0 +1,17 @@ +{ cabal, extensibleExceptions, random }: + +cabal.mkDerivation (self: { + pname = "parallel-io"; + version = "0.3.2"; + sha256 = "1n9y1d1lcdwvhjsfqdlxknl89fxncq17kgin43wlki0c39cgirga"; + isLibrary = true; + isExecutable = true; + buildDepends = [ extensibleExceptions random ]; + jailbreak = true; + meta = { + homepage = "http://batterseapower.github.com/parallel-io"; + description = "Combinators for executing IO actions in parallel on a thread pool"; + 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 41965315970..7be018fbeb8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1199,6 +1199,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; parallel = self.parallel_3_2_0_3; + parallelIo = callPackage ../development/libraries/haskell/parallel-io {}; + parseargs = callPackage ../development/libraries/haskell/parseargs {}; parsec_2_1_0_1 = callPackage ../development/libraries/haskell/parsec/2.1.0.1.nix {}; -- GitLab From 7d9593db6dccf28abb779916a91e67539f11fd3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 16:23:56 -0400 Subject: [PATCH 0767/5607] xterm: Update to 281 and fix the fontconfig dependency --- pkgs/applications/misc/xterm/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index b4fab591ef4..ef2d846dd2e 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }: +{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "xterm-276"; - + name = "xterm-281"; + src = fetchurl { url = "ftp://invisible-island.net/xterm/${name}.tgz"; - sha256 = "1k3k025z3vl91sc8i7f5lmnsb1rsblpbijri9vnxgpynw4wgrc7b"; + sha256 = "1yrjjya7z5s3fi0iiaxgna35jh0ib2zx1yafyng35jma6qbwhxx7"; }; - + buildInputs = [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE - ncurses freetype pkgconfig xorg.libXft xorg.luit + ncurses freetype fontconfig pkgconfig xorg.libXft xorg.luit ]; - + configureFlags = '' --enable-wide-chars --enable-256-color @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; # Work around broken "plink.sh". - NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11"; + NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp', # decided by the sysadmin to allow the xterm reporting to /var/run/utmp -- GitLab From c7658cf9b0d8c6ee7a6231476c1b177d84d2433a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 17:16:18 -0400 Subject: [PATCH 0768/5607] libxml2: Update to 2.9.0 --- .../development/libraries/libxml2/default.nix | 22 +++++++++---------- .../libraries/libxml2/setup-hook.sh | 6 ++--- pkgs/top-level/release.nix | 1 - 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index defba390cf1..c076e66f0e6 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,28 +1,28 @@ -{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }: +{ stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }: assert pythonSupport -> python != null; -stdenv.mkDerivation { - name = "libxml2-2.7.8"; +stdenv.mkDerivation rec { + name = "libxml2-2.9.0"; src = fetchurl { - url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz; - sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54"; + url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; + sha256 = "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd"; }; - configureFlags = '' - ${if pythonSupport then "--with-python=${python}" else ""} - ''; - - propagatedBuildInputs = [zlib]; + configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}"; + + propagatedBuildInputs = [ zlib ]; setupHook = ./setup-hook.sh; - passthru = {inherit pythonSupport;}; + passthru = { inherit pythonSupport; }; meta = { homepage = http://xmlsoft.org/; description = "A XML parsing library for C"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.platforms.eelco ]; }; } diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh index d87c226506a..f8e4f5e0fd6 100644 --- a/pkgs/development/libraries/libxml2/setup-hook.sh +++ b/pkgs/development/libraries/libxml2/setup-hook.sh @@ -1,10 +1,10 @@ addXMLCatalogs () { for kind in dtd xsl; do - if test -d $1/xml/$kind; then + if test -d $1/xml/$kind; then for i in $(find $1/xml/$kind -name catalog.xml); do - export XML_CATALOG_FILES="$XML_CATALOG_FILES $i" + export XML_CATALOG_FILES="$XML_CATALOG_FILES $i" done - fi + fi done } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3b0a015d6b4..9e17ca7dbce 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -170,7 +170,6 @@ with (import ./release-lib.nix); libsmbios = linux; libtool = all; libtool_2 = all; - libxml2 = all; libxslt = all; lout = linux; lsh = linux; -- GitLab From 14310ed2c87b4c5da0df07052bb52de2dcc5b535 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 17:19:48 -0400 Subject: [PATCH 0769/5607] libxslt: Update to 1.1.27 --- pkgs/development/libraries/libxslt/default.nix | 16 +++++++++------- pkgs/top-level/release.nix | 1 - 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 05ce8019c4e..8dfa56664b4 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, libxml2 }: +{ stdenv, fetchurl, libxml2 }: stdenv.mkDerivation rec { - name = "libxslt-1.1.26"; - + name = "libxslt-1.1.27"; + src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; - sha256 = "1c9xdv39jvq1hp16gsbi56hbz032dmqyy0fpi4ls1y3152s55pam"; + sha256 = "09ky3vhlaahvsb0q9gp6h3as53pfj70gincirachjqzj46jdka5n"; }; - - buildInputs = [libxml2]; - + + buildInputs = [ libxml2 ]; + postInstall = '' mkdir -p $out/nix-support ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/ @@ -19,5 +19,7 @@ stdenv.mkDerivation rec { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; license = "bsd"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.platforms.eelco ]; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9e17ca7dbce..1a1d9bc1800 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -170,7 +170,6 @@ with (import ./release-lib.nix); libsmbios = linux; libtool = all; libtool_2 = all; - libxslt = all; lout = linux; lsh = linux; lsof = linux; -- GitLab From 1b807c2acda8b0ff102ff7025dbff78960070963 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 17:22:52 -0400 Subject: [PATCH 0770/5607] xorg-server: Boldly update to 1.13.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 847ffb92ba0..649e9b4a449 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1928,11 +1928,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.12.4"; + name = "xorg-server-1.13.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2; - sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a"; + url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2; + sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 636104b005a..351ca72041d 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -235,15 +235,15 @@ in buildInputs = attrs.buildInputs ++ [ args.zlib args.udev args.mesa args.dbus.libs xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto - xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.xineramaproto xorg.xf86dgaproto + xorg.compositeproto xorg.xf86dgaproto xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto - xorg.dri2proto xorg.kbproto + xorg.dri2proto xorg.kbproto xorg.xineramaproto xorg.resourceproto + xorg.scrnsaverproto xorg.videoproto ]; postInstall = '' diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 1560e4bfd28..469af642e28 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -167,7 +167,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 -- GitLab From 281fa6f85a1564caf06d17038af88e108558fda0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 17:43:00 -0400 Subject: [PATCH 0771/5607] Revert "xorg-server: Boldly update to 1.13.0" This reverts commit 2f2426a02f89458451de0570ee6f0bf1442a3619. xf86-video-intel requires a newer version of libdrm, which in turn breaks mesa. So stick to 1.12.4 until this gets sorted out. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 649e9b4a449..847ffb92ba0 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1928,11 +1928,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.13.0"; + name = "xorg-server-1.12.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2; - sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl"; + url = mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2; + sha256 = "1xscr6rf0q15hv3hmm51xhwk0c0rx7a2swkj14ygp8vb60sprh4a"; }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 351ca72041d..636104b005a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -235,15 +235,15 @@ in buildInputs = attrs.buildInputs ++ [ args.zlib args.udev args.mesa args.dbus.libs xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto - xorg.compositeproto xorg.xf86dgaproto + xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto + xorg.xineramaproto xorg.xf86dgaproto xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto - xorg.dri2proto xorg.kbproto xorg.xineramaproto xorg.resourceproto - xorg.scrnsaverproto xorg.videoproto + xorg.dri2proto xorg.kbproto ]; postInstall = '' diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 469af642e28..1560e4bfd28 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -167,7 +167,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.12.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 -- GitLab From 62f231756af80a88fe27ffdb5e50af087de9dfd5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 22:50:58 -0400 Subject: [PATCH 0772/5607] libusb1: Update to 1.0.9 --- pkgs/development/libraries/libusb1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index dcdd9f46d76..8a1580d4fbe 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libusb-1.0.8"; + name = "libusb-1.0.9"; src = fetchurl { url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "1afvpaqnl5plqg95nkvsl4sj9d6ckrmjq44mql8l4zqgf6jx7l11"; + sha256 = "16sz34ix6hw2wwl3kqx6rf26fg210iryr68wc439dc065pffw879"; }; meta = { -- GitLab From 6f700142c4a5794b349e6233c3e964a3de15407e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 22:56:13 -0400 Subject: [PATCH 0773/5607] cups: Drop unused dependencies and add libusb1 dependency --- pkgs/misc/cups/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 63018380580..bf55182058b 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, libusb, acl }: +{ stdenv, fetchurl, pkgconfig, zlib, pam, openssl, dbus, libusb1, acl }: let version = "1.6.1"; in @@ -13,7 +12,7 @@ stdenv.mkDerivation { sha256 = "143pk8a0kqqr7m9j0b8c9h2nn0zf6awpivk7wq7iclz68h8snhjq"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] + buildInputs = [ pkgconfig zlib libusb1 ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; propagatedBuildInputs = [ openssl ]; -- GitLab From f2ccebcae43e7d87fc3de79430503c2aaaea8770 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 23:09:34 -0400 Subject: [PATCH 0774/5607] usbutils: Update to 006 --- pkgs/os-specific/linux/usbutils/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 5614f55a622..5af28876dc1 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoreconfHook }: +{ stdenv, fetchurl, pkgconfig, libusb1 }: let # Obtained from http://www.linux-usb.org/usb.ids.bz2. usbids = fetchurl { - url = http://nixos.org/tarballs/usb.ids.20120411.bz2; - sha256 = "0rgxancjd1krv9g817w1wlbg7k19i8mwx37qs1vw1f21xz49yvja"; + url = http://nixos.org/tarballs/usb.ids.20120920.bz2; + sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli"; }; in stdenv.mkDerivation rec { - name = "usbutils-005"; - + name = "usbutils-006"; + src = fetchurl { - url = mirror://debian/pool/main/u/usbutils/usbutils_005.orig.tar.gz; - sha256 = "05sxkm7b7lj8p8kr8kw68m49h66351s803z42233b8lssmc3wlra"; + url = mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz; + sha256 = "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr"; }; - - buildInputs = [ pkgconfig libusb1 autoreconfHook ]; - preConfigure = "autoreconf -i"; - + buildInputs = [ pkgconfig libusb1 ]; + preBuild = "bunzip2 < ${usbids} > usb.ids"; meta = { -- GitLab From 46b05945e02fe9763b3f6a125b9ae8225c73475f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 23:15:49 -0400 Subject: [PATCH 0775/5607] pciutils: Update to 3.1.10 Also update the pci.ids database. --- pkgs/tools/system/pciutils/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 563521429a8..3cab8b0ef10 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "pciutils-3.1.7"; - + name = "pciutils-3.1.10"; + src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; - sha256 = "0i7mqf1fkmdqsawdk2badv6k3xrkryq0i2xknclvy6kcjsv27znq"; + sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl"; }; - + buildInputs = [ zlib ]; pciids = fetchurl { # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. - url = http://nixos.org/tarballs/pci.ids.20100714.bz2; - sha256 = "0vll4svr60l6217yna7bfhcjm3prxr2b62ynq4jaagdp1rilfbap"; + url = http://nixos.org/tarballs/pci.ids.20120929.bz2; + sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb"; }; # Override broken auto-detect logic. @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { installTargets = "install install-lib"; + # Get rid of update-pciids as it won't work. + postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; + meta = { homepage = http://mj.ucw.cz/pciutils.shtml; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; -- GitLab From bf1b2e9c2ec368b04328c298db546f547de0c582 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Sep 2012 23:20:34 -0400 Subject: [PATCH 0776/5607] qt4: Update to 4.8.3 --- .../libraries/qt-4.x/4.8/default.nix | 52 +++++++-------- .../qt-4.x/4.8/dlopen-absolute-paths.diff | 63 ++++++++++--------- .../libraries/qt-4.x/4.8/glib-2.32.patch | 12 ---- 3 files changed, 58 insertions(+), 69 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 59761e5cf1d..cea59780627 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -7,13 +7,13 @@ , perl, coreutils, libXi , buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base , buildWebkit ? true -, flashplayerFix ? true, gdk_pixbuf +, flashplayerFix ? false, gdk_pixbuf , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs }: -let - v = "4.8.2"; -in +with stdenv.lib; + +let v = "4.8.3"; in # TODO: # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid @@ -24,27 +24,26 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj"; + sha256 = "0a67riy4i0xj6j7vmckd0nakras3rl3rzx0r83h1p1i4z5s2kxzi"; }; - patches = [ ./glib-2.32.patch ( substituteAll { + patches = + [ ./glib-2.32.patch + (substituteAll { src = ./dlopen-absolute-paths.diff; inherit cups icu libXfixes; glibc = stdenv.gcc.libc; }) - ] ++ stdenv.lib.optional gtkStyle ( - substituteAll { + ] ++ stdenv.lib.optional gtkStyle (substituteAll { src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter - gconf = GConf; + gconf = GConf; inherit gnome_vfs libgnomeui gtk; - } - ) ++ stdenv.lib.optional flashplayerFix ( - substituteAll { + }) + ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; inherit gtk gdk_pixbuf; - } - ); + }); preConfigure = '' @@ -81,18 +80,16 @@ stdenv.mkDerivation rec { [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM ] - ++ (stdenv.lib.optional (stdenv.lib.lists.elem stdenv.system - stdenv.lib.platforms.mesaPlatforms) - mesa) - ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib) + ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa + ++ optional (buildWebkit || buildMultimedia) alsaLib ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ] - ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia) - [ gstreamer gst_plugins_base ]); + ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ]; # The following libraries are only used in plugins - buildInputs = [ cups # Qt dlopen's libcups instead of linking to it - mysql postgresql sqlite libjpeg libmng libtiff icu ] - ++ stdenv.lib.optionals gtkStyle [ gtk gdk_pixbuf ]; + buildInputs = + [ cups # Qt dlopen's libcups instead of linking to it + mysql postgresql sqlite libjpeg libmng libtiff icu ] + ++ optionals gtkStyle [ gtk gdk_pixbuf ]; buildNativeInputs = [ perl pkgconfig which ]; @@ -119,7 +116,7 @@ stdenv.mkDerivation rec { -no-svg -make qmake -make libs -nomake tools -nomake demos -nomake examples -nomake docs - '' + stdenv.lib.optionalString isMingw " -xplatform win32-g++-4.6"; + '' + optionalString isMingw " -xplatform win32-g++-4.6"; patches = []; preConfigure = '' sed -i -e 's/ g++/ ${stdenv.cross.config}-g++/' \ @@ -136,12 +133,11 @@ stdenv.mkDerivation rec { ''; dontSetConfigureCross = true; dontStrip = true; - } // (if isMingw then - { + } // optionalAttrs isMingw { propagatedBuildInputs = [ ]; - } else {}); + }; - meta = with stdenv.lib; { + meta = { homepage = http://qt.nokia.com/products; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff index 9823d649365..fe691996277 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -1,5 +1,27 @@ ---- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400 +diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp +--- qt-everywhere-opensource-src-4.8.3-orig/src/corelib/tools/qlocale_icu.cpp 2012-09-10 21:36:50.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.3/src/corelib/tools/qlocale_icu.cpp 2012-09-28 22:57:40.764153828 -0400 +@@ -81,7 +81,7 @@ + if (status == NotLoaded) { + + // resolve libicui18n +- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); + lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); + if (!lib.load()) { + qWarning() << "Unable to load library icui18n" << lib.errorString(); +@@ -111,7 +111,7 @@ + } + + // resolve libicuuc +- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); + ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics); + if (!ucLib.load()) { + qWarning() << "Unable to load library icuuc" << ucLib.errorString(); +diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp +--- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qcups.cpp 2012-09-10 21:36:51.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qcups.cpp 2012-09-28 18:08:26.600720491 -0400 @@ -87,7 +87,7 @@ static void resolveCups() @@ -9,8 +31,9 @@ if(cupsLib.load()) { _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); ---- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400 +diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp +--- qt-everywhere-opensource-src-4.8.3-orig/src/gui/painting/qprinterinfo_unix.cpp 2012-09-10 21:36:51.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.3/src/gui/painting/qprinterinfo_unix.cpp 2012-09-28 18:08:26.601720488 -0400 @@ -454,7 +454,7 @@ char *domain; int err; @@ -20,39 +43,21 @@ typedef int (*ypGetDefaultDomain)(char **); ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); ---- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400 -+++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400 +diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp +--- qt-everywhere-opensource-src-4.8.3-orig/src/network/kernel/qhostinfo_unix.cpp 2012-09-10 21:36:51.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.3/src/network/kernel/qhostinfo_unix.cpp 2012-09-28 18:08:53.186643755 -0400 @@ -95,7 +95,7 @@ static void resolveLibrary() { #ifndef QT_NO_LIBRARY - QLibrary lib(QLatin1String("resolv")); + QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) return; - ---- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400 -+++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400 -@@ -81,7 +81,7 @@ - if (status == NotLoaded) { - - // resolve libicui18n -- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!lib.load()) { - qWarning() << "Unable to load library icui18n" << lib.errorString(); - status = ErrorLoading; -@@ -110,7 +110,7 @@ - } - - // resolve libicuuc -- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!ucLib.load()) { - qWarning() << "Unable to load library icuuc" << ucLib.errorString(); - status = ErrorLoading; ---- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400 +diff -ru qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp +--- qt-everywhere-opensource-src-4.8.3-orig/src/plugins/platforms/xlib/qxlibstatic.cpp 2012-09-10 21:36:51.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.3/src/plugins/platforms/xlib/qxlibstatic.cpp 2012-09-28 18:08:26.601720488 -0400 @@ -242,7 +242,7 @@ } diff --git a/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch b/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch index f92d3430514..4593c1b4ba8 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch +++ b/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch @@ -10,15 +10,3 @@ diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/J typedef struct _GCond GCond; #endif -diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h ---- qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2012-04-26 15:46:14.000000000 -0400 -+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2012-07-14 22:46:24.671138454 -0400 -@@ -52,7 +52,7 @@ - typedef struct _GHashTable GHashTable; - typedef struct _GInputStream GInputStream; - typedef struct _GList GList; --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GPatternSpec GPatternSpec; - typedef struct _GPollableOutputStream GPollableOutputStream; - typedef struct _GSocketClient GSocketClient; -- GitLab From 3ffc960b18f8479f25a2ff975fe6b48a733ab90d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 29 Sep 2012 12:08:25 -0400 Subject: [PATCH 0777/5607] Fix libxml2Python build hydra.nixos.org/build/3106762 --- pkgs/development/libraries/libxml2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c076e66f0e6..c5f9eac5fc0 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}"; + buildInputs = stdenv.lib.optional pythonSupport [ python ]; + propagatedBuildInputs = [ zlib ]; setupHook = ./setup-hook.sh; -- GitLab From 745cb58e4ec257d105b8549b4baf9bce1f483da4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 29 Sep 2012 14:40:56 -0400 Subject: [PATCH 0778/5607] Doh --- pkgs/development/libraries/libxml2/default.nix | 2 +- pkgs/development/libraries/libxslt/default.nix | 2 +- pkgs/top-level/release.nix | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c5f9eac5fc0..323d6a5aca5 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A XML parsing library for C"; license = "bsd"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.platforms.eelco ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 8dfa56664b4..d3b7769754e 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "A C library and tools to do XSL transformations"; license = "bsd"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.platforms.eelco ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 1a1d9bc1800..4abaa55ca83 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -136,8 +136,6 @@ with (import ./release-lib.nix); guile = linux; # tests fail on Cygwin gv = linux; gzip = all; - hal = linux; - hal_info = linux; hddtemp = linux; hello = all; host = linux; -- GitLab From 8ea11ec677e5d5ad8f2a74f9684dafdeffd4882c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 29 Sep 2012 23:36:42 +0200 Subject: [PATCH 0779/5607] ffmpeg: update to 1.0 --- 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 3b5e28a2ee7..02cc60d9b8d 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-1.0"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3"; + sha256 = "1jbi85z2zkk3fh09l9f1s70kpvsz8706ay4lsw75395q8vic70hd"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that -- GitLab From f31de09d5cd983651dc654ce2a015292d7187ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 29 Sep 2012 23:38:41 +0200 Subject: [PATCH 0780/5607] libvpx: updating to 1.1.0 --- pkgs/development/libraries/libvpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 0d1a2cacc46..1c225aa7853 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, bash, yasm, which, perl}: stdenv.mkDerivation rec { - name = "libvpx-1.0.0"; + name = "libvpx-1.1.0"; src = fetchurl { - url = http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2; - sha256 = "08gyx90ndv0v8dhbhp3jdh6g37pmcjlfwljzsy0nskm4345dpkh7"; + url = http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2; + sha256 = "1ibjxcdsazqfbbjhb8w56vy3n9qwny2m9q4kzx4rmk9v9g7p9q4w"; }; patchPhase = '' -- GitLab From 3bc6675d70eeaaad2e6ca80ea7c25b107dcfdc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 30 Sep 2012 12:19:37 +0200 Subject: [PATCH 0781/5607] Revert "ffmpeg: update to 1.0" This reverts commit 8ea11ec677e5d5ad8f2a74f9684dafdeffd4882c. It was breaking things, as said by Eelco said in nix-dev: http://hydra.nixos.org/eval/742774 --- 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 02cc60d9b8d..3b5e28a2ee7 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-1.0"; + name = "ffmpeg-0.10"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1jbi85z2zkk3fh09l9f1s70kpvsz8706ay4lsw75395q8vic70hd"; + sha256 = "1ybzw6d5axr807141izvm2yf4pa0hc1zcywj89nsn3qsdnknlna3"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that -- GitLab From cb7e161361a44673417c949efb7466236c1f043e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 30 Sep 2012 12:20:55 +0200 Subject: [PATCH 0782/5607] ffmpeg: adding 1.0 back as an attribute apart. --- pkgs/development/libraries/ffmpeg/1.0.nix | 81 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/libraries/ffmpeg/1.0.nix diff --git a/pkgs/development/libraries/ffmpeg/1.0.nix b/pkgs/development/libraries/ffmpeg/1.0.nix new file mode 100644 index 00000000000..02cc60d9b8d --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/1.0.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchurl, pkgconfig, yasm, zlib, bzip2 +, mp3Support ? true, lame ? null +, speexSupport ? true, speex ? null +, theoraSupport ? true, libtheora ? null +, vorbisSupport ? true, libvorbis ? null +, vpxSupport ? false, libvpx ? null +, x264Support ? true, x264 ? null +, xvidSupport ? true, xvidcore ? null +, vdpauSupport ? true, libvdpau ? null +, faacSupport ? false, faac ? null +, dc1394Support ? false, libdc1394 ? null +}: + +assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert vorbisSupport -> libvorbis != null; +assert vpxSupport -> libvpx != null; +assert x264Support -> x264 != null; +assert xvidSupport -> xvidcore != null; +assert vdpauSupport -> libvdpau != null; +assert faacSupport -> faac != null; + +stdenv.mkDerivation rec { + name = "ffmpeg-1.0"; + + src = fetchurl { + url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; + sha256 = "1jbi85z2zkk3fh09l9f1s70kpvsz8706ay4lsw75395q8vic70hd"; + }; + + # `--enable-gpl' (as well as the `postproc' and `swscale') mean that + # the resulting library is GPL'ed, so it can only be used in GPL'ed + # applications. + configureFlags = [ + "--enable-gpl" + "--enable-postproc" + "--enable-swscale" + "--disable-ffplay" + "--enable-shared" + "--enable-runtime-cpudetect" + ] + ++ stdenv.lib.optional mp3Support "--enable-libmp3lame" + ++ stdenv.lib.optional speexSupport "--enable-libspeex" + ++ stdenv.lib.optional theoraSupport "--enable-libtheora" + ++ stdenv.lib.optional vorbisSupport "--enable-libvorbis" + ++ stdenv.lib.optional vpxSupport "--enable-libvpx" + ++ stdenv.lib.optional x264Support "--enable-libx264" + ++ stdenv.lib.optional xvidSupport "--enable-libxvid" + ++ stdenv.lib.optional vdpauSupport "--enable-vdpau" + ++ stdenv.lib.optional faacSupport "--enable-libfaac --enable-nonfree" + ++ stdenv.lib.optional dc1394Support "--enable-libdc1394"; + + buildInputs = [ pkgconfig lame yasm zlib bzip2 ] + ++ stdenv.lib.optional mp3Support lame + ++ stdenv.lib.optional speexSupport speex + ++ stdenv.lib.optional theoraSupport libtheora + ++ stdenv.lib.optional vorbisSupport libvorbis + ++ stdenv.lib.optional vpxSupport libvpx + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore + ++ stdenv.lib.optional vdpauSupport libvdpau + ++ stdenv.lib.optional faacSupport faac + ++ stdenv.lib.optional dc1394Support libdc1394; + + enableParallelBuilding = true; + + crossAttrs = { + dontSetConfigureCross = true; + configureFlags = configureFlags ++ [ + "--cross-prefix=${stdenv.cross.config}-" + "--enable-cross-compile" + "--target_os=linux" + "--arch=${stdenv.cross.arch}" + ]; + }; + + meta = { + homepage = http://www.ffmpeg.org/; + description = "A complete, cross-platform solution to record, convert and stream audio and video"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7edc90f5940..ec7dd2436e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3500,6 +3500,10 @@ let vpxSupport = if !stdenv.isMips then true else false; }; + ffmpeg_1_0 = callPackage ../development/libraries/ffmpeg/1.0.nix { + vpxSupport = if !stdenv.isMips then true else false; + }; + fftw = callPackage ../development/libraries/fftw { singlePrecision = false; }; -- GitLab From 564cc7d12c68f0678b49b5892e4406adedefda1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 30 Sep 2012 21:23:28 +0200 Subject: [PATCH 0783/5607] Upgrade ffado (FireWire audio drivers) to the recently released 2.1.0 --- pkgs/os-specific/linux/ffado/default.nix | 22 +++++++++++-------- .../linux/ffado/enable-mixer-and-dbus.patch | 13 ++++++----- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index a78599c6a20..1803a201aff 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchsvn, dbus, dbus_cplusplus, expat, glibmm, libconfig +{ stdenv, fetchurl, dbus, dbus_cplusplus, expat, glibmm, libconfig , libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig , pyqt4, python, pythonDBus, qt4, scons }: stdenv.mkDerivation rec { - name = "libffado-svn-1995"; + name = "libffado-${version}"; + version = "2.1.0"; - src = fetchsvn { - url = "http://subversion.ffado.org/ffado/trunk/libffado"; - rev = "1995"; + src = fetchurl { + url = "http://www.ffado.org/files/${name}.tgz"; + sha256 = "11cxmy31c19720j2171l735rpg7l8i41icsgqscfd2vkbscfmh6y"; }; buildInputs = @@ -18,13 +19,16 @@ stdenv.mkDerivation rec { patches = [ ./enable-mixer-and-dbus.patch ]; - preBuild = "export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages"; - # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR - buildPhase = "scons PYPKGDIR=$out/$PYLIBSUFFIX"; + buildPhase = '' + export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages + scons PYPKGDIR=$out/$PYLIBSUFFIX + sed -e "s#/usr/local#$out#" -i support/mixer-qt4/ffado/config.py + ''; + installPhase = '' scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \ - PYPKGDIR=$out/$PYLIBSUFFIX install + PYPKGDIR=$out/$PYLIBSUFFIX UDEVDIR=$out/lib/udev/rules.d install sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag diff --git a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch index 44c0b991e0a..480e0f45a92 100644 --- a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch +++ b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch @@ -1,24 +1,25 @@ ---- libffado-r2117/SConstruct 1970-01-01 01:00:01.000000000 +0100 -+++ libffado-r2117/SConstruct 2012-04-06 18:26:45.521100690 +0200 -@@ -314,10 +314,8 @@ +--- libffado-2.1.0/SConstruct 1970-01-01 01:00:01.000000000 +0100 ++++ libffado-2.1.0/SConstruct 2012-09-30 16:50:23.603283095 +0000 +@@ -349,11 +349,9 @@ + # Optional checks follow: # - # PyQT checks +-# PyQT checks -build_mixer = False -if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ): - env['PYUIC4'] = True - build_mixer = True +env['PYUIC4'] = True +build_mixer = True ++ if conf.CheckForApp( 'xdg-desktop-menu --help' ): env['XDG_TOOLS'] = True -@@ -348,7 +346,8 @@ +@@ -384,7 +382,7 @@ name2 = pkg.replace("+","").replace(".","").replace("-","").upper() env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] ) -if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'): -+ +if False: env['DBUS1_FLAGS'] = "" env['DBUSC1_FLAGS'] = "" -- GitLab From 471eb0ba53c80e1e5f03b86a03d4b284a804932d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 30 Sep 2012 23:53:39 +0200 Subject: [PATCH 0784/5607] ffmpeg: Add option to enable x11grab support. This is useful for making screencasts, or bug reporting. Note: This is copied from aszlig's pull request: 05831d3a668361b2 --- pkgs/development/libraries/ffmpeg/1.0.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/1.0.nix b/pkgs/development/libraries/ffmpeg/1.0.nix index 02cc60d9b8d..7ac77ffdcb7 100644 --- a/pkgs/development/libraries/ffmpeg/1.0.nix +++ b/pkgs/development/libraries/ffmpeg/1.0.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-1.0"; @@ -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; -- GitLab From 359355e15084b0d5572e3e39afb40ee94f7d00c6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Oct 2012 07:01:31 -0400 Subject: [PATCH 0785/5607] Linux 3.6 --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 265 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 ++ 2 files changed, 279 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-3.6.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix new file mode 100644 index 00000000000..6b6deb0f445 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -0,0 +1,265 @@ +args @ { stdenv, fetchurl, extraConfig ? "" +, perl, mktemp, module_init_tools +, ... }: + +let + configWithPlatform = kernelPlatform : + '' + # Power management and debugging for powertop. + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT? n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n + + # Support drivers that need external firmware. + STANDALONE n + + # Make /proc/config.gz available. + IKCONFIG_PROC y + + # Optimize with -O2, not -Os. + CC_OPTIMIZE_FOR_SIZE n + + # Enable the kernel's built-in memory tester. + MEMTEST y + + # Include the CFQ I/O scheduler in the kernel, rather than as a + # module, so that the initrd gets a good I/O scheduler. + IOSCHED_CFQ y + BLK_CGROUP y # required by CFQ + + # Enable NUMA. + NUMA? y + + # Disable some expensive (?) features. + FTRACE n + KPROBES n + PM_TRACE_RTC n + + # Enable various subsystems. + ACCESSIBILITY y # Accessibility support + AUXDISPLAY y # Auxiliary Display support + DONGLE y # Serial dongle support + HIPPI? y + MTD_COMPLEX_MAPPINGS y # needed for many devices + SCSI_LOWLEVEL y # enable lots of SCSI devices + SCSI_LOWLEVEL_PCMCIA y + SPI y # needed for many devices + SPI_MASTER y + WAN y + + # Networking options. + IP_PNP n + IPV6_PRIVACY y + NETFILTER_ADVANCED y + IP_VS_PROTO_TCP y + IP_VS_PROTO_UDP y + IP_VS_PROTO_ESP y + IP_VS_PROTO_AH y + IP_DCCP_CCID3 n # experimental + CLS_U32_PERF y + CLS_U32_MARK y + + # Wireless networking. + IPW2100_MONITOR y # support promiscuous mode + IPW2200_MONITOR? y # support promiscuous mode + HOSTAP_FIRMWARE y # Support downloading firmware images with Host AP driver + HOSTAP_FIRMWARE_NVRAM y + ATH9K_PCI y # Detect Atheros AR9xxx cards on PCI(e) bus + ATH9K_AHB y # Ditto, AHB bus + B43_PHY_HT y + BCMA_HOST_PCI y + + # Some settings to make sure that fbcondecor works - in particular, + # disable tileblitting and the drivers that need it. + + # Enable various FB devices. + FB y + FB_EFI y + FB_NVIDIA_I2C y # Enable DDC Support + FB_RIVA_I2C y + FB_ATY_CT y # Mach64 CT/VT/GT/LT (incl. 3D RAGE) support + FB_ATY_GX y # Mach64 GX support + FB_SAVAGE_I2C y + FB_SAVAGE_ACCEL y + FB_SIS_300 y + FB_SIS_315 y + FB_3DFX_ACCEL y + FB_GEODE y + + # Video configuration + # Enable KMS for devices whose X.org driver supports it. + DRM_I915_KMS y + DRM_RADEON_KMS y + # Hybrid graphics support + VGA_SWITCHEROO y + + # Sound. + SND_AC97_POWER_SAVE y # AC97 Power-Saving Mode + SND_HDA_INPUT_BEEP y # Support digital beep via input layer + SND_USB_CAIAQ_INPUT y + PSS_MIXER y # Enable PSS mixer (Beethoven ADSP-16 and other compatible) + + # USB serial devices. + USB_SERIAL_GENERIC y # USB Generic Serial Driver + USB_SERIAL_KEYSPAN_MPR y # include firmware for various USB serial devices + USB_SERIAL_KEYSPAN_USA28 y + USB_SERIAL_KEYSPAN_USA28X y + USB_SERIAL_KEYSPAN_USA28XA y + USB_SERIAL_KEYSPAN_USA28XB y + USB_SERIAL_KEYSPAN_USA19 y + USB_SERIAL_KEYSPAN_USA18X y + USB_SERIAL_KEYSPAN_USA19W y + USB_SERIAL_KEYSPAN_USA19QW y + USB_SERIAL_KEYSPAN_USA19QI y + USB_SERIAL_KEYSPAN_USA49W y + USB_SERIAL_KEYSPAN_USA49WLC y + + # Filesystem options - in particular, enable extended attributes and + # ACLs for all filesystems that support them. + EXT2_FS_XATTR y # Ext2 extended attributes + EXT2_FS_POSIX_ACL y # Ext2 POSIX Access Control Lists + EXT2_FS_SECURITY y # Ext2 Security Labels + EXT2_FS_XIP y # Ext2 execute in place support + EXT4_FS_POSIX_ACL y + EXT4_FS_SECURITY y + REISERFS_FS_XATTR y + REISERFS_FS_POSIX_ACL y + REISERFS_FS_SECURITY y + JFS_POSIX_ACL y + JFS_SECURITY y + XFS_QUOTA y + XFS_POSIX_ACL y + XFS_RT y # XFS Realtime subvolume support + OCFS2_DEBUG_MASKLOG n + BTRFS_FS_POSIX_ACL y + UBIFS_FS_XATTR? y + UBIFS_FS_ADVANCED_COMPR y + NFSD_V2_ACL y + NFSD_V3 y + NFSD_V3_ACL y + NFSD_V4 y + 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 + XEN_DOM0 y + + # Linux Containers + RT_GROUP_SCHED? y + CGROUP_DEVICE? y + CGROUP_MEM_RES_CTLR? y + CGROUP_MEM_RES_CTLR_SWAP? y + DEVPTS_MULTIPLE_INSTANCES? y + + # Enable staging drivers. These are somewhat experimental, but + # they generally don't hurt. + STAGING y + + # PROC_EVENTS requires that the netlink connector is not built + # as a module. This is required by libcgroup's cgrulesengd. + CONNECTOR y + PROC_EVENTS y + + # Tracing + FTRACE y + FUNCTION_TRACER y + FTRACE_SYSCALLS y + SCHED_TRACER y + + # Devtmpfs support. + DEVTMPFS y + + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} + ${extraConfig} + ''; +in + +import ./generic.nix ( + + rec { + version = "3.6"; + modDirVersion = "3.6.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 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa"; + }; + + config = configWithPlatform stdenv.platform; + configCross = configWithPlatform stdenv.cross.platform; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + } + + // removeAttrs args ["extraConfig"] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec7dd2436e7..e0a0ae0cd26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5848,6 +5848,19 @@ let ]; }; + linux_3_6 = makeOverridable (import ../os-specific/linux/kernel/linux-3.6.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + kernelPatches = + [ + kernelPatches.sec_perm_2_6_24 +# kernelPatches.aufs3_5 +# kernelPatches.perf3_5 + ] ++ 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 @@ -5973,6 +5986,7 @@ let linuxPackages_3_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_3 pkgs.linuxPackages_3_3); linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 pkgs.linuxPackages_3_4); linuxPackages_3_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_5 pkgs.linuxPackages_3_5); + linuxPackages_3_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6 pkgs.linuxPackages_3_6); # The current default kernel / kernel modules. linux = linuxPackages.kernel; -- GitLab From 41ca123e73225105b83299f8cf477ddc48287f49 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Mon, 1 Oct 2012 13:05:57 +0200 Subject: [PATCH 0786/5607] python-httplib2: updated to 0.7.6, added python-turses and its dependencies (python-oauth2, python-tweepy) --- pkgs/top-level/python-packages.nix | 68 ++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed7a03ac1ee..a9d9a258bbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -925,18 +925,21 @@ let pythonPackages = python.modules // rec { httplib2 = buildPythonPackage rec { - name = "httplib2-0.6.0"; + name = "httplib2-0.7.6"; src = fetchurl { url = "http://httplib2.googlecode.com/files/${name}.tar.gz"; - sha256 = "134pldyxayc0x4akzzvkciz2kj1w2dsim1xvd9b1qrpmba70dpjq"; + sha256 = "baa7bf431fa9d3c1016562de717e1ebb322a99df72a2918f6b5b8f65fa65bc2e"; }; doCheck = false; # doesn't have a test meta = { - homepage = http://code.google.com/p/httplib2/; + homepage = "http://code.google.com/p/httplib2"; description = "A comprehensive HTTP client library"; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = python.meta.platforms; }; }; @@ -1445,6 +1448,26 @@ let pythonPackages = python.modules // rec { }; }); + oauth2 = buildPythonPackage (rec { + name = "auth2-1.5.211"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz"; + sha256 = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21"; + }; + + propagatedBuildInputs = [ httplib2 ]; + doCheck = false; + + meta = { + homepage = "https://github.com/simplegeo/python-oauth2"; + description = "library for OAuth version 1.0"; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; + }; + }); + optfunc = buildPythonPackage ( rec { name = "optfunc-git"; @@ -2679,6 +2702,45 @@ let pythonPackages = python.modules // rec { }; }; + turses = buildPythonPackage (rec { + name = "turses-0.2.5"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; + sha256 = "fbbc0ca93324535bcafa8434395caded8047e40c25d7a4004806415dd6ca023f"; + }; + + propagatedBuildInputs = [ oauth2 urwid tweepy ]; + doCheck = false; + + meta = { + homepage = "https://github.com/alejandrogomez/turses"; + description = "A Twitter client for the console."; + license = pkgs.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; + }; + }); + + tweepy = buildPythonPackage (rec { + name = "tweepy-1.11"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; + sha256 = "2b9fa225e9254e2cbbb01e59c6e92d9c42e5d41d97e8c74dee93eb09babffde5"; + }; + + doCheck = false; + + meta = { + homepage = "https://github.com/tweepy/tweepy"; + description = "Twitter library for python"; + license = pkgs.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.garbas ]; + platforms = stdenv.lib.platforms.linux; + }; + }); + twisted = buildPythonPackage rec { name = "twisted-10.2.0"; -- GitLab From 7f871719d57fbb7460b658c1732a810b50238a0d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 Oct 2012 11:48:41 -0400 Subject: [PATCH 0787/5607] Add template-haskell haskellPackage --- .../libraries/haskell/template-haskell/default.nix | 11 +++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/libraries/haskell/template-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/template-haskell/default.nix b/pkgs/development/libraries/haskell/template-haskell/default.nix new file mode 100644 index 00000000000..93d9d2e53e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/template-haskell/default.nix @@ -0,0 +1,11 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "template-haskell"; + version = "2.8.0.0"; + sha256 = "1c75f7d0zhdh84za42dk0qkh9s9v29s4zzfy7aincq4dwjaa3rpc"; + meta = { + 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 7be018fbeb8..6fb0271a6ae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1492,6 +1492,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; + templateHaskell = callPackage ../development/libraries/haskell/template-haskell {}; + temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; -- GitLab From c073071e13d7fa1f6931c20a5668d6e9ff161eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 1 Oct 2012 22:26:51 +0200 Subject: [PATCH 0788/5607] Patch JACK to be compatible with the 2.1.0 release of ffado --- pkgs/misc/jackaudio/default.nix | 2 + .../jackaudio/ffado_setbuffsize-jack2.patch | 140 ++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 7447421fc94..363d2308d0b 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { pkgconfig python pythonDBus ] ++ (stdenv.lib.optional firewireSupport ffado); + patches = ./ffado_setbuffsize-jack2.patch; + configurePhase = '' cd jack-1.9.8 python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""} diff --git a/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch new file mode 100644 index 00000000000..7771639280d --- /dev/null +++ b/pkgs/misc/jackaudio/ffado_setbuffsize-jack2.patch @@ -0,0 +1,140 @@ +https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/jack2 + +From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Sat, 17 Mar 2012 22:36:30 +0100 +Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size + +This is a port of Jonathan Woithe's patch from jackd1. +With sufficiently recent versions of FFADO, it allows to change +the buffersize at runtime. +--- + linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- + linux/firewire/JackFFADODriver.h | 6 ++++ + 2 files changed, 65 insertions(+), 6 deletions(-) + +diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp +index b33e1cd..085b78a 100644 +--- a/jack-1.9.8/linux/firewire/JackFFADODriver.cpp ++++ b/jack-1.9.8/linux/firewire/JackFFADODriver.cpp +@@ -3,6 +3,7 @@ + Copyright (C) 2004 Grame + Copyright (C) 2007 Pieter Palmers + Copyright (C) 2009 Devin Anderson ++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -48,7 +49,10 @@ + namespace Jack + { + ++// Basic functionality requires API version 8. If version 9 or later ++// is present the buffers can be resized at runtime. + #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 ++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 + + #define jack_get_microseconds GetMicroSeconds + +@@ -281,19 +285,68 @@ + int + JackFFADODriver::SetBufferSize (jack_nframes_t nframes) + { +- printError("Buffer size change requested but not supported!!!"); ++ ffado_driver_t* driver = (ffado_driver_t*)fDriver; ++ signed int chn; ++ ++ // The speed of this function isn't critical; we can afford the ++ // time to check the FFADO API version. ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || ++ ffado_streaming_set_period_size == NULL) { ++ printError("unsupported on current version of FFADO; please upgrade FFADO"); ++ return -1; ++ } + +- /* + driver->period_size = nframes; + driver->period_usecs = + (jack_time_t) floor ((((float) nframes) / driver->sample_rate) + * 1000000.0f); +- */ ++ ++ ++ // Reallocate the null and scratch buffers. ++ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->nullbuffer == NULL) { ++ printError("could not allocate memory for null buffer"); ++ return -1; ++ } ++ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->scratchbuffer == NULL) { ++ printError("could not allocate memory for scratch buffer"); ++ return -1; ++ } ++ ++ // MIDI buffers need reallocating ++ for (chn = 0; chn < driver->capture_nchannels; chn++) { ++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { ++ // setup the midi buffer ++ if (driver->capture_channels[chn].midi_buffer != NULL) ++ free(driver->capture_channels[chn].midi_buffer); ++ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ for (chn = 0; chn < driver->playback_nchannels; chn++) { ++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { ++ if (driver->playback_channels[chn].midi_buffer != NULL) ++ free(driver->playback_channels[chn].midi_buffer); ++ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ ++ // Notify FFADO of the period size change ++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { ++ printError("could not alter FFADO device period size"); ++ return -1; ++ } ++ ++ // This is needed to give the shadow variables a chance to ++ // properly update to the changes. ++ sleep(1); + + /* tell the engine to change its buffer size */ +- //driver->engine->set_buffer_size (driver->engine, nframes); ++ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails + +- return -1; // unsupported ++ UpdateLatencies(); ++ ++ return 0; + } + + typedef void (*JackDriverFinishFunction) (jack_driver_t *); +@@ -306,7 +359,7 @@ + + assert(params); + +- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { + printError("Incompatible libffado version! (%s)", ffado_get_version()); + return NULL; + } +diff --git a/jack-1.9.8/linux/firewire/JackFFADODriver.h b/jack-1.9.8/linux/firewire/JackFFADODriver.h +index cb2a45d..790f4dd 100644 +--- a/jack-1.9.8/linux/firewire/JackFFADODriver.h ++++ b/jack-1.9.8/linux/firewire/JackFFADODriver.h +@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver + int Read(); + int Write(); + ++ // BufferSize can be changed ++ bool IsFixedBufferSize() ++ { ++ return false; ++ } ++ + int SetBufferSize(jack_nframes_t nframes); + }; + +-- +1.7.10 -- GitLab From 21271fee8d46b9ea926fab659e7a323568ed68ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 2 Oct 2012 01:00:13 +0200 Subject: [PATCH 0789/5607] Add the LV2 version of the SWH audio plugins (used for audio production) --- pkgs/applications/audio/swh-lv2/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/swh-lv2/default.nix diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix new file mode 100644 index 00000000000..9b18ab31abf --- /dev/null +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, fftwSinglePrec, libxslt, lv2, pkgconfig }: + +let + rev = "ec6b85e19e24ed"; +in +stdenv.mkDerivation rec { + name = "swh-lv2-${rev}"; + + src = fetchgit { + url = "git://github.com/swh/lv2.git"; + inherit rev; + sha256 = "d0d918ee642cd9649215737fcc008ce2bf55f4ea893a1897138b33775ea60d17"; + }; + + patchPhase = '' + sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile + sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile + ''; + + buildInputs = [ fftwSinglePrec lv2 pkgconfig ]; + + installPhase = "make install-system"; + + meta = with stdenv.lib; { + homepage = http://plugin.org.uk; + description = "LV2 version of Steve Harris' SWH plugins"; + longDescription = '' + SWH plugins include: + amp, fast overdrive, overdrive (with colourisation), comb + filter, waveshaper, ringmod, divider, diode, decliper, pitch + scaler, 16 band equaliser, sinus wavewrapper, hermes filter, + chorus, flanger, decimater, oscillator, gverb, phasers, harmonic + generators, surround encoders and more. + ''; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0a0ae0cd26..a00f8db1458 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7702,6 +7702,8 @@ let svk = perlPackages.SVK; + swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; + sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { sslSupport = true; gpgSupport = true; -- GitLab From 91b26c0e42f035724335be5a1bad21124a21671d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 09:36:09 +0200 Subject: [PATCH 0790/5607] virtualbox: Update to 4.2.0. New major upstream version, changes can be found here: 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 56387f9e5c4..3af9796136f 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.22"; + version = "4.2.0"; 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 = "7abb506203dd0d69b4b408fd999b5b9a479a9adce5f80e9b5569641c053dd153"; + sha256 = "895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6"; }; buildInputs = -- GitLab From 240cd87eda3ff1f77a71eb4b56d304ff83f1da4d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 09:45:07 +0200 Subject: [PATCH 0791/5607] virtualbox-guest-additions: Update to 4.2.0. Tested with a bunch of charon VirtualBox machines. 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 d903c44866c..63939cc5e65 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.22"; in +let version = "4.2.0"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "5c7d9a4a31c8a926ba6dbae2b9704a561638e94ea0fc4f805a9231dd4f932d46"; + sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit makeWrapper ]; -- GitLab From 5908f6c28f3aa2a00fd559aa1911b0970cece402 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 10:24:37 +0200 Subject: [PATCH 0792/5607] linuxconsoletools: New package, version 1.4.3. This is a small set of tools useful for testing and calibrating joysticks, gamepads and various other input devices. Signed-off-by: aszlig --- .../linux/consoletools/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/consoletools/default.nix diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix new file mode 100644 index 00000000000..537cc386402 --- /dev/null +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, SDL }: + +stdenv.mkDerivation rec { + name = "linuxconsoletools-${version}"; + version = "1.4.3"; + + src = fetchgit { + url = "git://linuxconsole.git.sourceforge.net/gitroot/linuxconsole/linuxconsole"; + rev = "dac2cae0e5795ddc27b76a92767dd9e07a10621e"; + sha256 = "350b008e614923dbd548fcaaf2842b39433acdcf595e2ce8aaf1599f076d331d"; + }; + + buildInputs = [ SDL ]; + makeFlags = [ "PREFIX=$(out)" ]; + + meta = { + homepage = "https://sourceforge.net/projects/linuxconsole/"; + description = "A set of tools for joysticks and serial peripherals"; + license = stdenv.lib.licenses.gpl2Plus; + + longDescription = '' + The included tools are: + + ffcfstress(1) - force-feedback stress test + ffmvforce(1) - force-feedback orientation test + ffset(1) - force-feedback configuration tool + fftest(1) - general force-feedback test + jstest(1) - joystick test + jscal(1) - joystick calibration tool + inputattach(1) - connects legacy serial devices to the input layer + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a00f8db1458..4f2bed5c415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5699,6 +5699,8 @@ let libnl = callPackage ../os-specific/linux/libnl { }; + linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; + linuxHeaders = callPackage ../os-specific/linux/kernel-headers { }; linuxHeaders33 = callPackage ../os-specific/linux/kernel-headers/3.3.5.nix { }; -- GitLab From cbaf071944c60135c883838b3657b3f597d7e6b5 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 20:41:08 +0200 Subject: [PATCH 0793/5607] youtube-dl: Update to version 2012.09.27. As the current version doesn't work anymore and there has been a lot of progress since February, I think it's time to switch over to the new versen. Signed-off-by: aszlig --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a810001d0cc..1fc5c08042c 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, python}: let pkgname = "youtube-dl"; - pkgver = "2012.02.27"; + pkgver = "2012.09.27"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/rg3/${pkgname}"; rev = "refs/tags/${pkgver}"; - sha256 = "17270ba14f42e8f2813bc6a0eb3674e51592eede69612e156e7d99a96fd147ce"; + sha256 = "a98f3339301324ddd6620f7b1353abed807cd8dea5586d6901d7fe69bc6a397c"; }; buildInputs = [python]; -- GitLab From 7e439ea13c91b9a5b156215f1bcce9c6798c8054 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Oct 2012 21:16:02 +0200 Subject: [PATCH 0794/5607] i3: Update to version 4.3. Though upstream clearly recommends to not deactivate Pango, we currently can't use Pango right now, as we are stuck at cairo-1.10.2. This version only has experimental support for XCB which became stable in 1.12.x. So we need to wait for 21bf5ef509dcadebab10de0ba142d55776a961f1 to be merged into master before we can enable Pango. Signed-off-by: aszlig --- pkgs/applications/window-managers/i3/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 14fd6ce4193..042e1a323a6 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -3,17 +3,21 @@ libXcursor, coreutils, perl }: stdenv.mkDerivation rec { - name = "i3-4.2"; + name = "i3-${version}"; + version = "4.3"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b"; + sha256 = "895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutil bison xcbutilwm libstartup_notification libX11 pcre libev yajl flex libXcursor perl ]; - patchPhase = "patchShebangs ."; + patchPhase = '' + sed -i -e '/^# Pango/,/^$/d' common.mk + patchShebangs . + ''; configurePhase = "makeFlags=PREFIX=$out"; -- GitLab From 59a75fc985b25108ace27e644a0ae0d8bfcc9369 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Oct 2012 03:38:45 +0200 Subject: [PATCH 0795/5607] Fix typo introduced by e6077fbc46. Already created a line note about that in the commit, but somehow it went unnoticed and most other typos introduced by that commit are already fixed by now. Signed-off-by: aszlig --- 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 4f2bed5c415..90a6d868811 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7909,7 +7909,7 @@ let ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin ); libs = - if config.browserNameenableQuakeLive or false + if config.browserName.enableQuakeLive or false then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ] else [ ]; }; -- GitLab From d2df1ada2745d8a71044b468aed5b9932e5708f9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 2 Oct 2012 03:42:39 +0200 Subject: [PATCH 0796/5607] chromium: Update channels to stable v22.0.1229.79. dev: 23.0.1271.10 beta: 22.0.1229.91 stable: 22.0.1229.79 The revert for SVN revision 151720 is now obsolete in the current beta release and is only needed for the stable version. So let's hope that >= 22.0.1229.91 will get stable soon. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 4 ++-- .../networking/browsers/chromium/sources.nix | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 33f9283b47a..59b05e94911 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -86,7 +86,7 @@ let # XXX: this reverts r151720 to prevent http://crbug.com/143623 maybeRevertZlibChanges = let - below22 = versionOlder sourceInfo.version "22.0.0.0"; + below22_91 = versionOlder sourceInfo.version "22.0.1229.91"; patch = fetchurl { name = "revert-r151720"; url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;" @@ -94,7 +94,7 @@ let + "h=0fabb4fda7059a8757422e8a44e70deeab28e698"; sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf"; }; - in optional (!below22) patch; + in optional (below22_91) patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index e4e72617bc4..9d2a7893102 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.1262.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1262.0.tar.bz2"; - sha256 = "19sqiv2vg9qy1kj6s12sq5aknvp3969yw26szwp54ipfv7lxqjh6"; + version = "23.0.1271.10"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.10.tar.bz2"; + sha256 = "1jm9fhnq978lfn21xripf7l2n362axinggnxlz7rcc9as1y086y3"; }; beta = { - version = "22.0.1229.56"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.56.tar.bz2"; - sha256 = "0wynq27yz1aslsnrjmf47dwbglblpfida2kmgv23l804mgdj19gv"; + version = "22.0.1229.91"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.91.tar.bz2"; + sha256 = "1b47rb5hw0k2fwc4jvmjpmxbhmqxgkz66j3mrjy4f8im41hmndyw"; }; stable = { - version = "21.0.1180.89"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1180.89.tar.bz2"; - sha256 = "1i9mjbjj3aywg03hd59m9j5gq5b5fl8nvw56g47q8s9k1bcsik0n"; + version = "22.0.1229.79"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.79.tar.bz2"; + sha256 = "0f7py2hd7fnx5z0xrg2vwf675xbg9xvamx79jjyzbpljh32b3jh6"; }; } -- GitLab From b63305721d39107c04ef9fa1e74f3eb8f32beb79 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 2 Oct 2012 08:49:33 +0200 Subject: [PATCH 0797/5607] gnum4: Disable tests for ARM. I can't get the `diversions' to pass on SheevaPlug. It builds fine otherwise. --- pkgs/development/tools/misc/gnum4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 1f026f12f52..e603c398b02 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { doCheck = !stdenv.isDarwin && !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin - && !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails + && !stdenv.isSunOS # XXX: `test-setlocale2.sh' fails + && !stdenv.isArm; # XXX: `diversions' fails on SheevaPlug # Upstream is aware of it; it may be in the next release. patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ]; -- GitLab From cf230cdddae861cac4197d8a655c1fc8112f6792 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 2 Oct 2012 08:50:42 +0200 Subject: [PATCH 0798/5607] sysfsutils: Use SourceForge mirror instead of static URL. --- pkgs/os-specific/linux/sysfsutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index cecb65f50a2..bf6dafae10a 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sysfsutils-2.1.0"; src = fetchurl { - url = "http://kent.dl.sourceforge.net/sourceforge/linux-diag/${name}.tar.gz"; + url = "mirror://sourceforge/linux-diag/${name}.tar.gz"; sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"; }; -- GitLab From 38161b6c64045b961e93ec8730e707c2ea2e7ca2 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 2 Oct 2012 08:51:51 +0200 Subject: [PATCH 0799/5607] dosfstools: Add alternative URL, since main site seems to be down. --- pkgs/tools/filesystems/dosfstools/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 21e2ceea9dd..b0ee47e23b5 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { name = "dosfstools-3.0.11"; src = fetchurl { - url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"; + urls = [ + "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2" + "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2" + ]; sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll"; }; -- GitLab From dad7ea5a7e57666dfe5716317860a85877e31250 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Oct 2012 11:18:59 +0400 Subject: [PATCH 0800/5607] Fix timidity source url --- pkgs/tools/misc/timidity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 4fae21250ca..89ff6f4677f 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -7,7 +7,7 @@ composableDerivation.composableDerivation {} { name = "timidity-2.13.0"; src = fetchurl { - url = http://ovh.dl.sourceforge.net/sourceforge/timidity/TiMidity++-2.13.0.tar.bz2; + url = mirror://sourceforge/timidity/TiMidity++-2.13.0.tar.bz2; sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf"; }; -- GitLab From 3c572df9001e5697ddf4b0da400d6ffe974b1508 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:09:28 -0400 Subject: [PATCH 0801/5607] alsa-utils: Fix the path to alsactl in the udev rule --- pkgs/os-specific/linux/alsa-utils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 7e4a97a1ab1..ebaef323491 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + preConfigure = + '' + # Ensure that ‘90-alsa-restore.rules.in’ gets rebuilt. + rm alsactl/90-alsa-restore.rules + ''; + meta = { description = "ALSA, the Advanced Linux Sound Architecture utils"; -- GitLab From f75dddde80a410fbe8f56d85bfe87c86bf9654a0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:45:54 -0400 Subject: [PATCH 0802/5607] apache-httpd: Update to 2.2.23 Fixes CVE-2012-0883, CVE-2012-2687. --- pkgs/servers/http/apache-httpd/2.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index f2a21ee28be..d4def35c09f 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert mpm == "prefork" || mpm == "worker" || mpm == "event"; stdenv.mkDerivation rec { - version = "2.2.22"; + version = "2.2.23"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha1 = "766cd0843050a8dfb781e48b976f3ba6ebcf8696"; + sha1 = "2776145201068045d4ed83157a0e2e1c28c4c453"; }; buildInputs = [perl apr aprutil pcre] ++ -- GitLab From 3cf0b00b5a9d409a622ee5b9b04ed065910c043a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:48:54 -0400 Subject: [PATCH 0803/5607] bind: Update to 9.7.6-P3 Fixes CVE-2012-4244. --- pkgs/servers/dns/bind/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index cdd8704739b..2e1af8a2cbc 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let - version = "9.7.6-P1"; -in +let version = "9.7.6-P3"; in + stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1xp7c3fpi3b6y1bz77mf7c98ic7rxp5lpwlmzqwsdrllip33qw1k"; + sha256 = "0xx23dcy9rbky8ar89pg3s07njqy7667sfrnbqc334pvd2qxanjx"; }; patchPhase = '' @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { /* Why --with-libtool? */ configureFlags = [ "--with-libtool" "--with-openssl=${openssl}" "--localstatedir=/var" ]; - + meta = { homepage = http://www.isc.org/software/bind; description = "ISC BIND: a domain name server"; -- GitLab From 9bc8e1250bc1b6f74962e1ea0e43cb0b439ec63d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 11:52:37 -0400 Subject: [PATCH 0804/5607] xinetd: Update to 2.3.15 Fixes CVE-2012-0862. --- pkgs/servers/xinetd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 6f752a7194f..c841f8431de 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "xinetd-2.3.14"; - + name = "xinetd-2.3.15"; + src = fetchurl { url = "http://www.xinetd.org/${name}.tar.gz"; - sha256 = "07xws1ydxrrx4xinvfqkc66diwfjh2apxz33xw4hb6k0gihhw3kn"; + sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; }; meta = { -- GitLab From 7dd3236c81b08ae01e9aec65038292f18460bf65 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Oct 2012 12:34:38 -0400 Subject: [PATCH 0805/5607] git: Update to 1.7.12.2 --- .../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 916aa69b05f..4481a1f8321 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.12.1"; + version = "1.7.12.2"; 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 = "a0c2b7e122ac2e40fe5b69baeeaac24b237a1341f08ba848cadaa835a0dbcfcd"; + sha1 = "277b759139ddb62c6935da37de8a483e2c234a97"; }; patches = [ ./docbook2texi.patch ]; -- GitLab From 63a72d462583df76377e85666bddb31d3fb6b0c2 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Wed, 3 Oct 2012 11:19:27 +0200 Subject: [PATCH 0806/5607] Update flashplayer to 11.2.202.238 since 11.1.102.55 is no longer available. --- .../mozilla-plugins/flashplayer-11/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 260edd360c6..5feb1747e82 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -40,11 +40,11 @@ let # no plans to provide a x86_64 version: # http://labs.adobe.com/technologies/flashplayer10/faq.html throw "no x86_64 debugging version available" - else { + else rec { # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "11.1.102.55"; - url = http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz; - sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l"; + version = "11.2.202.238"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; + sha256 = "07d09xjnn2hm877psmv9a6c4cfighxw24p0apq2ykawnrjpjc6zn"; } else if stdenv.system == "i686-linux" then if debug then { @@ -52,10 +52,10 @@ let version = "11.1"; url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz; sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk"; - } else { - version = "11.1.102.55"; - url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7"; + } else rec { + version = "11.2.202.238"; + url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; + sha256 = "0p05pr4vmc4536axjyljhxhqizq4ihslar8g638dj24251byp7ca"; } else throw "Flash Player is not supported on this platform"; -- GitLab From bc829a1050e13c6df2cde3988bb847773bb4577e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 3 Oct 2012 07:46:58 -0400 Subject: [PATCH 0807/5607] Revert "Add template-haskell haskellPackage" This reverts commit 7f871719d57fbb7460b658c1732a810b50238a0d. Apparently, GHC comes with template-haskell, so there's no point in installing it separately. --- .../libraries/haskell/template-haskell/default.nix | 11 ----------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 13 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/template-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/template-haskell/default.nix b/pkgs/development/libraries/haskell/template-haskell/default.nix deleted file mode 100644 index 93d9d2e53e1..00000000000 --- a/pkgs/development/libraries/haskell/template-haskell/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "template-haskell"; - version = "2.8.0.0"; - sha256 = "1c75f7d0zhdh84za42dk0qkh9s9v29s4zzfy7aincq4dwjaa3rpc"; - meta = { - 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 6fb0271a6ae..7be018fbeb8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1492,8 +1492,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); tagstreamConduit = callPackage ../development/libraries/haskell/tagstream-conduit {}; - templateHaskell = callPackage ../development/libraries/haskell/template-haskell {}; - temporary = callPackage ../development/libraries/haskell/temporary {}; Tensor = callPackage ../development/libraries/haskell/Tensor {}; -- GitLab From 114dc080266584f07c3e7ee21191002b0b555bd6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Oct 2012 11:35:30 -0400 Subject: [PATCH 0808/5607] openjpeg: Update to 1.5.1 Fixes CVE-2012-3535, CVE-2012-3358. --- pkgs/development/libraries/openjpeg/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 575d580faf6..6024456652c 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "openjpeg-1.5.1"; -stdenv.mkDerivation { - name = "openjpeg-1.5.0"; - src = fetchurl { - url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz; - sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469"; + url = "http://openjpeg.googlecode.com/files/${name}.tar.gz"; + sha256 = "13dbyf3jwr4h2dn1k11zph3jgx17z7d66xmi640mbsf8l6bk1yvc"; }; meta = { -- GitLab From f9714ace11b2417d61ce068c3fb1a69c3725ab8c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Oct 2012 14:06:53 -0400 Subject: [PATCH 0809/5607] boehm-gc: Update to 7.2d --- .../libraries/boehm-gc/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 0ad643d9ac4..3b2670d988a 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,15 +1,20 @@ { stdenv, fetchurl }: -stdenv.mkDerivation (rec { - name = "boehm-gc-7.2alpha6"; +stdenv.mkDerivation rec { + name = "boehm-gc-7.2d"; src = fetchurl { - url = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2alpha6.tar.gz"; - sha256 = "05jwadjbrv8pr7z9cb4miskicxqpxm0pca4h2rg5cgbpajr2bx7b"; + url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz; + sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr"; }; + configureFlags = "--enable-cplusplus"; + doCheck = true; + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv ? cross; + meta = { description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; @@ -39,10 +44,3 @@ stdenv.mkDerivation (rec { platforms = stdenv.lib.platforms.all; }; } - -// - -# Don't run the native `strip' when cross-compiling. -(if (stdenv ? cross) - then { dontStrip = true; } - else { })) -- GitLab From a84ad8010ab87d217cb90c87188614e08c69a363 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 3 Oct 2012 10:00:45 +0200 Subject: [PATCH 0810/5607] Add haskell-platform-2012.4.0.0 release candidate. --- .../async/{default.nix => 2.0.1.3.nix} | 0 .../haskell/haskell-platform/2012.4.0.0.nix | 44 +++++++++ .../haskell-platform-2012.4.0.0.cabal | 96 +++++++++++++++++++ .../libraries/haskell/network/2.3.1.0.nix | 15 +++ .../primitive/{default.nix => 0.4.1.nix} | 0 .../libraries/haskell/primitive/0.5.nix | 14 +++ .../split/{default.nix => 0.2.1.1.nix} | 0 .../libraries/haskell/vector/0.10.nix | 15 +++ .../haskell/vector/{default.nix => 0.9.1.nix} | 0 pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/haskell-defaults.nix | 18 +++- pkgs/top-level/haskell-packages.nix | 66 ++++++++++--- 12 files changed, 254 insertions(+), 15 deletions(-) rename pkgs/development/libraries/haskell/async/{default.nix => 2.0.1.3.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix create mode 100644 pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal create mode 100644 pkgs/development/libraries/haskell/network/2.3.1.0.nix rename pkgs/development/libraries/haskell/primitive/{default.nix => 0.4.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/primitive/0.5.nix rename pkgs/development/libraries/haskell/split/{default.nix => 0.2.1.1.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/vector/0.10.nix rename pkgs/development/libraries/haskell/vector/{default.nix => 0.9.1.nix} (100%) diff --git a/pkgs/development/libraries/haskell/async/default.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix similarity index 100% rename from pkgs/development/libraries/haskell/async/default.nix rename to pkgs/development/libraries/haskell/async/2.0.1.3.nix diff --git a/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix new file mode 100644 index 00000000000..c9f269eebef --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/2012.4.0.0.nix @@ -0,0 +1,44 @@ +{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, async, cgi, fgl, + haskellSrc, html, network, parallel, parsec, primitive, + regexBase, regexCompat, regexPosix, + split, stm, syb, deepseq, text, transformers, mtl, vector, xhtml, zlib, random, + cabalInstall, alex, happy, haddock, ghc}: + +# This is just a meta-package. Because upstream fails to provide proper versioned +# release tarballs that can be used for the purpose of verifying this package, we +# just create it on the fly from a simple Setup.hs file and a .cabal file that we +# store directly in the nixpkgs repository. + +cabal.mkDerivation (self : { + pname = "haskell-platform"; + version = "2012.4.0.0"; + cabalFile = ./haskell-platform-2012.4.0.0.cabal; + setupFile = ./Setup.hs; + src = null; + propagatedBuildInputs = [ + GLUT HTTP HUnit OpenGL QuickCheck async cgi fgl + haskellSrc html network parallel parsec primitive + regexBase regexCompat regexPosix + split stm syb deepseq text transformers mtl vector xhtml zlib random + cabalInstall alex happy ghc haddock + ]; + unpackPhase = '' + sourceRoot=haskell-platform + mkdir $sourceRoot + cp ${self.cabalFile} $sourceRoot/${self.pname}.cabal + cp ${self.setupFile} $sourceRoot/Setup.hs + touch $sourceRoot/LICENSE + ''; + noHaddock = true; + meta = { + homepage = "http://haskell.org/platform"; + description = "Haskell Platform meta package"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal new file mode 100644 index 00000000000..6346b6ab297 --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal @@ -0,0 +1,96 @@ +name: haskell-platform +version: 2012.4.0.0 +homepage: http://haskell.org/platform +license: BSD3 +license-file: LICENSE +author: libraries@haskell.org +maintainer: haskell-platform@projects.haskell.org +category: System +synopsis: The Haskell Platform +description: + The Haskell Platform (HP) is the blessed set of libraries and tools on + which to build further Haskell libraries and applications. It is + intended to provide a comprehensive, stable, and quality tested base for + Haskell projects to work from. + . + This version specifies the following additional developer tools be + installed, for a system to be in full compliance: + . + * cabal-install + * alex + * happy + * haddock + +cabal-version: >= 1.8 +build-type: Custom +tested-with: GHC ==7.4.2 + +library + build-depends: + -- ghc ==7.4.2, + + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- array ==0.4.0.0, + -- base ==4.5.1.0, + -- bytestring ==0.9.2.1, + -- Cabal ==1.14.0, + -- containers ==0.4.2.1, + -- deepseq ==1.3.0.0, + -- directory ==1.1.0.2, + -- extensible-exceptions ==0.1.1.4, + -- filepath ==1.3.0.0, + -- haskell2010 ==1.1.0.1, + -- haskell98 ==2.0.0.1, + -- hpc ==0.5.1.1, + -- old-locale ==1.0.0.4, + -- old-time ==1.1.0.0, + -- pretty ==1.1.1.0, + -- process ==1.1.0.1, + -- template-haskell ==2.7.0.0, + -- time ==1.4, + -- unix ==2.5.1.1, + -- Win32 ==2.2.2.0, + + -- Libraries in addition to what GHC provides: + -- Note: newer versions of cgi need monad-catchio. + async ==2.0.1.3, + cgi ==3001.1.7.4, + fgl ==5.4.2.4, + GLUT ==2.1.2.1, + haskell-src ==1.0.1.5, + html ==1.0.1.2, + HTTP ==4000.2.5, + HUnit ==1.2.5.1, + mtl ==2.1.2, + network ==2.3.1.0, + OpenGL ==2.2.3.1, + parallel ==3.2.0.3, + parsec ==3.1.3, + QuickCheck ==2.5.1.1, + random ==1.0.1.1, + regex-base ==0.93.2, + regex-compat ==0.95.1, + regex-posix ==0.95.2, + split ==0.2.1.1, + stm ==2.4, + syb ==0.3.7, + text ==0.11.2.3, + transformers ==0.3.0.0, + vector ==0.10, + xhtml ==3000.2.1, + zlib ==0.5.4.0, + + -- Libraries that are needed to support the above, + -- though are not officially part of the platform + primitive ==0.5 + + -- Depending on programs does not work, they are not registered + -- We list them to help distro packaging. + build-tools: + cabal-install ==0.14.0, + alex ==3.0.2, + happy ==1.18.10 + -- hscolour ==1.19 -- ??? + -- haddock ==2.11.0 -- need to use the one shipped with ghc + diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix new file mode 100644 index 00000000000..28fa50d8342 --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -0,0 +1,15 @@ +{ cabal, parsec }: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.3.1.0"; + sha256 = "1fp25wkl5cc4kx0jv5w02b7pzgqadjg1yrknzzwsqxc5s3cpyz6l"; + buildDepends = [ parsec ]; + meta = { + homepage = "http://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/0.4.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/primitive/default.nix rename to pkgs/development/libraries/haskell/primitive/0.4.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.5.nix b/pkgs/development/libraries/haskell/primitive/0.5.nix new file mode 100644 index 00000000000..d09359aaeb9 --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.5.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.5"; + sha256 = "0m2gv7lac7q24cy02bbc7hq41awjxzs8dcjc6j2nv8xiq14cp3mk"; + meta = { + homepage = "http://code.haskell.org/primitive"; + description = "Primitive memory-related operations"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/split/default.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/split/default.nix rename to pkgs/development/libraries/haskell/split/0.2.1.1.nix diff --git a/pkgs/development/libraries/haskell/vector/0.10.nix b/pkgs/development/libraries/haskell/vector/0.10.nix new file mode 100644 index 00000000000..8fac71eed4b --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.10.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.10"; + sha256 = "0lwhsdg7wv6gwjswakf2d1h9w7lp4pznab0mz6xg5q48pgknrcig"; + buildDepends = [ deepseq primitive ]; + meta = { + homepage = "http://code.haskell.org/vector"; + description = "Efficient Arrays"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/0.9.1.nix similarity index 100% rename from pkgs/development/libraries/haskell/vector/default.nix rename to pkgs/development/libraries/haskell/vector/0.9.1.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90a6d868811..3c00c15f4b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2317,6 +2317,7 @@ let haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); + haskellPackages_ghc742_pedantic = haskell.packages_ghc742_pedantic; haskellPackages_ghc761 = recurseIntoAttrs (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 4b2f5fc4613..b4489fe72e5 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -20,9 +20,20 @@ haskellPlatform = null; binary = null; # now a core package extensibleExceptions = self.extensibleExceptions_0_1_1_4; - regexCompat = self.regexCompat_0_95_1.override { regexPosix = self.regexPosix_0_95_2; }; }; + ghc742Prefs_pedantic = + self : self.haskellPlatformArgs_2012_4_0_0 self // { + haskellPlatform = self.haskellPlatform_2012_4_0_0; + binary = null; # now a core package + }; + + # until the Haskell Platform for 7.4.2 is released, this works fine/better; + # mainly because the Haskell Platform 2012.4.0.0 release candidate mandates + # vector 0.10 and primitive 0.5, which at this time aren't supported widely + # by other packages + ghc742Prefs = ghc741Prefs; + ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; @@ -259,9 +270,12 @@ packages_ghc742 = packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; ghcBinary = ghc6121BinaryDarwin; - prefFun = ghc741Prefs; + prefFun = ghc742Prefs; }; + packages_ghc742_pedantic = + packages_ghc742.override { prefFun = ghc742Prefs_pedantic; }; + packages_ghc761 = packages { ghcPath = ../development/compilers/ghc/7.6.1.nix; ghcBinary = ghc704Binary; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7be018fbeb8..16d315056ea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -149,6 +149,45 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happy = self.happy_1_18_10; # 7.6 ok }; + haskellPlatformArgs_2012_4_0_0 = self : { + inherit (self) cabal ghc; + async = self.async_2_0_1_3; + cgi = self.cgi_3001_1_7_4; + fgl = self.fgl_5_4_2_4; + GLUT = self.GLUT_2_1_2_1; + haskellSrc = self.haskellSrc_1_0_1_5; + html = self.html_1_0_1_2; + HTTP = self.HTTP_4000_2_5; + HUnit = self.HUnit_1_2_5_1; + mtl = self.mtl_2_1_2; + network = self.network_2_3_1_0; + OpenGL = self.OpenGL_2_2_3_1; + parallel = self.parallel_3_2_0_3; + parsec = self.parsec_3_1_3; + QuickCheck = self.QuickCheck_2_5_1_1; + random = self.random_1_0_1_1; + regexBase = self.regexBase_0_93_2; + regexCompat = self.regexCompat_0_95_1; + regexPosix = self.regexPosix_0_95_2; + split = self.split_0_2_1_1; + stm = self.stm_2_4; + syb = self.syb_0_3_7; + text = self.text_0_11_2_3; + transformers = self.transformers_0_3_0_0; + vector = self.vector_0_10; + xhtml = self.xhtml_3000_2_1; + zlib = self.zlib_0_5_4_0; + cabalInstall = self.cabalInstall_0_14_0; + alex = self.alex_3_0_2; + haddock = self.haddock_2_11_0; + happy = self.happy_1_18_10; + primitive = self.primitive_0_5; # semi-official, but specified + }; + + haskellPlatform_2012_4_0_0 = + callPackage ../development/libraries/haskell/haskell-platform/2012.4.0.0.nix + (self.haskellPlatformArgs_2012_4_0_0 self); + haskellPlatformArgs_2012_2_0_0 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; # 7.4.1 ok @@ -419,7 +458,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); AspectAG = callPackage ../development/libraries/haskell/AspectAG {}; - async = callPackage ../development/libraries/haskell/async {}; + async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; + async = self.async_2_0_1_3; attempt = callPackage ../development/libraries/haskell/attempt {}; @@ -1139,6 +1179,7 @@ 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_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; network_2_4_0_1 = callPackage ../development/libraries/haskell/network/2.4.0.1.nix {}; network = self.network_2_4_0_1; @@ -1249,7 +1290,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; - primitive = callPackage ../development/libraries/haskell/primitive {}; + primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; + primitive_0_5 = callPackage ../development/libraries/haskell/primitive/0.5.nix {}; + primitive = self.primitive_0_4_1; processExtras = callPackage ../development/libraries/haskell/process-extras {}; @@ -1315,9 +1358,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexCompat_0_71_0_1 = callPackage ../development/libraries/haskell/regex-compat/0.71.0.1.nix {}; regexCompat_0_92 = callPackage ../development/libraries/haskell/regex-compat/0.92.nix {}; regexCompat_0_93_1 = callPackage ../development/libraries/haskell/regex-compat/0.93.1.nix {}; - regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix { - regexPosix = self.regexPosix_0_95_1; - }; + regexCompat_0_95_1 = callPackage ../development/libraries/haskell/regex-compat/0.95.1.nix {}; regexCompat93 = self.regexCompat_0_93_1; regexCompat = self.regexCompat_0_71_0_1; @@ -1325,12 +1366,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexPosix_0_94_1 = callPackage ../development/libraries/haskell/regex-posix/0.94.1.nix {}; regexPosix_0_94_2 = callPackage ../development/libraries/haskell/regex-posix/0.94.2.nix {}; regexPosix_0_94_4 = callPackage ../development/libraries/haskell/regex-posix/0.94.4.nix {}; - regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix { - regexBase = self.regexBase_0_93_2; - }; - regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix { - regexBase = self.regexBase_0_93_2; - }; + regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {}; + regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {}; regexPosix = self.regexPosix_0_95_2; regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {}; @@ -1453,7 +1490,8 @@ 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_2_1_1 = callPackage ../development/libraries/haskell/split/0.2.1.1.nix {}; + split = self.split_0_2_1_1; stbImage = callPackage ../development/libraries/haskell/stb-image {}; @@ -1595,7 +1633,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; - vector = callPackage ../development/libraries/haskell/vector {}; + vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {}; + vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; + vector = self.vector_0_9_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; -- GitLab From 0013b8faa5a0824212ff1f107a089ed74ee915ad Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 4 Oct 2012 09:17:09 +0400 Subject: [PATCH 0811/5607] Add reptyr, tool to change controlling terminal of a process under Linux --- pkgs/os-specific/linux/reptyr/.default.nix.swp | Bin 0 -> 12288 bytes pkgs/os-specific/linux/reptyr/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 pkgs/os-specific/linux/reptyr/.default.nix.swp create mode 100644 pkgs/os-specific/linux/reptyr/default.nix diff --git a/pkgs/os-specific/linux/reptyr/.default.nix.swp b/pkgs/os-specific/linux/reptyr/.default.nix.swp new file mode 100644 index 0000000000000000000000000000000000000000..eb6aba8e0b7cb9c77ff5b78b221c6d953af468db GIT binary patch literal 12288 zcmeI2O>5LZ7{{mHt5%O*#_hr?*u3qw>5DxGS|})#LPaPZCX*+duz6!Y zuOWgbFCIOM7r~2u2%kyPQarTh$`km{B=h{|nVDZsAy4GJ+<(DCXUOon&Dhs_#lfdl zpB-*6ri7kkr43wujXYm?QQ}|jV$4me0$c@krQI?+sV8IYHch41bPX~~GU?`7IX$r^ z^H#YrBx0Hy2i;dCr#KNH0#^`NX2ZbutZB7(pWnT6bcLV7M1Tko0U|&IhyW2F0z`la z{7(c-y~N(*fo^n%TIu?wfBNo`IwC*>hyW2F0z`la5CI}U1c(3;AOb|-8WIpOWABz3 z`;M~z|Ifbv|J-8i8|pLa1L_oYjCzdveUq_Ys4u9Gs8iGt%0d0aJU`CzT|*wUWg3b77K76?WQ%70!ooE!?^F7GMOL=Jr-hU@sSAJL$N0aQJL* z|J82)K{YiGdrjVsgHA=TzJaD*5C@z7NMboGjG`DelC4N4Lm>ih6o$cO7>6(t>q3M8 z-j?rs(J+hy5F!a-9i)I>yITb_n@vHYU4!ep{dp-0Sajj3%569`rq Date: Thu, 4 Oct 2012 10:37:54 +0400 Subject: [PATCH 0812/5607] Update/fix MuPDF --- pkgs/applications/misc/mupdf/default.nix | 7 ++++--- pkgs/os-specific/linux/reptyr/.default.nix.swp | Bin 12288 -> 0 bytes 2 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 pkgs/os-specific/linux/reptyr/.default.nix.swp diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 20ded9486f7..eccd11f6041 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg , libX11, libXext }: stdenv.mkDerivation rec { - name = "mupdf-0.7"; + name = "mupdf-1.1"; src = fetchurl { - url = "http://mupdf.com/download/archive/${name}.tar.gz"; - sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6"; + url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; + sha256 = "e54666bbe1d9f0a5464349bfbeffcf676c4a0fcad3efb89eba1f20d4ac991f34"; }; buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; preBuild = '' export makeFlags="prefix=$out" + export NIX_CFLAGS_COMPILE=" $NIX_CFLAGS_COMPILE -I$(echo ${openjpeg}/include/openjpeg-*) " ''; meta = { diff --git a/pkgs/os-specific/linux/reptyr/.default.nix.swp b/pkgs/os-specific/linux/reptyr/.default.nix.swp deleted file mode 100644 index eb6aba8e0b7cb9c77ff5b78b221c6d953af468db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O>5LZ7{{mHt5%O*#_hr?*u3qw>5DxGS|})#LPaPZCX*+duz6!Y zuOWgbFCIOM7r~2u2%kyPQarTh$`km{B=h{|nVDZsAy4GJ+<(DCXUOon&Dhs_#lfdl zpB-*6ri7kkr43wujXYm?QQ}|jV$4me0$c@krQI?+sV8IYHch41bPX~~GU?`7IX$r^ z^H#YrBx0Hy2i;dCr#KNH0#^`NX2ZbutZB7(pWnT6bcLV7M1Tko0U|&IhyW2F0z`la z{7(c-y~N(*fo^n%TIu?wfBNo`IwC*>hyW2F0z`la5CI}U1c(3;AOb|-8WIpOWABz3 z`;M~z|Ifbv|J-8i8|pLa1L_oYjCzdveUq_Ys4u9Gs8iGt%0d0aJU`CzT|*wUWg3b77K76?WQ%70!ooE!?^F7GMOL=Jr-hU@sSAJL$N0aQJL* z|J82)K{YiGdrjVsgHA=TzJaD*5C@z7NMboGjG`DelC4N4Lm>ih6o$cO7>6(t>q3M8 z-j?rs(J+hy5F!a-9i)I>yITb_n@vHYU4!ep{dp-0Sajj3%569`rq Date: Tue, 2 Oct 2012 16:51:04 +0200 Subject: [PATCH 0813/5607] python/polib: Add new package, version 1.0.1. 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 a9d9a258bbb..ddc852ffa4a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1650,6 +1650,25 @@ let pythonPackages = python.modules // rec { }; + polib = buildPythonPackage rec { + name = "polib-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "http://bitbucket.org/izi/polib/downloads/${name}.tar.gz"; + sha256 = "1sr2bb3g7rl7gr6156j5qv71kg06q1x01r1lbps9ksnyz37djn2q"; + }; + + doCheck = false; + + meta = { + description = "A library to manipulate gettext files (po and mo files)"; + homepage = "http://bitbucket.org/izi/polib/"; + license = pkgs.lib.licenses.mit; + }; + }; + + prettytable = buildPythonPackage rec { name = "prettytable-0.5"; -- GitLab From d4c56cef4388845fef38cdfef6cf0c666b23849b Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 4 Oct 2012 08:23:55 +0200 Subject: [PATCH 0814/5607] mysql55: Update to version 5.5.28. The current build fails because the URL at inria.fr is no longer accessible. And 5.5.23 is quite old, so let's update it. With this update we also provide three URLs to fetchurl, just to make sure that we have enough sources, should one URL become inaccessible again. Signed-off-by: aszlig --- pkgs/servers/sql/mysql55/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index 3f26ea1f98b..5025720d62b 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -2,12 +2,17 @@ # Note: zlib is not required; MySQL can use an internal zlib. -stdenv.mkDerivation { - name = "mysql-5.5.23"; +stdenv.mkDerivation rec { + name = "mysql-${version}"; + version = "5.5.28"; src = fetchurl { - url = ftp://ftp.inria.fr/pub/MySQL/Downloads/MySQL-5.5/mysql-5.5.23.tar.gz; - sha256 = "0sklcz6miff7nb6bi1pqncgjv819255y7if6jxcqgiqs50z319i0"; + urls = [ + "mirror://sourceforge/mysql.mirror/${name}.tar.gz" + "http://mysql.linux.cz/Downloads/MySQL-5.5/${name}.tar.gz" + "http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${name}.tar.gz" + ]; + sha256 = "13y7bhjmx4daidvyqjz88yffbswb6rc1khkmiqm896fx3lglkcpr"; }; buildInputs = [ cmake bison ncurses openssl readline zlib ]; -- GitLab From 1de3682f98278e6ca8286571f5c8704a3a19d520 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 4 Oct 2012 08:27:51 +0200 Subject: [PATCH 0815/5607] mysql55: Enable parallel building. In order to extend the lifes of keyboards, monitors, mice and other hardware in range of impatient people, this should shorten build times a bit on multicore systems. And of course keeps blood pressure at low rates so cholerics may live longer. Whether the latter is good or bad is up to the readers choice and imagination. Signed-off-by: aszlig --- pkgs/servers/sql/mysql55/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/mysql55/default.nix b/pkgs/servers/sql/mysql55/default.nix index 5025720d62b..a5f588f747d 100644 --- a/pkgs/servers/sql/mysql55/default.nix +++ b/pkgs/servers/sql/mysql55/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake bison ncurses openssl readline zlib ]; + enableParallelBuilding = true; + cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; -- GitLab From 6b6a23c1aa5932f22140d907185ce9057f7c4a70 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 4 Oct 2012 11:27:57 +0400 Subject: [PATCH 0816/5607] Tell git to ignore .*.swp - Vim swap files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6405b7860f2..4bcac5d261e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *~ ,* +.*.swp +.*.swo -- GitLab From 2f6a498b5229d0bd15ccd500879c56fdb638f812 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 3 Oct 2012 11:34:55 +0200 Subject: [PATCH 0817/5607] node-packages: add "source-map" and dependencies --- pkgs/top-level/node-packages.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 5c6301ed2e0..a5ba91ed721 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -821,6 +821,21 @@ let self = { ]; }; + "requirejs" = self."requirejs-0.26.0"; + + "requirejs-==0.26.0" = self."requirejs-0.26.0"; + + "requirejs-0.26.0" = self.buildNodePackage rec { + name = "requirejs-0.26.0"; + src = fetchurl { + url = "http://registry.npmjs.org/requirejs/-/${name}.tgz"; + sha256 = "5ec7264031784fd1b5844aba813ace9045918a0b004a52fafa6b52e9e9760407"; + }; + deps = [ + + ]; + }; + "rimraf" = self."rimraf-2"; "rimraf-2" = self.buildNodePackage rec { @@ -922,6 +937,19 @@ let self = { ]; }; + "source-map" = self."source-map-0.1.2"; + + "source-map-0.1.2" = self.buildNodePackage rec { + name = "source-map-0.1.2"; + src = fetchurl { + url = "http://registry.npmjs.org/source-map/-/${name}.tgz"; + sha256 = "4465bb3a293c0e86092affb7cbdd6d9356cad69231c56f6e73bba7750497035f"; + }; + deps = [ + self."requirejs-==0.26.0" + ]; + }; + "tar" = self."tar-~0.1.12"; "tar-~0.1.12" = self.buildNodePackage rec { -- GitLab From 55f97f3a0d5c2645e64264a503ea114873a2c7f1 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 3 Oct 2012 14:44:21 +0200 Subject: [PATCH 0818/5607] node-packages: upgrade mongodb and bson --- pkgs/top-level/node-packages.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index a5ba91ed721..bde4b9b5f27 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -109,13 +109,13 @@ let self = { ]; }; - "bson" = self."bson-0.1.3"; + "bson" = self."bson-0.1.4"; - "bson-0.1.3" = self.buildNodePackage rec { - name = "bson-0.1.3"; + "bson-0.1.4" = self.buildNodePackage rec { + name = "bson-0.1.4"; src = fetchurl { url = "http://registry.npmjs.org/bson/-/${name}.tgz"; - sha256 = "86ed2b1465e30a4089c8c88dee3d97fafcd7deb60edc3819c00a0604c84d5040"; + sha256 = "deb8d960c849d1cadbb692ce93a6f4678f5431f98965869806f8f26f3db81919"; }; flags = [ "mongodb:native" ]; deps = [ @@ -536,16 +536,16 @@ let self = { ]; }; - "mongodb" = self."mongodb-1.1.7"; + "mongodb" = self."mongodb-1.1.8"; - "mongodb-1.1.7" = self.buildNodePackage rec { - name = "mongodb-1.1.7"; + "mongodb-1.1.8" = self.buildNodePackage rec { + name = "mongodb-1.1.8"; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; - sha256 = "10ed2903b839907e854a4ae4508940207f260500bfaff028497e9df865ead475"; + sha256 = "af99f0e13d5286b4335378c958cfc9773ada0732ef7242b25cb01aac288cbec1"; }; deps = [ - self."bson-0.1.3" + self."bson-0.1.4" ]; }; -- GitLab From 488b43586cfb28301b53289fd758a841c9d9767c Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 3 Oct 2012 18:15:39 +0200 Subject: [PATCH 0819/5607] vlc: use ffmpeg 1.0 --- 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 1f168bd0594..3da8ae00d45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7854,7 +7854,9 @@ let inherit (xlibs) libX11; }; - vlc = callPackage ../applications/video/vlc { }; + vlc = callPackage ../applications/video/vlc { + ffmpeg = ffmpeg_1_0; + }; vnstat = callPackage ../applications/networking/vnstat { }; -- GitLab From 4c96b8587b7f9df0202d6a3dc934d2c78bf83957 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 3 Oct 2012 23:43:19 +0200 Subject: [PATCH 0820/5607] logic cleanup --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3da8ae00d45..c34758800c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3496,15 +3496,15 @@ let fcgi = callPackage ../development/libraries/fcgi { }; ffmpeg = callPackage ../development/libraries/ffmpeg { - vpxSupport = if !stdenv.isMips then true else false; + vpxSupport = !stdenv.isMips; }; ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { - vpxSupport = if !stdenv.isMips then true else false; + vpxSupport = !stdenv.isMips; }; ffmpeg_1_0 = callPackage ../development/libraries/ffmpeg/1.0.nix { - vpxSupport = if !stdenv.isMips then true else false; + vpxSupport = !stdenv.isMips; }; fftw = callPackage ../development/libraries/fftw { -- GitLab From e3ae9289e0ff68d145e2974fea8072e41fe371d8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 3 Oct 2012 23:44:45 +0200 Subject: [PATCH 0821/5607] MPlayer: upgrade to 1.1 - big cleanup of optional dependency handling I hope I didn't miss any cases. - XVID xvid support seams broken, both built-in as external. I didn't notice any issues playing xvid video's though, as ffmpeg's default mpeg4 decoder handles xvid-encoded files just fine. It seems the only users affected by this are users who still encode xvid with mencoder (instead of plain ffmpeg). If this really is an issue to anyone, please let me know, so I can look into it some more, or retain an older mplayer version next to this one. --- pkgs/applications/video/MPlayer/default.nix | 165 ++++++++++---------- 1 file changed, 85 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 566089201cd..13ebd39734e 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -1,36 +1,41 @@ -{ alsaSupport ? true, xvSupport ? true, theoraSupport ? true, cacaSupport ? true -, xineramaSupport ? true, randrSupport ? true, dvdnavSupport ? true -, stdenv, fetchurl, fetchsvn, fetchgit, x11, freetype, fontconfig, zlib -, alsaLib ? null, libXv ? null, libtheora ? null, libcaca ? null -, libXinerama ? null, libXrandr ? null, libdvdnav ? null -, cdparanoia ? null, cddaSupport ? true -, amrnb ? null, amrwb ? null, amrSupport ? false -, x11Support ? true, libX11 ? null, libXext ? null -, jackaudioSupport ? false, jackaudio ? null -, x264Support ? false, x264 ? null -, xvidSupport ? false, xvidcore ? null +{ stdenv, fetchurl, freetype, pkgconfig, yasm, freefont_ttf +, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null +, xineramaSupport ? true, libXinerama ? null +, xvSupport ? true, libXv ? null +, alsaSupport ? true, alsaLib ? null +, screenSaverSupport ? true, libXScrnSaver ? null +, vdpauSupport ? false, libvdpau ? null +, cddaSupport ? true, cdparanoia ? null +, dvdnavSupport ? true, libdvdnav ? null +, bluraySupport ? true, libbluray ? null +, amrSupport ? false, amrnb ? null, amrwb ? null +, cacaSupport ? true, libcaca ? null , lameSupport ? true, lame ? null , speexSupport ? true, speex ? null -, screenSaverSupport ? true, libXScrnSaver -, pulseSupport ? false, pulseaudio -, mesa, pkgconfig, unzip, yasm, freefont_ttf -, vdpauSupport ? false, libvdpau ? null +, theoraSupport ? true, libtheora ? null +, x264Support ? false, x264 ? null +, jackaudioSupport ? false, jackaudio ? null +, pulseSupport ? false, pulseaudio ? null }: -assert alsaSupport -> alsaLib != null; -assert x11Support -> libX11 != null; -assert xvSupport -> (libXv != null && x11Support); -assert theoraSupport -> libtheora != null; -assert cacaSupport -> libcaca != null; +assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert xineramaSupport -> (libXinerama != null && x11Support); -assert randrSupport -> (libXrandr != null && x11Support); -assert dvdnavSupport -> libdvdnav != null; -assert cddaSupport -> cdparanoia != null; -assert jackaudioSupport -> jackaudio != null; -assert amrSupport -> (amrnb != null && amrwb != null); +assert xvSupport -> (libXv != null && x11Support); +assert alsaSupport -> alsaLib != null; assert screenSaverSupport -> libXScrnSaver != null; assert vdpauSupport -> libvdpau != null; +assert cddaSupport -> cdparanoia != null; +assert dvdnavSupport -> libdvdnav != null; +assert bluraySupport -> libbluray != null; +assert amrSupport -> (amrnb != null && amrwb != null); +assert cacaSupport -> libcaca != null; +assert lameSupport -> lame != null; assert speexSupport -> speex != null; +assert theoraSupport -> libtheora != null; +assert x264Support -> x264 != null; +assert jackaudioSupport -> jackaudio != null; +assert pulseSupport -> pulseaudio != null; + let @@ -64,20 +69,12 @@ let }; } else null; - ffmpegGit = fetchgit { - url = "git://git.videolan.org/ffmpeg.git"; - rev = "9e53f62be1a171eaf9620958c225d42cf5142a30"; - sha256 = "be0ef2a394c82a0eee0be66bc0b943d37efb90f74ce1030aa89606109434c943"; - }; - - mplayerRev = "34586"; - in stdenv.mkDerivation rec { - name = "mplayer-${mplayerRev}"; + name = "mplayer-1.1"; - src = fetchsvn { + src = fetchurl { # Old kind of URL: # url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2; # Snapshot I took on 20110423 @@ -86,64 +83,72 @@ stdenv.mkDerivation rec { #url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2; #sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb"; - url = "svn://svn.mplayerhq.hu/mplayer/trunk"; - rev = "${mplayerRev}"; - sha256 = "5688add3256b5de8e0410194232aaaeb01531bb507459ffe4f07e69cb2d81bd7"; + url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.tar.xz"; + sha256 = "173cmsfz7ckzy1hay9mpnc5as51127cfnxl20b521d2jvgm4gjvn"; }; prePatch = '' sed -i /^_install_strip/d configure ''; - buildInputs = - [ freetype zlib pkgconfig ] - ++ stdenv.lib.optionals x11Support [ libX11 libXext mesa ] - ++ stdenv.lib.optional alsaSupport alsaLib - ++ stdenv.lib.optional xvSupport libXv - ++ stdenv.lib.optional theoraSupport libtheora - ++ stdenv.lib.optional cacaSupport libcaca - ++ stdenv.lib.optional xineramaSupport libXinerama - ++ stdenv.lib.optional randrSupport libXrandr - ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ stdenv.lib.optional cddaSupport cdparanoia - ++ stdenv.lib.optional jackaudioSupport jackaudio - ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ] - ++ stdenv.lib.optional x264Support x264 - ++ stdenv.lib.optional xvidSupport xvidcore - ++ stdenv.lib.optional pulseSupport pulseaudio - ++ stdenv.lib.optional screenSaverSupport libXScrnSaver - ++ stdenv.lib.optional lameSupport lame - ++ stdenv.lib.optional vdpauSupport libvdpau - ++ stdenv.lib.optional speexSupport speex; + buildInputs = with stdenv.lib; + [ freetype pkgconfig ] + ++ optionals x11Support [ libX11 libXext mesa ] + ++ optional alsaSupport alsaLib + ++ optional xvSupport libXv + ++ optional theoraSupport libtheora + ++ optional cacaSupport libcaca + ++ optional xineramaSupport libXinerama + ++ optional dvdnavSupport libdvdnav + ++ optional bluraySupport libbluray + ++ optional cddaSupport cdparanoia + ++ optional jackaudioSupport jackaudio + ++ optionals amrSupport [ amrnb amrwb ] + ++ optional x264Support x264 + ++ optional pulseSupport pulseaudio + ++ optional screenSaverSupport libXScrnSaver + ++ optional lameSupport lame + ++ optional vdpauSupport libvdpau + ++ optional speexSupport speex; buildNativeInputs = [ yasm ]; - preConfigure = '' - cp -r ${ffmpegGit} ffmpeg - chmod u+w -R ffmpeg - sed -ie '1i#include "libavutil/intreadwrite.h"' ffmpeg/libavcodec/libmp3lame.c - ''; - postConfigure = '' echo CONFIG_MPEGAUDIODSP=yes >> config.mak ''; - configureFlags = '' - ${if cacaSupport then "--enable-caca" else "--disable-caca"} - ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} - ${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""} - ${if codecs != null then "--codecsdir=${codecs}" else ""} - ${if (stdenv.isi686 || stdenv.isx86_64) then "--enable-runtime-cpudetection" else ""} - ${if x11Support then "--enable-x11" else ""} - ${stdenv.lib.optionalString speexSupport "--enable-speex"} - --disable-xanim - --disable-ivtv - --enable-vidix - --enable-fbdev - --disable-ossaudio - ''; + configureFlags = with stdenv.lib; + '' + ${if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl"} + ${if xineramaSupport then "--enable-xinerama" else "--disable-xinerama"} + ${if xvSupport then "--enable-xv" else "--disable-xv"} + ${if alsaSupport then "--enable-alsa" else "--disable-alsa"} + ${if screenSaverSupport then "--enable-xss" else "--disable-xss"} + ${if vdpauSupport then "--enable-vdpau" else "--disable-vdpau"} + ${if cddaSupport then "--enable-cdparanoia" else "--disable-cdparanoia"} + ${if dvdnavSupport then "--enable-dvdnav" else "--disable-dvdnav"} + ${if bluraySupport then "--enable-bluray" else "--disable-bluray"} + ${if amrSupport then "--enable-libopencore_amrnb" else "--disable-libopencore_amrnb"} + ${if cacaSupport then "--enable-caca" else "--disable-caca"} + ${if lameSupport then "--enable-mp3lame --disable-mp3lame-lavc" else "--disable-mp3lame --enable-mp3lame-lavc"} + ${if speexSupport then "--enable-speex" else "--disable-speex"} + ${if theoraSupport then "--enable-theora" else "--disable-theora"} + ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} + ${if jackaudioSupport then "--enable-jack" else "--disable-jack"} + ${if pulseSupport then "--enable-pulse" else "--disable-pulse"} + + ${optionalString (codecs != null) "--codecsdir=${codecs}"} + ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} + --enable-freetype + --disable-xanim + --disable-ivtv + --disable-xvid --disable-xvid-lavc + --enable-vidix + --enable-fbdev + --disable-ossaudio + ''; - NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else ""; + NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; # Provide a reasonable standard font. Maybe we should symlink here. postInstall = @@ -155,7 +160,7 @@ stdenv.mkDerivation rec { crossAttrs = { dontSetConfigureCross = true; # Some things (vidix) are nanonote specific. Once someone cares, we can make options from them. - preConfigure = preConfigure + '' + preConfigure = '' configureFlags="`echo $configureFlags | sed -e 's/--codecsdir[^ ]\+//' \ -e 's/--enable-runtime-cpudetection//' `" -- GitLab From 0c88675592a10f4d51a02bfa20e772c7f6619d74 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 4 Oct 2012 13:10:24 +0200 Subject: [PATCH 0822/5607] sheevaplug platform: Add VLAN support (CONFIG_VLAN_8021Q=m) --- pkgs/top-level/platforms.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 14d4f87d285..3b7a719f29f 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -73,6 +73,7 @@ rec { IP_NF_TARGET_LOG y IP_NF_MANGLE y IPV6 m + VLAN_8021Q m CIFS y CIFS_XATTR y -- GitLab From 4959fd19f4bdb52c6cc7d77c5775cd2234b4ca67 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 4 Oct 2012 13:11:13 +0200 Subject: [PATCH 0823/5607] sheevaplug platform: Add hardware watchdog support --- pkgs/top-level/platforms.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 3b7a719f29f..14f967bf8cf 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -81,6 +81,10 @@ rec { CIFS_FSCACHE y CIFS_ACL y + WATCHDOG y + WATCHDOG_CORE y + ORION_WATCHDOG m + ZRAM m NETCONSOLE m -- GitLab From 396de2376206943e434184003c09c58cd0029f7f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 4 Oct 2012 15:35:21 +0400 Subject: [PATCH 0824/5607] Enable V4L2 modules --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 6b6deb0f445..5f23928ebc9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -232,6 +232,10 @@ let # Devtmpfs support. DEVTMPFS y + # Media support + MEDIA_CAMERA_SUPPORT? y + MEDIA_RC_SUPPORT? y + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; -- GitLab From 24298db823714cbca08fcc69afcf589e6d43d582 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 4 Oct 2012 13:38:26 +0200 Subject: [PATCH 0825/5607] xdg-utils: Fix reference to /usr/bin/file in xdg-mime --- pkgs/tools/X11/xdg-utils/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index cc166ba20d9..df5d59c7b57 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, file }: stdenv.mkDerivation rec { name = "xdg-utils-1.0.2"; @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { url = "http://portland.freedesktop.org/download/${name}.tgz"; sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1"; }; + + postInstall = '' + substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file + ''; meta = { homepage = http://portland.freedesktop.org/wiki/; -- GitLab From 73f79401b1d656ece1e39af240bf4f1233d510c8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Thu, 4 Oct 2012 13:15:01 +0200 Subject: [PATCH 0826/5607] eaglemode: remove unused xineLib dependency It seems the resulting output path has no reference to libxine, so it does not get used. Probably it needs some hard-coded link-paths as eaglemode wants to use dlopen for some things. If anyone wants to use eaglemode's xine support and fix this issue, please make it optional. --- pkgs/applications/misc/eaglemode/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 519db53ea18..b9c8acb0d07 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff, pkgconfig, +{ stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, librsvg, glib, gtk, libXext, libXxf86vm, poppler }: stdenv.mkDerivation { name = "eaglemode-0.84.0"; - + src = fetchurl { url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2; sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs"; }; - - buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig + + buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig librsvg glib gtk libXxf86vm libXext poppler ]; - + # 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, + # 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 = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation { # Run 'eaglemode.sh', not 'eaglemode'. ln -s $out/eaglemode.sh $out/bin/eaglemode.sh ''; - + meta = { homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; -- GitLab From 3240b48f7468990457b6975c79f0e3e26316bbae Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Oct 2012 11:10:51 -0400 Subject: [PATCH 0827/5607] systemd: Update to 194 --- pkgs/os-specific/linux/systemd/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index abacee62ff3..9d67c5e2f72 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils -, glib, kbd, libxslt +, glib, kbd, libxslt, coreutils }: assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-193"; + name = "systemd-194"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "1k8fmii15127y4b2kc9id2vkmrjdsbq3kv6fi308k72azbhnpnxr"; + sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; }; patches = [ ./reexec.patch ]; @@ -75,7 +75,12 @@ stdenv.mkDerivation rec { for i in init halt poweroff runlevel reboot shutdown; do ln -s $out/bin/systemctl $out/sbin/$i done - ''; + + # Fix reference to /bin/false in the D-Bus services. + for i in $out/share/dbus-1/system-services/*.service; do + substituteInPlace $i --replace /bin/false ${coreutils}/bin/false + done + ''; # */ enableParallelBuilding = true; -- GitLab From 925aeb98d5fdbc3bc027ad71364110fdbb67d59d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Oct 2012 11:26:19 -0400 Subject: [PATCH 0828/5607] PostgreSQL updates --- pkgs/servers/sql/postgresql/8.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.0.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index d4ddb36d4fe..7a153187cd5 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.20"; in +let version = "8.3.21"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0qqic4wx59lgbyfmdfcgip9nrcpk10zdb91bw9b96wr1vijn2awj"; + sha256 = "1y1lw83jr3v91920xdhd4ypaa5iazmdh4snl5qzq0yq6z3lnsjx6"; }; 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 e1150543f36..3500299b50d 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.13"; in +let version = "8.4.14"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "1fccqkni64vg1pi4zzcl67bm9g2brrlzjn1vh6qlyfpsld139p90"; + sha256 = "0fhk3mmk95p5gwmg2skqv1rfi7ylk8gw195hx8rska7fbdryfwhi"; }; 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 a28e5c33779..9993732ebcd 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.9"; in +let version = "9.0.10"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "12nslml1mg3lyvrhmdvv5g15n7vj5fk1blx1dfllylqg38c7shc7"; + sha256 = "0af7in1fp4qxkvzbipz74gxm06x31a9n4z9g91mcis4r015ii523"; }; buildInputs = [ zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 14488d4649e..c8fa9327cf3 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.5"; in +let version = "9.1.6"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0i6fssldjp65xfxz9dcmkhz6bk4rpw9g26zbqbc6iz164h9rr20b"; + sha256 = "1rridkybr55xw4a1h0ppqwv2x2ffwvmpjai9yzsvk58scb56lfbf"; }; buildInputs = [ zlib readline ]; -- GitLab From 3ab23d9542c26c0de73e70fe82698be70decb3dd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 5 Oct 2012 00:50:02 +0400 Subject: [PATCH 0829/5607] LibreOffice 3.6.2.2 bugfix update. --- .../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 47630e5cfdf..357b703d84d 100644 --- a/pkgs/applications/office/openoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/openoffice/libreoffice-srcs.nix @@ -63,6 +63,10 @@ name = "liberation-fonts-ttf-1.07.1.tar.gz"; md5 = "0be45d54cc5e1c2e3102e32b8c190346"; } +{ + name = "liberation-fonts-ttf-2.00.0.tar.gz"; + md5 = "cfbf1ac6f61bf6cf45342a0cc9381be5"; +} { name = "swingExSrc.zip"; md5 = "35c94d2df8893241173de1d16b6034c0"; diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix index d336266ccaf..065f439427c 100644 --- a/pkgs/applications/office/openoffice/libreoffice.nix +++ b/pkgs/applications/office/openoffice/libreoffice.nix @@ -16,10 +16,10 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "3"; minor = "6"; - patch = "1"; + patch = "2"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; - version = "${subdir}.${tweak}"; + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; fetchThirdParty = {name, md5}: fetchurl { inherit name md5; url = "http://dev-www.libreoffice.org/src/${md5}-${name}"; @@ -36,17 +36,17 @@ let }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "0id4ad8h3fl4s2ax6r4w4af74xvagkv0qwy50f483lqq3a3pl7fl"; + sha256 = "a6ef65d5acfe9be19a3d4d743cd23a1017733f651ffc57f5773a24704a282c33"; }; help = fetchSrc { name = "help"; - sha256 = "0jd3l3rkhmdvrvgklkmrh9zsg9hlv3vhy6s97fnzhpzr90sjqrs1"; + sha256 = "55ec6ef5eef4bbf2298c3b864f67c8424ebb5ccbe7bcd6ca59abba2867989e31"; }; core = fetchSrc { name = "core"; - sha256 = "12zc0zviy1p3gk1v5nm4ks4rzscn68lpnl3kis4q693zhsk8jyh3"; + sha256 = "5ec07ffacec09c4dcee9246cb132f7a59a618b395835e781735fd61bf47e8d37"; }; }; in -- GitLab From a08ca4c04a3137bc5671a811c177e70212c4593d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 4 Oct 2012 16:56:41 -0400 Subject: [PATCH 0830/5607] openjdk: Don't use the official build system's boostrapping, do our own. The openjdk BOOT_CYCLE bootstrap doesn't use the binaries built in the first stage for the second stage, so we get a bunch of errors like: /bin/sh: /nix/store/wdgl7xl9b72hn212l0672ad5sn7vh44y-openjdk-bootstrap/bin/native2ascii: No such file or directory Instead, just build each stage as a separate derivation --- .../development/compilers/openjdk/default.nix | 1 - pkgs/top-level/all-packages.nix | 25 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index f243baab591..56daf43595d 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -122,7 +122,6 @@ stdenv.mkDerivation rec { "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" "DROPS_DIR=$(DROPS_PATH)" - "SKIP_BOOT_CYCLE=false" ]; configurePhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c34758800c6..2e8a80a4cd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2355,31 +2355,36 @@ let openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {}; + openjdkStage1 = callPackage ../development/compilers/openjdk { + jdk = pkgs.openjdkBootstrap; + ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; }; + }; + openjdk = if stdenv.isDarwin then callPackage ../development/compilers/openjdk-darwin { } else callPackage ../development/compilers/openjdk { - jdk = pkgs.openjdkBootstrap; - ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; }; + jdk = pkgs.openjdkStage1; + ant = pkgs.ant.override { jdk = pkgs.openjdkStage1; }; }; - openjre = callPackage ../development/compilers/openjdk { + openjre = pkgs.openjdk.override { jreOnly = true; }; jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") - then openjdk - else jdkdistro true false; + then pkgs.openjdk + else pkgs.oraclejdk; jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") - then openjre - else jdkdistro false false; + then pkgs.openjre + else pkgs.oraclejre; - oraclejdk = jdkdistro true false; + oraclejdk = pkgs.jdkdistro true false; - oraclejre = jdkdistro false false; + oraclejre = pkgs.jdkdistro false false; - jrePlugin = lowPrio (jdkdistro false true); + jrePlugin = lowPrio (pkgs.jdkdistro false true); supportsJDK = system == "i686-linux" || -- GitLab From c592992b14c0bbabcac88ff6ccd6cad51903be30 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 4 Oct 2012 19:53:10 -0400 Subject: [PATCH 0831/5607] Fix tarball --- pkgs/development/compilers/openjdk-darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index cbd41033bfc..1e74acfae72 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, ...}: stdenv.mkDerivation { name = "openjdk6-b16-24_apr_2009-r1"; -- GitLab From ce6dbfc66ab93a2523e40c8b0537e910cd1e1953 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 4 Oct 2012 19:57:17 -0400 Subject: [PATCH 0832/5607] gnu-efi: Version 3.0r --- pkgs/development/libraries/gnu-efi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index c43e9f6b4da..731b44aa0ec 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation { - name = "gnu-efi-3.0p"; + name = "gnu-efi-3.0r"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0p.orig.tar.gz"; - sha256 = "1pm4wk1gma7mb8z19js7kb5y31a0zk308mkafmq6gb0b2a0i39cn"; + url = "mirror://sourceforge/gnu-efi/gnu-efi_3.0r.orig.tar.gz"; + sha256 = "1zi298wsg8v29xj4azcawqfjbxqi2w7l60agf7x2ph2lnqlga2v5"; }; meta = { -- GitLab From af045b4ee1fe1467c9112c0e5a6763a1c1d8fd94 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 4 Oct 2012 20:11:47 -0400 Subject: [PATCH 0833/5607] edk2: Bump version --- pkgs/development/compilers/edk2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 53517e853e9..9633967da6a 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -14,8 +14,8 @@ edk2 = stdenv.mkDerivation { src = fetchsvn { url = https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2; - rev = "13094"; - sha256 = "1qfpal0y4sas204ydg3pg3634dm25q1vr94mpgmbdh6yqcviah3h"; + rev = "13783"; + sha256 = "18sx0nwcnghij7737xdnmgwk5vm0ax4p0v3ybggqqs8cdhzfghil"; }; buildInputs = [ libuuid pythonFull ]; -- GitLab From 99f38ee7a5bc6e8da298f2aee5690e471992be00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Oct 2012 21:15:26 -0400 Subject: [PATCH 0834/5607] Flashplayer: add libXcursor to the RPATH This prevented Flash from working after the last update. --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 5feb1747e82..2eb34f68b8b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -11,8 +11,9 @@ , libX11 , libXext , libXrender +, libXcursor , libXt -, gtk +, gtk , glib , pango , cairo @@ -65,7 +66,7 @@ stdenv.mkDerivation { name = "flashplayer-${src.version}"; builder = ./builder.sh; - + src = fetchurl { inherit (src) url sha256; }; inherit zlib alsaLib; @@ -76,7 +77,7 @@ stdenv.mkDerivation { rpath = stdenv.lib.makeLibraryPath [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 - libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf + libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf ]; buildPhase = ":"; -- GitLab From bc9bff1da42f35afc982e66dd60b7c66263b32c4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Oct 2012 21:18:44 -0400 Subject: [PATCH 0835/5607] Remove obsolete versions of Flash --- .../mozilla-plugins/flashplayer-10/builder.sh | 23 ----- .../flashplayer-10/default.nix | 88 ------------------- .../mozilla-plugins/flashplayer-9/builder.sh | 14 --- .../mozilla-plugins/flashplayer-9/default.nix | 47 ---------- pkgs/top-level/all-packages.nix | 10 +-- 5 files changed, 1 insertion(+), 181 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh deleted file mode 100644 index b0f8a2638c1..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh +++ /dev/null @@ -1,23 +0,0 @@ -source $stdenv/setup - -dontStrip=1 -dontPatchELF=1 -sourceRoot=$TMPDIR - -unpackPhase() { - tar xvzf $src; - for a in *; do - if [ -d $a ]; then - cd $a - break - fi - done -} - -installPhase() { - mkdir -p $out/lib/mozilla/plugins - cp -pv libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix deleted file mode 100644 index ad6867ab5be..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv -, fetchurl -, zlib -, alsaLib -, curl -, nss -, nspr -, fontconfig -, freetype -, expat -, libX11 -, libXext -, libXrender -, libXt -, gtk -, glib -, pango -, cairo -, atk -, gdk_pixbuf -, debug ? false - -/* you have to add ~/mm.cfg : - - TraceOutputFileEnable=1 - ErrorReportingEnable=1 - MaxWarnings=1 - - in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt - Then FlashBug (a FireFox plugin) shows the log as well -*/ - -}: - -let - - src = - if stdenv.system == "x86_64-linux" then - if debug then - # no plans to provide a x86_64 version: - # http://labs.adobe.com/technologies/flashplayer10/faq.html - throw "no x86_64 debugging version available" - else { - # -> http://labs.adobe.com/downloads/flashplayer10.html - version = "10.3.181.34"; - url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz; - sha256 = "1w2zs2f0q1vpx4ia9pj1k4p830dwz7ypyn302mi48wcpz1wzc1gg"; - } - else if stdenv.system == "i686-linux" then - if debug then { - # The debug version also contains a player - version = "10.2_p2-debug-r092710"; - url = http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_debug_linux_092710.tar.gz; - sha256 = "11w3mxa39l4mnlsqzlwbdh1sald549afyqbx2kbid7in5qzamlcc"; - } else { - version = "10.3.183.10"; - url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; - sha256 = "0fj51dg0aa813b44yn8dvmmvw4qwi8vbi0x8n1bcqrcld3sbpmfz"; - } - else throw "Flash Player is not supported on this platform"; - -in - -stdenv.mkDerivation { - name = "flashplayer-${src.version}"; - - builder = ./builder.sh; - - src = fetchurl { inherit (src) url sha256; }; - - inherit zlib alsaLib; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = stdenv.lib.makeLibraryPath - [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11 - libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf - ]; - - buildPhase = ":"; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = http://www.adobe.com/products/flashplayer/; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh deleted file mode 100644 index 86ecd2c3345..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -source $stdenv/setup - -dontStrip=1 -dontPatchELF=1 - -sourceRoot=. - -installPhase() { - mkdir -p $out/lib/mozilla/plugins - cp -p libflashplayer.so $out/lib/mozilla/plugins - patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix deleted file mode 100644 index 913aa985583..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, fetchurl -, zlib -, alsaLib -, nss -, nspr -, fontconfig -, freetype -, expat -, libX11 -, libXext -, libXrender -, libXt -, gtk -, glib -, pango -, atk - -, customSrc ? null -}: - -assert stdenv.system == "i686-linux"; - -stdenv.mkDerivation { - name = "flashplayer-9.0.124.0"; - - builder = ./builder.sh; - src = if customSrc == null then - fetchurl { - url = http://download.macromedia.com/pub/flashplayer/installers/current/9/install_flash_player_9.tar.gz; - sha256 = "1cnsjgmy7rwj3spzb5mmpmvzxjp435jisl0dd8s4rf4xskyy6d6r"; - } - else customSrc; - - inherit zlib alsaLib; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - rpath = stdenv.lib.makeLibraryPath [zlib alsaLib nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ; - - meta = { - description = "Adobe Flash Player browser plugin"; - homepage = http://www.adobe.com/products/flashplayer/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e8a80a4cd0..bd554b7f1d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6962,15 +6962,7 @@ let flac = callPackage ../applications/audio/flac { }; - flashplayer = flashplayer11; - - flashplayer9 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { }; - - flashplayer10 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-10 { - debug = config.flashplayer.debug or false; - }; - - flashplayer11 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { + flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { debug = config.flashplayer.debug or false; # !!! Fix the dependency on two different builds of nss. }; -- GitLab From 22ece175a061e4b1323869007c550bfa02a7972a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 4 Oct 2012 23:32:34 -0700 Subject: [PATCH 0836/5607] - openttd 1.2.2, rili 2.0.1, widelands-build17, uqm-0.7.0 --- pkgs/games/openttd/default.nix | 21 +- pkgs/games/rili/default.nix | 24 ++ pkgs/games/rili/moderinze_cpp.patch | 391 ++++++++++++++++++ pkgs/games/uqm/default.nix | 71 ++++ .../boost_and_cmake_die_die_die.patch | 11 + pkgs/games/widelands/default.nix | 11 +- pkgs/top-level/all-packages.nix | 4 + 7 files changed, 523 insertions(+), 10 deletions(-) create mode 100644 pkgs/games/rili/default.nix create mode 100644 pkgs/games/rili/moderinze_cpp.patch create mode 100644 pkgs/games/uqm/default.nix create mode 100644 pkgs/games/widelands/boost_and_cmake_die_die_die.patch diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 66c296b487a..48782a60277 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -1,19 +1,28 @@ -{stdenv, fetchurl, SDL, libpng, zlib}: +{stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig}: stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "0.6.0"; + version = "1.2.2"; src = fetchurl { - url = "mirror://sf/openttd/${name}-source.tar.bz2"; - md5 = "dcf63687c73ff56887049fedaf6c6019"; + url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; + sha256 = "158znfx389bhs9gd2hadnbc2a32z4ma1vz8704cmw9yh0fmhbcap"; }; - buildInputs = [SDL libpng]; + buildInputs = [SDL libpng pkgconfig xz zlib freetype fontconfig]; prefixKey = "--prefix-dir="; - configureFlags = "--with-zlib=${zlib}/lib/libz.a"; + + configureFlags = '' + --with-zlib=${zlib}/lib/libz.a + --without-liblzo2 + ''; + makeFlags = "INSTALL_PERSONAL_DIR="; + postInstall = '' + mv $out/games/ $out/bin + ''; + meta = { description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".''; homepage = http://www.openttd.org/; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix new file mode 100644 index 00000000000..95878e2fa7f --- /dev/null +++ b/pkgs/games/rili/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl, SDL_mixer, SDL, autoconf, automake}: + +stdenv.mkDerivation { + name = "ri_li-2.0.1"; + + src = fetchurl { + url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2; + sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; + }; + + patches = [ ./moderinze_cpp.patch ]; + + preConfigure = '' + export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include" + ''; + + buildInputs = [SDL SDL_mixer autoconf automake]; + + meta = { + homepage = http://ri-li.sourceforge.net; + license = "GPL2+"; + description = "Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win."; + }; +} diff --git a/pkgs/games/rili/moderinze_cpp.patch b/pkgs/games/rili/moderinze_cpp.patch new file mode 100644 index 00000000000..3d076afb39e --- /dev/null +++ b/pkgs/games/rili/moderinze_cpp.patch @@ -0,0 +1,391 @@ +diff -r -u Ri-li-2.0.1.orig/src/audio.cc Ri-li-2.0.1/src/audio.cc +--- Ri-li-2.0.1.orig/src/audio.cc 2012-01-22 00:40:56.928609371 -0800 ++++ Ri-li-2.0.1/src/audio.cc 2012-01-22 00:28:33.360636539 -0800 +@@ -22,8 +22,8 @@ + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + #include +-#include +-#include ++#include ++#include + + #include "audio.h" + #include "utils.h" +@@ -57,7 +57,7 @@ + char PathFile[512]; + + if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) { +- cerr <<"Enable to init Sound card ! "< ++#include + #include + #include + #include +diff -r -u Ri-li-2.0.1.orig/src/editeur.cc Ri-li-2.0.1/src/editeur.cc +--- Ri-li-2.0.1.orig/src/editeur.cc 2007-11-02 04:48:17.000000000 -0700 ++++ Ri-li-2.0.1/src/editeur.cc 2012-01-22 00:28:59.632635579 -0800 +@@ -25,10 +25,10 @@ + #include + #endif + +-#include ++#include + #include + #include +-#include ++#include + #include + #include + +@@ -374,7 +374,7 @@ + + // Sauve le niveau + if(Niveau.Save()==false) { +- cerr <<"ERREUR Saving levels!"< + #endif + +-#include ++#include + #include + #include +-#include ++#include + #include + #include + +diff -r -u Ri-li-2.0.1.orig/src/loco.cc Ri-li-2.0.1/src/loco.cc +--- Ri-li-2.0.1.orig/src/loco.cc 2007-11-02 04:48:18.000000000 -0700 ++++ Ri-li-2.0.1/src/loco.cc 2012-01-22 00:14:17.878797797 -0800 +@@ -21,10 +21,10 @@ + // with this program; if not, write to the Free Software Foundation, Inc., + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-#include ++#include + #include + #include +-#include ++#include + #include + #include "preference.h" + #include "loco.h" +diff -r -u Ri-li-2.0.1.orig/src/main.cc Ri-li-2.0.1/src/main.cc +--- Ri-li-2.0.1.orig/src/main.cc 2007-11-02 04:48:19.000000000 -0700 ++++ Ri-li-2.0.1/src/main.cc 2012-01-22 00:29:40.080634136 -0800 +@@ -23,8 +23,8 @@ + + #include + #include +-#include +-#include ++#include ++#include + #include + #include + +@@ -115,7 +115,7 @@ + + // Initilise SDL + if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) { +- cerr <<"Impossible d'initialiser SDL:"<vfmt->BitsPerPixel==8) { +- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<vfmt->BitsPerPixel,vOption); + + if(sdlVideo==NULL) { +- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"< ++#include + #include + #include +-#include ++#include + #include "preference.h" + #include "menu.h" + #include "sprite.h" +@@ -92,7 +92,7 @@ + // Teste la resolution video + sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo(); + if(sdlVideoInfo->vfmt->BitsPerPixel==8) { +- cerr <<"Impossible d'utiliser 8bits pour la vidéo !"<vfmt->BitsPerPixel,vOption); + if(sdlVideo==NULL) { +- cerr <<"Impossible de passer dans le mode vidéo 800x600 !"< ++#include + #include + #include "mouse.h" + #include "preference.h" +diff -r -u Ri-li-2.0.1.orig/src/sprite.cc Ri-li-2.0.1/src/sprite.cc +--- Ri-li-2.0.1.orig/src/sprite.cc 2007-11-02 04:48:20.000000000 -0700 ++++ Ri-li-2.0.1/src/sprite.cc 2012-01-22 00:30:43.640631779 -0800 +@@ -21,10 +21,10 @@ + // with this program; if not, write to the Free Software Foundation, Inc., + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-#include ++#include + #include + #include +-#include ++#include + #include + #include "sprite.h" + #include "preference.h" +@@ -84,7 +84,7 @@ + strcpy(PathFile,Langue[Pref.Langue]); + GetPath(PathFile); + if(FileExiste(PathFile)==false) { +- cerr <<"Impossible de trouver "< ++#include + #include + #include + #include "preference.h" +diff -r -u Ri-li-2.0.1.orig/src/utils.cc Ri-li-2.0.1/src/utils.cc +--- Ri-li-2.0.1.orig/src/utils.cc 2007-11-02 04:48:22.000000000 -0700 ++++ Ri-li-2.0.1/src/utils.cc 2012-01-22 00:31:30.944630051 -0800 +@@ -21,10 +21,10 @@ + // with this program; if not, write to the Free Software Foundation, Inc., + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-#include ++#include + #include + #include +-#include ++#include + + #ifdef WINDOWS + #include +@@ -77,7 +77,7 @@ + + file=fopen(Path,"r"); + if(!file) { +- cerr <<"ERREUR: Impossible d'ouvrir '"<1024) { + AfficheChargeur(); + if( fread(Po,1,1024,file) != 1024 ) { +- cerr <<"ERREUR de lecture du fichier '"<512) { + if( fwrite(Buf,1,512,file) != 512 ) { +- cerr <<"ERREUR d'ecriture du fichier '"<0) { + if( fwrite(Buf,1,(size_t)L,file) != (size_t)L ) { +- cerr <<"ERREUR d'ecriture du fichier '"<> config.state + echo "INPUT_install_bindir_VALUE='$out/bin'" >> config.state + echo "INPUT_install_libdir_VALUE='$out/lib'" >> config.state + echo "INPUT_install_sharedir_VALUE='$out/share'" >> config.state + PREFIX=$out ./build.sh uqm config + ''; + + buildPhase = '' + ./build.sh uqm + ''; + + installPhase = '' + ./build.sh uqm install + sed -i $out/bin/uqm -e "s%/usr/local/games/%$out%g" + ''; + + meta = { + description = ''Urquan Masters is an open source clone of the Classic top-down space battle Star Cotnrol ''; + homepage = http://sc2.sourceforge.net/; + license = "GPLv2"; + }; +} diff --git a/pkgs/games/widelands/boost_and_cmake_die_die_die.patch b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch new file mode 100644 index 00000000000..f008be35e37 --- /dev/null +++ b/pkgs/games/widelands/boost_and_cmake_die_die_die.patch @@ -0,0 +1,11 @@ +--- widelands-build17-src.old/CMakeLists.txt 2012-04-23 02:46:49.000000000 -0700 ++++ widelands-build17-src/CMakeLists.txt 2012-07-14 19:49:14.000000000 -0700 +@@ -140,8 +140,6 @@ + else (WL_UNIT_TESTS) + message(STATUS "Disabled Unit Tests") + set (Boost_FIND_COMPONENTS signals) +- set (Boost_USE_STATIC_LIBS ON) +- set (Boost_USE_MULTITHREADED ON) + set (Boost_DETAILED_FAILURE_MSG ON) + find_package(Boost 1.35.0 COMPONENTS signals REQUIRED) + endif (WL_UNIT_TESTS) diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 74d1f87e0be..8f3270db481 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -13,11 +13,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="widelands"; - version="build16"; + version="build17"; name="${baseName}-${version}"; project="${baseName}"; - url="http://launchpad.net/${project}/${version}/${version}/+download/${name}-src.tar.bz2"; - hash="0pb2d73c6hynhp1x54rcfbibrrri7lyxjybd1hicn503qcakrnyq"; + url="https://launchpadlibrarian.net/102893896/widelands-build17-src.tar.bz2"; + hash="be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5"; }; in rec { @@ -30,7 +30,9 @@ rec { inherit buildInputs; /* doConfigure should be removed if not needed */ - phaseNames = ["killBuildDir" "doCmake" "doMakeInstall" "createScript"]; + phaseNames = ["killBuildDir" "doPatch" "doCmake" "doMakeInstall" "createScript"]; + + patches = [ ./boost_and_cmake_die_die_die.patch ]; killBuildDir = a.fullDepEntry '' rm -r build @@ -38,6 +40,7 @@ rec { cmakeFlags = [ "-DLUA_LIBRARIES=-llua" + "-DWL_PORTABLE=true" ]; createScript = a.fullDepEntry '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd554b7f1d1..0c0647c60f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8177,6 +8177,8 @@ let mygui = myguiSvn; }; + rili = callPackage ../games/rili { }; + rogue = callPackage ../games/rogue { }; sauerbraten = callPackage ../games/sauerbraten {}; @@ -8257,6 +8259,8 @@ let lua = lua5; }; + uqm = callPackage ../games/uqm { }; + urbanterror = callPackage ../games/urbanterror { }; ut2004demo = callPackage ../games/ut2004demo { }; -- GitLab From 27ec2773594b8f6aae88c6f73ebbd2725f443d4e Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 4 Oct 2012 23:39:00 -0700 Subject: [PATCH 0837/5607] - add myself as a maintainer for the packages I've added --- pkgs/games/openttd/default.nix | 1 + pkgs/games/rili/default.nix | 1 + pkgs/games/uqm/default.nix | 1 + pkgs/games/widelands/default.nix | 1 + pkgs/lib/maintainers.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 48782a60277..70b03a4e483 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".''; homepage = http://www.openttd.org/; license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 95878e2fa7f..b3563f42341 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = http://ri-li.sourceforge.net; license = "GPL2+"; description = "Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win."; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 3be95849e32..fd6d727e734 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { description = ''Urquan Masters is an open source clone of the Classic top-down space battle Star Cotnrol ''; homepage = http://sc2.sourceforge.net/; license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 8f3270db481..62ec56b2f7a 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -56,6 +56,7 @@ rec { maintainers = with a.lib.maintainers; [ raskin + jcumming ]; platforms = with a.lib.platforms; linux; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 127295a2feb..18671255fce 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -18,6 +18,7 @@ garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; + jcumming = "Jack Cummings "; kkallio = "Karn Kallio "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; -- GitLab From 8eb9491a22cd57415ba10470b7c7950e712ec4c0 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 00:09:49 -0700 Subject: [PATCH 0838/5607] - zfs-0.6.0-rc11, and spl-0.6.0-rc11 --- pkgs/lib/licenses.nix | 6 + pkgs/os-specific/linux/spl/default.nix | 39 +++++ .../linux/spl/install_prefix.patch | 19 +++ .../linux/spl/install_prefix_2.patch | 32 ++++ .../os-specific/linux/spl/module_prefix.patch | 33 +++++ pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 +++ pkgs/os-specific/linux/zfs/default.nix | 34 +++++ .../linux/zfs/kerneldir_path.patch | 140 ++++++++++++++++++ .../linux/zfs/module_perm_prefix.patch | 70 +++++++++ .../linux/zfs/mount_zfs_prefix.patch | 24 +++ .../zfs/no_absolute_paths_to_coreutils.patch | 25 ++++ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 +++ pkgs/top-level/all-packages.nix | 4 + 13 files changed, 473 insertions(+) create mode 100644 pkgs/os-specific/linux/spl/default.nix create mode 100644 pkgs/os-specific/linux/spl/install_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/install_prefix_2.patch create mode 100644 pkgs/os-specific/linux/spl/module_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix create mode 100644 pkgs/os-specific/linux/zfs/default.nix create mode 100644 pkgs/os-specific/linux/zfs/kerneldir_path.patch create mode 100644 pkgs/os-specific/linux/zfs/module_perm_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch create mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 87f9298706e..e1743bddf69 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -34,6 +34,12 @@ url = https://fedoraproject.org/wiki/Licensing/BSD; }; + cddl = { + shortName = "CDDL"; + fullName = "Common Development Distribution License "; + url = http://www.opensolaris.org/os/licensing/cddllicense.txt; + }; + cpl10 = { shortName = "CPL 1.0"; fullName = "Common Public License version 1.0"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix new file mode 100644 index 00000000000..96565fffa0e --- /dev/null +++ b/pkgs/os-specific/linux/spl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz; + sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g"; + }; + + patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel autoconf automake libtool ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + ./autogen.sh + + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod + + substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" + substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + ''; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch new file mode 100644 index 00000000000..9a7393b7170 --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -0,0 +1,19 @@ +*** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012 +--- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012 +*************** +*** 32,38 **** + if CONFIG_KERNEL + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + done +--- 32,38 ---- + if CONFIG_KERNEL + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + done diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch new file mode 100644 index 00000000000..6068ad1d69c --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix_2.patch @@ -0,0 +1,32 @@ +*** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012 +--- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012 +*************** +*** 16,22 **** + + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ + instfiles=`find . -name '*.h'`; \ + for instfile in $$instfiles; do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +--- 16,22 ---- + + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ + instfiles=`find . -name '*.h'`; \ + for instfile in $$instfiles; do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +*************** +*** 24,28 **** + + uninstall-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ + $(RM) -R $$instdest +--- 24,28 ---- + + uninstall-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ + $(RM) -R $$instdest diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch new file mode 100644 index 00000000000..dd40711ccdb --- /dev/null +++ b/pkgs/os-specific/linux/spl/module_prefix.patch @@ -0,0 +1,33 @@ +*** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969 +--- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012 +*************** +*** 17,30 **** + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=$(DESTDIR) \ + INSTALL_MOD_DIR=addon/spl $@ + @# Remove extraneous build products when packaging +! if [ -n "$(DESTDIR)" ]; then \ +! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi +--- 17,30 ---- + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=@prefix@ \ + INSTALL_MOD_DIR=addon/spl $@ + @# Remove extraneous build products when packaging +! if [ -n "@prefix@" ]; then \ +! find @prefix@/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix new file mode 100644 index 00000000000..c174daad26b --- /dev/null +++ b/pkgs/os-specific/linux/spl/spl-0.6.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, perl }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/spl.git; + rev = "dde6b7b137f56894a457"; + sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; + }; + + patches = [ ./install_prefix.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel linuxHeaders ]; + + configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" + "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix new file mode 100644 index 00000000000..43e7b2fd95d --- /dev/null +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, kernel, spl, perl, zlib, libuuid, coreutils, utillinux }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz; + sha256 = "0wx0srn2k31j9xdk3nvk7l847r0diyb7ph6hd006ax9l5p9zj0a7"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; + + buildInputs = [ kernel spl perl zlib libuuid coreutils ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + --with-spl=${spl}/libexec/spl/${kernel.version} + ''; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch new file mode 100644 index 00000000000..7deda946821 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/kerneldir_path.patch @@ -0,0 +1,140 @@ +diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in +*** zfs-0.6.0-rc10.old/Makefile.in Tue Aug 14 12:35:34 2012 +--- zfs-0.6.0-rc10/Makefile.in Fri Aug 17 15:21:18 2012 +*************** +*** 1121,1127 **** + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +--- 1121,1127 ---- + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in +*** zfs-0.6.0-rc10.old/include/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/Makefile.in Fri Aug 17 15:20:50 2012 +*************** +*** 402,408 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 402,408 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in +*** zfs-0.6.0-rc10.old/include/linux/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/linux/Makefile.in Fri Aug 17 15:20:53 2012 +*************** +*** 337,343 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 337,343 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/Makefile.in Fri Aug 17 15:20:57 2012 +*************** +*** 590,596 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 590,596 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/Makefile.in Fri Aug 17 15:21:00 2012 +*************** +*** 374,380 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 374,380 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in Fri Aug 17 15:21:03 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fs/Makefile.in Fri Aug 17 15:21:06 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch new file mode 100644 index 00000000000..07cd04d1dde --- /dev/null +++ b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch @@ -0,0 +1,70 @@ +*** git-export/module/Makefile.in.orig Wed Dec 31 16:00:01 1969 +--- git-export/module/Makefile.in Tue Mar 6 00:23:07 2012 +*************** +*** 11,19 **** + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ + "*** Missing spl symbols ensure you have built the spl:\n" \ +--- 11,21 ---- + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ +! chmod +w @SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ +! chmod +w @SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ + "*** Missing spl symbols ensure you have built the spl:\n" \ +*************** +*** 35,55 **** + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=$(DESTDIR) \ + INSTALL_MOD_DIR=addon/zfs $@ + @# Remove extraneous build products when packaging +! if [ -n "$(DESTDIR)" ]; then \ +! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs + + distdir: + +--- 37,57 ---- + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=@prefix@ \ + INSTALL_MOD_DIR=addon/zfs $@ + @# Remove extraneous build products when packaging +! if [ -n "@prefix@" ]; then \ +! find @prefix@/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! $(RM) -R @prefix@/lib/modules/@LINUX_VERSION@/addon/zfs + + distdir: + diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch new file mode 100644 index 00000000000..94710c5c985 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch @@ -0,0 +1,24 @@ +*** zfs-0.6.0-rc4.old/cmd/mount_zfs/Makefile.in Thu May 5 15:12:25 2011 +--- zfs-0.6.0-rc4/cmd/mount_zfs/Makefile.in Fri Jun 3 16:42:41 2011 +*************** +*** 285,296 **** + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! +! # +! # Ignore the prefix for the mount helper. It must be installed in /sbin/ +! # because this path is hardcoded in the mount(8) for security reasons. +! # +! sbindir = /sbin + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ +--- 285,291 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch new file mode 100644 index 00000000000..e223e34c3a4 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch @@ -0,0 +1,25 @@ +*** git-export/module/Makefile.in.old Tue Mar 6 01:04:48 2012 +--- git-export/module/Makefile.in Tue Mar 6 01:04:59 2012 +*************** +*** 11,20 **** + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ +--- 11,20 ---- + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix new file mode 100644 index 00000000000..1cc923f39d1 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/zfs.git; + rev = "3613204cd7e3ab1ae658"; + sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; + + buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; + + configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c0647c60f5..391ebadc6fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5964,6 +5964,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; + sysprof = callPackage ../development/tools/profiling/sysprof { inherit (gnome) libglade; }; @@ -5983,6 +5985,8 @@ let }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + + zfs = callPackage ../os-specific/linux/zfs/default.nix { }; }; # Build the kernel modules for the some of the kernels. -- GitLab From 65d3ef369e6657cc04dc1d9ac6d9837092b617aa Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 00:12:15 -0700 Subject: [PATCH 0839/5607] - remove old versions --- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 ------------------------ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 ----------------------- 2 files changed, 47 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix delete mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix deleted file mode 100644 index c174daad26b..00000000000 --- a/pkgs/os-specific/linux/spl/spl-0.6.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, perl }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/spl.git; - rev = "dde6b7b137f56894a457"; - sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; - }; - - patches = [ ./install_prefix.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel linuxHeaders ]; - - configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" - "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix deleted file mode 100644 index 1cc923f39d1..00000000000 --- a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/zfs.git; - rev = "3613204cd7e3ab1ae658"; - sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; - - buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; - - configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} -- GitLab From 172abb4b26e0453300fa873c5256f4b171258486 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Fri, 5 Oct 2012 03:24:09 +0200 Subject: [PATCH 0840/5607] Add a "smatch" package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cyril Roelandt Signed-off-by: Ludovic Courtès --- .../tools/analysis/smatch/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/tools/analysis/smatch/default.nix diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix new file mode 100644 index 00000000000..8b9deca409f --- /dev/null +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, sqlite, pkgconfig +, buildllvmsparse ? true +, buildc2xml ? true +, llvm ? null, libxml2 ? null +}: + +assert buildllvmsparse -> llvm != null; +assert buildc2xml -> libxml2 != null; + +stdenv.mkDerivation { + name = "smatch"; + + src = fetchgit { + url = git://repo.or.cz/smatch.git; + rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9"; + sha256 = "09a44967d4cff026c67062f778e251d0b432af132e9d59a47b7d3167f379adfa"; + }; + + buildInputs = [sqlite pkgconfig] + ++ stdenv.lib.optional buildllvmsparse llvm + ++ stdenv.lib.optional buildc2xml libxml2; + + installFlags = "DESTDIR=$(out)"; + + meta = { + description = "A semantic analysis tool for C"; + homepage = "http://smatch.sourceforge.net/"; + license = "free"; /* OSL, see http://www.opensource.org */ + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd554b7f1d1..d1b93ce496f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3200,6 +3200,11 @@ let sloccount = callPackage ../development/tools/misc/sloccount { }; + smatch = callPackage ../development/tools/analysis/smatch { + buildllvmsparse = false; + buildc2xml = false; + }; + sparse = callPackage ../development/tools/analysis/sparse { }; spin = callPackage ../development/tools/analysis/spin { }; -- GitLab From 80433442665e52a90663ba9a8f22f6247b689c36 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:07:11 -0700 Subject: [PATCH 0841/5607] Revert " - remove old versions" This reverts commit 65d3ef369e6657cc04dc1d9ac6d9837092b617aa. --- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 ++++++++++++++++++++++++ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 +++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix create mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix new file mode 100644 index 00000000000..c174daad26b --- /dev/null +++ b/pkgs/os-specific/linux/spl/spl-0.6.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, perl }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/spl.git; + rev = "dde6b7b137f56894a457"; + sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; + }; + + patches = [ ./install_prefix.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel linuxHeaders ]; + + configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" + "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix new file mode 100644 index 00000000000..1cc923f39d1 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/zfs.git; + rev = "3613204cd7e3ab1ae658"; + sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; + + buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; + + configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} -- GitLab From ccad09d3b9b80b41fd79b673ebede73444a9829c Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:07:33 -0700 Subject: [PATCH 0842/5607] Revert " - zfs-0.6.0-rc11, and spl-0.6.0-rc11" This reverts commit 8eb9491a22cd57415ba10470b7c7950e712ec4c0. --- pkgs/lib/licenses.nix | 6 - pkgs/os-specific/linux/spl/default.nix | 39 ----- .../linux/spl/install_prefix.patch | 19 --- .../linux/spl/install_prefix_2.patch | 32 ---- .../os-specific/linux/spl/module_prefix.patch | 33 ----- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 --- pkgs/os-specific/linux/zfs/default.nix | 34 ----- .../linux/zfs/kerneldir_path.patch | 140 ------------------ .../linux/zfs/module_perm_prefix.patch | 70 --------- .../linux/zfs/mount_zfs_prefix.patch | 24 --- .../zfs/no_absolute_paths_to_coreutils.patch | 25 ---- pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 --- pkgs/top-level/all-packages.nix | 4 - 13 files changed, 473 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/default.nix delete mode 100644 pkgs/os-specific/linux/spl/install_prefix.patch delete mode 100644 pkgs/os-specific/linux/spl/install_prefix_2.patch delete mode 100644 pkgs/os-specific/linux/spl/module_prefix.patch delete mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix delete mode 100644 pkgs/os-specific/linux/zfs/default.nix delete mode 100644 pkgs/os-specific/linux/zfs/kerneldir_path.patch delete mode 100644 pkgs/os-specific/linux/zfs/module_perm_prefix.patch delete mode 100644 pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch delete mode 100644 pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch delete mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index e1743bddf69..87f9298706e 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -34,12 +34,6 @@ url = https://fedoraproject.org/wiki/Licensing/BSD; }; - cddl = { - shortName = "CDDL"; - fullName = "Common Development Distribution License "; - url = http://www.opensolaris.org/os/licensing/cddllicense.txt; - }; - cpl10 = { shortName = "CPL 1.0"; fullName = "Common Public License version 1.0"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix deleted file mode 100644 index 96565fffa0e..00000000000 --- a/pkgs/os-specific/linux/spl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc11"; - src = fetchurl { - url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz; - sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g"; - }; - - patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel autoconf automake libtool ]; - - NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; - - preConfigure = '' - ./autogen.sh - - substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid - substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod - - substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" - substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" - ''; - - configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.version}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build - ''; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.cddl; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch deleted file mode 100644 index 9a7393b7170..00000000000 --- a/pkgs/os-specific/linux/spl/install_prefix.patch +++ /dev/null @@ -1,19 +0,0 @@ -*** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012 ---- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012 -*************** -*** 32,38 **** - if CONFIG_KERNEL - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - done ---- 32,38 ---- - if CONFIG_KERNEL - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - done diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch deleted file mode 100644 index 6068ad1d69c..00000000000 --- a/pkgs/os-specific/linux/spl/install_prefix_2.patch +++ /dev/null @@ -1,32 +0,0 @@ -*** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012 ---- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012 -*************** -*** 16,22 **** - - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - instfiles=`find . -name '*.h'`; \ - for instfile in $$instfiles; do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ ---- 16,22 ---- - - install-data-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - instfiles=`find . -name '*.h'`; \ - for instfile in $$instfiles; do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ -*************** -*** 24,28 **** - - uninstall-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ - $(RM) -R $$instdest ---- 24,28 ---- - - uninstall-local: - release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ -! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ - $(RM) -R $$instdest diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch deleted file mode 100644 index dd40711ccdb..00000000000 --- a/pkgs/os-specific/linux/spl/module_prefix.patch +++ /dev/null @@ -1,33 +0,0 @@ -*** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969 ---- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012 -*************** -*** 17,30 **** - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=$(DESTDIR) \ - INSTALL_MOD_DIR=addon/spl $@ - @# Remove extraneous build products when packaging -! if [ -n "$(DESTDIR)" ]; then \ -! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi ---- 17,30 ---- - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=@prefix@ \ - INSTALL_MOD_DIR=addon/spl $@ - @# Remove extraneous build products when packaging -! if [ -n "@prefix@" ]; then \ -! find @prefix@/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix deleted file mode 100644 index c174daad26b..00000000000 --- a/pkgs/os-specific/linux/spl/spl-0.6.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, perl }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/spl.git; - rev = "dde6b7b137f56894a457"; - sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; - }; - - patches = [ ./install_prefix.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel linuxHeaders ]; - - configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" - "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix deleted file mode 100644 index 43e7b2fd95d..00000000000 --- a/pkgs/os-specific/linux/zfs/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, kernel, spl, perl, zlib, libuuid, coreutils, utillinux }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc11"; - src = fetchurl { - url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz; - sha256 = "0wx0srn2k31j9xdk3nvk7l847r0diyb7ph6hd006ax9l5p9zj0a7"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; - - buildInputs = [ kernel spl perl zlib libuuid coreutils ]; - - NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; - - preConfigure = '' - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" - substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" - ''; - - configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.version}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build - --with-spl=${spl}/libexec/spl/${kernel.version} - ''; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.cddl; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch deleted file mode 100644 index 7deda946821..00000000000 --- a/pkgs/os-specific/linux/zfs/kerneldir_path.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in -*** zfs-0.6.0-rc10.old/Makefile.in Tue Aug 14 12:35:34 2012 ---- zfs-0.6.0-rc10/Makefile.in Fri Aug 17 15:21:18 2012 -*************** -*** 1121,1127 **** - - @CONFIG_KERNEL_TRUE@install-data-local: - @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ -! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ - @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - @CONFIG_KERNEL_TRUE@ done ---- 1121,1127 ---- - - @CONFIG_KERNEL_TRUE@install-data-local: - @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ -! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \ - @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ - @CONFIG_KERNEL_TRUE@ done -diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in -*** zfs-0.6.0-rc10.old/include/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/Makefile.in Fri Aug 17 15:20:50 2012 -*************** -*** 402,408 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 402,408 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION) - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in -*** zfs-0.6.0-rc10.old/include/linux/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/linux/Makefile.in Fri Aug 17 15:20:53 2012 -*************** -*** 337,343 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 337,343 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - -diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/Makefile.in Fri Aug 17 15:20:57 2012 -*************** -*** 590,596 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 590,596 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fm/Makefile.in Fri Aug 17 15:21:00 2012 -*************** -*** 374,380 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - ---- 374,380 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-recursive - -diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in Fri Aug 17 15:21:03 2012 -*************** -*** 332,338 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 332,338 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - -diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in -*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in Tue Aug 14 12:35:32 2012 ---- zfs-0.6.0-rc10/include/sys/fs/Makefile.in Fri Aug 17 15:21:06 2012 -*************** -*** 332,338 **** - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - ---- 332,338 ---- - EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) - @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs - @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) -! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs - @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) - all: all-am - diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch deleted file mode 100644 index 07cd04d1dde..00000000000 --- a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch +++ /dev/null @@ -1,70 +0,0 @@ -*** git-export/module/Makefile.in.orig Wed Dec 31 16:00:01 1969 ---- git-export/module/Makefile.in Tue Mar 6 00:23:07 2012 -*************** -*** 11,19 **** - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols ensure you have built the spl:\n" \ ---- 11,21 ---- - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ -! chmod +w @SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ -! chmod +w @SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols ensure you have built the spl:\n" \ -*************** -*** 35,55 **** - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=$(DESTDIR) \ - INSTALL_MOD_DIR=addon/zfs $@ - @# Remove extraneous build products when packaging -! if [ -n "$(DESTDIR)" ]; then \ -! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs - - distdir: - ---- 37,57 ---- - modules_install: - @# Install the kernel modules - $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ -! INSTALL_MOD_PATH=@prefix@ \ - INSTALL_MOD_DIR=addon/zfs $@ - @# Remove extraneous build products when packaging -! if [ -n "@prefix@" ]; then \ -! find @prefix@/lib/modules/@LINUX_VERSION@ \ - -name 'modules.*' | xargs $(RM); \ - fi -! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ - if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ - fi - - modules_uninstall: - @# Uninstall the kernel modules -! $(RM) -R @prefix@/lib/modules/@LINUX_VERSION@/addon/zfs - - distdir: - diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch deleted file mode 100644 index 94710c5c985..00000000000 --- a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch +++ /dev/null @@ -1,24 +0,0 @@ -*** zfs-0.6.0-rc4.old/cmd/mount_zfs/Makefile.in Thu May 5 15:12:25 2011 ---- zfs-0.6.0-rc4/cmd/mount_zfs/Makefile.in Fri Jun 3 16:42:41 2011 -*************** -*** 285,296 **** - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ -! -! # -! # Ignore the prefix for the mount helper. It must be installed in /sbin/ -! # because this path is hardcoded in the mount(8) for security reasons. -! # -! sbindir = /sbin - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ ---- 285,291 ---- - prefix = @prefix@ - program_transform_name = @program_transform_name@ - psdir = @psdir@ -! sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch deleted file mode 100644 index e223e34c3a4..00000000000 --- a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch +++ /dev/null @@ -1,25 +0,0 @@ -*** git-export/module/Makefile.in.old Tue Mar 6 01:04:48 2012 ---- git-export/module/Makefile.in Tue Mar 6 01:04:59 2012 -*************** -*** 11,20 **** - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ ---- 11,20 ---- - @# installed devel headers, or they may be in the module - @# subdirectory when building against the spl source tree. - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ -! cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ -! cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ - chmod +w @SPL_SYMBOLS@ .; \ - else \ - echo -e "\n" \ diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix deleted file mode 100644 index 1cc923f39d1..00000000000 --- a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/zfs.git; - rev = "3613204cd7e3ab1ae658"; - sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; - - buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; - - configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 391ebadc6fa..0c0647c60f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5964,8 +5964,6 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; - spl = callPackage ../os-specific/linux/spl/default.nix { }; - sysprof = callPackage ../development/tools/profiling/sysprof { inherit (gnome) libglade; }; @@ -5985,8 +5983,6 @@ let }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; - - zfs = callPackage ../os-specific/linux/zfs/default.nix { }; }; # Build the kernel modules for the some of the kernels. -- GitLab From e7f3ff803e15e7a65e4bcc0dec300e3b02233cfd Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:11:25 -0700 Subject: [PATCH 0843/5607] - zfs 0.6.0-rc11, spl 0.6.0-rc11 --- pkgs/lib/licenses.nix | 6 + pkgs/os-specific/linux/spl/default.nix | 39 +++++ .../linux/spl/install_prefix.patch | 19 +++ .../linux/spl/install_prefix_2.patch | 32 ++++ .../os-specific/linux/spl/module_prefix.patch | 33 +++++ pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 +++ pkgs/os-specific/linux/zfs/default.nix | 34 +++++ .../linux/zfs/kerneldir_path.patch | 140 ++++++++++++++++++ .../linux/zfs/module_perm_prefix.patch | 70 +++++++++ .../linux/zfs/mount_zfs_prefix.patch | 24 +++ .../zfs/no_absolute_paths_to_coreutils.patch | 25 ++++ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 +++ pkgs/top-level/all-packages.nix | 4 + 13 files changed, 473 insertions(+) create mode 100644 pkgs/os-specific/linux/spl/default.nix create mode 100644 pkgs/os-specific/linux/spl/install_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/install_prefix_2.patch create mode 100644 pkgs/os-specific/linux/spl/module_prefix.patch create mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix create mode 100644 pkgs/os-specific/linux/zfs/default.nix create mode 100644 pkgs/os-specific/linux/zfs/kerneldir_path.patch create mode 100644 pkgs/os-specific/linux/zfs/module_perm_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch create mode 100644 pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch create mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index 87f9298706e..e1743bddf69 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -34,6 +34,12 @@ url = https://fedoraproject.org/wiki/Licensing/BSD; }; + cddl = { + shortName = "CDDL"; + fullName = "Common Development Distribution License "; + url = http://www.opensolaris.org/os/licensing/cddllicense.txt; + }; + cpl10 = { shortName = "CPL 1.0"; fullName = "Common Public License version 1.0"; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix new file mode 100644 index 00000000000..96565fffa0e --- /dev/null +++ b/pkgs/os-specific/linux/spl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/spl/spl-0.6.0-rc11.tar.gz; + sha256 = "0brsrr9hvzlpx7a26nn8rw9k2kh9s75hmxp6h087hi64hzxysf8g"; + }; + + patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel autoconf automake libtool ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + ./autogen.sh + + substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid + substituteInPlace ./module/spl/spl-module.c --replace /bin/mknod mknod + + substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin" + substituteInPlace ./module/spl/spl-module.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + ''; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch new file mode 100644 index 00000000000..9a7393b7170 --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix.patch @@ -0,0 +1,19 @@ +*** spl-0.6.0-rc10/Makefile.am.old Fri Aug 17 14:49:16 2012 +--- spl-0.6.0-rc10/Makefile.am Fri Aug 17 14:51:06 2012 +*************** +*** 32,38 **** + if CONFIG_KERNEL + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + done +--- 32,38 ---- + if CONFIG_KERNEL + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ + for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + done diff --git a/pkgs/os-specific/linux/spl/install_prefix_2.patch b/pkgs/os-specific/linux/spl/install_prefix_2.patch new file mode 100644 index 00000000000..6068ad1d69c --- /dev/null +++ b/pkgs/os-specific/linux/spl/install_prefix_2.patch @@ -0,0 +1,32 @@ +*** git-export/include/Makefile.am Tue Mar 6 00:05:28 2012 +--- git-export/include/Makefile.am.new Tue Mar 6 00:04:46 2012 +*************** +*** 16,22 **** + + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ + instfiles=`find . -name '*.h'`; \ + for instfile in $$instfiles; do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +--- 16,22 ---- + + install-data-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ + instfiles=`find . -name '*.h'`; \ + for instfile in $$instfiles; do \ + $(INSTALL) -D $$instfile $$instdest/$$instfile; \ +*************** +*** 24,28 **** + + uninstall-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/usr/src/spl-$$release/$(LINUX_VERSION); \ + $(RM) -R $$instdest +--- 24,28 ---- + + uninstall-local: + release=$(SPL_META_VERSION)-$(SPL_META_RELEASE); \ +! instdest=$(DESTDIR)/@libexecdir@/spl/$(LINUX_VERSION); \ + $(RM) -R $$instdest diff --git a/pkgs/os-specific/linux/spl/module_prefix.patch b/pkgs/os-specific/linux/spl/module_prefix.patch new file mode 100644 index 00000000000..dd40711ccdb --- /dev/null +++ b/pkgs/os-specific/linux/spl/module_prefix.patch @@ -0,0 +1,33 @@ +*** git-export/module/Makefile.in Wed Dec 31 16:00:01 1969 +--- git-export/module/Makefile.in.new Sat Jan 28 21:42:06 2012 +*************** +*** 17,30 **** + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=$(DESTDIR) \ + INSTALL_MOD_DIR=addon/spl $@ + @# Remove extraneous build products when packaging +! if [ -n "$(DESTDIR)" ]; then \ +! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi +--- 17,30 ---- + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=@prefix@ \ + INSTALL_MOD_DIR=addon/spl $@ + @# Remove extraneous build products when packaging +! if [ -n "@prefix@" ]; then \ +! find @prefix@/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix new file mode 100644 index 00000000000..c174daad26b --- /dev/null +++ b/pkgs/os-specific/linux/spl/spl-0.6.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, perl }: + +stdenv.mkDerivation { + name = "spl-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/spl.git; + rev = "dde6b7b137f56894a457"; + sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; + }; + + patches = [ ./install_prefix.patch ./module_prefix.patch ]; + + buildInputs = [ perl kernel linuxHeaders ]; + + configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" + "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; + + meta = { + description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix new file mode 100644 index 00000000000..43e7b2fd95d --- /dev/null +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, kernel, spl, perl, zlib, libuuid, coreutils, utillinux }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc11"; + src = fetchurl { + url = http://github.com/downloads/zfsonlinux/zfs/zfs-0.6.0-rc11.tar.gz; + sha256 = "0wx0srn2k31j9xdk3nvk7l847r0diyb7ph6hd006ax9l5p9zj0a7"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; + + buildInputs = [ kernel spl perl zlib libuuid coreutils ]; + + NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + + preConfigure = '' + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" + substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + ''; + + configureFlags = '' + --with-linux=${kernel}/lib/modules/${kernel.version}/build + --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build + --with-spl=${spl}/libexec/spl/${kernel.version} + ''; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.cddl; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} diff --git a/pkgs/os-specific/linux/zfs/kerneldir_path.patch b/pkgs/os-specific/linux/zfs/kerneldir_path.patch new file mode 100644 index 00000000000..7deda946821 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/kerneldir_path.patch @@ -0,0 +1,140 @@ +diff -rc zfs-0.6.0-rc10.old/Makefile.in zfs-0.6.0-rc10/Makefile.in +*** zfs-0.6.0-rc10.old/Makefile.in Tue Aug 14 12:35:34 2012 +--- zfs-0.6.0-rc10/Makefile.in Fri Aug 17 15:21:18 2012 +*************** +*** 1121,1127 **** + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +--- 1121,1127 ---- + + @CONFIG_KERNEL_TRUE@install-data-local: + @CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \ +! @CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION); \ + @CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ + @CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \ + @CONFIG_KERNEL_TRUE@ done +diff -rc zfs-0.6.0-rc10.old/include/Makefile.in zfs-0.6.0-rc10/include/Makefile.in +*** zfs-0.6.0-rc10.old/include/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/Makefile.in Fri Aug 17 15:20:50 2012 +*************** +*** 402,408 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 402,408 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION) + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/linux/Makefile.in zfs-0.6.0-rc10/include/linux/Makefile.in +*** zfs-0.6.0-rc10.old/include/linux/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/linux/Makefile.in Fri Aug 17 15:20:53 2012 +*************** +*** 337,343 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 337,343 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/linux + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/linux + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/Makefile.in zfs-0.6.0-rc10/include/sys/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/Makefile.in Fri Aug 17 15:20:57 2012 +*************** +*** 590,596 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 590,596 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in zfs-0.6.0-rc10/include/sys/fm/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/Makefile.in Fri Aug 17 15:21:00 2012 +*************** +*** 374,380 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +--- 374,380 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-recursive + +diff -rc zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fm/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fm/fs/Makefile.in Fri Aug 17 15:21:03 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fm/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fm/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +diff -rc zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in zfs-0.6.0-rc10/include/sys/fs/Makefile.in +*** zfs-0.6.0-rc10.old/include/sys/fs/Makefile.in Tue Aug 14 12:35:32 2012 +--- zfs-0.6.0-rc10/include/sys/fs/Makefile.in Fri Aug 17 15:21:06 2012 +*************** +*** 332,338 **** + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE)/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + +--- 332,338 ---- + EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H) + @CONFIG_USER_TRUE@libzfsdir = $(includedir)/libzfs/sys/fs + @CONFIG_USER_TRUE@libzfs_HEADERS = $(COMMON_H) $(USER_H) +! @CONFIG_KERNEL_TRUE@kerneldir = $(DESTDIR)/@libexecdir@/zfs/$(LINUX_VERSION)/sys/fs + @CONFIG_KERNEL_TRUE@kernel_HEADERS = $(COMMON_H) $(KERNEL_H) + all: all-am + diff --git a/pkgs/os-specific/linux/zfs/module_perm_prefix.patch b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch new file mode 100644 index 00000000000..07cd04d1dde --- /dev/null +++ b/pkgs/os-specific/linux/zfs/module_perm_prefix.patch @@ -0,0 +1,70 @@ +*** git-export/module/Makefile.in.orig Wed Dec 31 16:00:01 1969 +--- git-export/module/Makefile.in Tue Mar 6 00:23:07 2012 +*************** +*** 11,19 **** + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ + "*** Missing spl symbols ensure you have built the spl:\n" \ +--- 11,21 ---- + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ +! chmod +w @SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ +! chmod +w @SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ + "*** Missing spl symbols ensure you have built the spl:\n" \ +*************** +*** 35,55 **** + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=$(DESTDIR) \ + INSTALL_MOD_DIR=addon/zfs $@ + @# Remove extraneous build products when packaging +! if [ -n "$(DESTDIR)" ]; then \ +! find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! $(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs + + distdir: + +--- 37,57 ---- + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ +! INSTALL_MOD_PATH=@prefix@ \ + INSTALL_MOD_DIR=addon/zfs $@ + @# Remove extraneous build products when packaging +! if [ -n "@prefix@" ]; then \ +! find @prefix@/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi +! sysmap=@prefix@/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi + + modules_uninstall: + @# Uninstall the kernel modules +! $(RM) -R @prefix@/lib/modules/@LINUX_VERSION@/addon/zfs + + distdir: + diff --git a/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch new file mode 100644 index 00000000000..94710c5c985 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/mount_zfs_prefix.patch @@ -0,0 +1,24 @@ +*** zfs-0.6.0-rc4.old/cmd/mount_zfs/Makefile.in Thu May 5 15:12:25 2011 +--- zfs-0.6.0-rc4/cmd/mount_zfs/Makefile.in Fri Jun 3 16:42:41 2011 +*************** +*** 285,296 **** + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! +! # +! # Ignore the prefix for the mount helper. It must be installed in /sbin/ +! # because this path is hardcoded in the mount(8) for security reasons. +! # +! sbindir = /sbin + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ +--- 285,291 ---- + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +! sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ diff --git a/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch new file mode 100644 index 00000000000..e223e34c3a4 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/no_absolute_paths_to_coreutils.patch @@ -0,0 +1,25 @@ +*** git-export/module/Makefile.in.old Tue Mar 6 01:04:48 2012 +--- git-export/module/Makefile.in Tue Mar 6 01:04:59 2012 +*************** +*** 11,20 **** + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! /bin/cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ +--- 11,20 ---- + @# installed devel headers, or they may be in the module + @# subdirectory when building against the spl source tree. + @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ +! cp -f @SPL_OBJ@/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ +! cp -f @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \ + chmod +w @SPL_SYMBOLS@ .; \ + else \ + echo -e "\n" \ diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix new file mode 100644 index 00000000000..1cc923f39d1 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: + +stdenv.mkDerivation { + name = "zfs-0.6.0-rc4"; + src = fetchgit { + url = git://github.com/behlendorf/zfs.git; + rev = "3613204cd7e3ab1ae658"; + sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; + }; + + patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; + + buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; + + configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; + + meta = { + description = "Native ZFS for Linux"; + homepage = http://zfsonlinux.org/; + license = "CDDL"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c0647c60f5..391ebadc6fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5964,6 +5964,8 @@ let perf = callPackage ../os-specific/linux/kernel/perf.nix { }; + spl = callPackage ../os-specific/linux/spl/default.nix { }; + sysprof = callPackage ../development/tools/profiling/sysprof { inherit (gnome) libglade; }; @@ -5983,6 +5985,8 @@ let }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + + zfs = callPackage ../os-specific/linux/zfs/default.nix { }; }; # Build the kernel modules for the some of the kernels. -- GitLab From 18d4a832b053067eb771d3f19e4116069c150033 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:36:36 -0700 Subject: [PATCH 0844/5607] - clean up openttd, rili, uqm, and widelands descriptions --- pkgs/games/openttd/default.nix | 10 ++++++++++ pkgs/games/rili/default.nix | 7 ++++++- pkgs/games/uqm/default.nix | 8 +++++++- pkgs/games/widelands/default.nix | 6 ++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 70b03a4e483..616adf00224 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -25,6 +25,16 @@ stdenv.mkDerivation rec { meta = { description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe".''; + longDescription = '' + OpenTTD is a transportation economics simulator. In single player mode, + players controll a transportation business, and use rail, road, sea, and air + transport to move goods and people around the simulated world. + + In multiplayer networked mode, players may: + - play competitively as different businesses + - play cooperatively controling the same business + - observe as spectators + ''; homepage = http://www.openttd.org/; license = "GPLv2"; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index b3563f42341..84bcf5efa7c 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -19,7 +19,12 @@ stdenv.mkDerivation { meta = { homepage = http://ri-li.sourceforge.net; license = "GPL2+"; - description = "Ri-li is an arcade game licensed under the GPL (General Public License). You drive a toy wood engine in many levels and you must collect all the coaches to win."; + description = "A children's train game"; + longDescription = '' + Ri-li is an arcade game licensed under the GPL (General Public License). +You drive a toy wood engine in many levels and you must collect all the coaches +to win. + ''; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index fd6d727e734..6e67ce660f1 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -64,7 +64,13 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''Urquan Masters is an open source clone of the Classic top-down space battle Star Cotnrol ''; + description = "Remake of Star Control II"; + longDescription = '' + The goals for the The Ur-Quan Masters project are: + - to bring Star Control II to modern platforms, thereby making a lot of people happy + - to make game translations easy, thereby making even more people happy + - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! + ''; homepage = http://sc2.sourceforge.net/; license = "GPLv2"; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 62ec56b2f7a..45538acdca3 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -53,6 +53,12 @@ rec { meta = { description = "Widelands RTS with multiple-goods economy"; + longDescription = '' + Widelands is a real time strategy game based on "The Settlers" and "The + Settlers II". It has a single player campaign mode, as well as a networked + multiplayer mode. + ''; + maintainers = with a.lib.maintainers; [ raskin -- GitLab From e23bda977de2cbf78240c2c54e07fb9a0830598a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 09:40:26 -0700 Subject: [PATCH 0845/5607] - removing old spl/zfs versions --- pkgs/os-specific/linux/spl/spl-0.6.0.nix | 24 ------------------------ pkgs/os-specific/linux/zfs/zfs-0.6.0.nix | 23 ----------------------- 2 files changed, 47 deletions(-) delete mode 100644 pkgs/os-specific/linux/spl/spl-0.6.0.nix delete mode 100644 pkgs/os-specific/linux/zfs/zfs-0.6.0.nix diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix deleted file mode 100644 index c174daad26b..00000000000 --- a/pkgs/os-specific/linux/spl/spl-0.6.0.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, perl }: - -stdenv.mkDerivation { - name = "spl-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/spl.git; - rev = "dde6b7b137f56894a457"; - sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b"; - }; - - patches = [ ./install_prefix.patch ./module_prefix.patch ]; - - buildInputs = [ perl kernel linuxHeaders ]; - - configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" - "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ]; - - meta = { - description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix deleted file mode 100644 index 1cc923f39d1..00000000000 --- a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }: - -stdenv.mkDerivation { - name = "zfs-0.6.0-rc4"; - src = fetchgit { - url = git://github.com/behlendorf/zfs.git; - rev = "3613204cd7e3ab1ae658"; - sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5"; - }; - - patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ]; - - buildInputs = [ kernel linuxHeaders spl perl zlib libuuid]; - - configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}"; - - meta = { - description = "Native ZFS for Linux"; - homepage = http://zfsonlinux.org/; - license = "CDDL"; - platforms = stdenv.lib.platforms.linux; - }; -} -- GitLab From 494fe12a301c43a0254facda35cca4f2de16586b Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 5 Oct 2012 16:52:58 +0000 Subject: [PATCH 0846/5607] Trying to improve xfce4 desktop --- pkgs/desktops/xfce-4.8/art/xfce4-themes.nix | 19 +++++++++++++++++++ pkgs/desktops/xfce-4.8/default.nix | 7 +++++++ .../panel-plugins/xfce4-cpufreq-plugin.nix | 18 ++++++++++++++++++ .../panel-plugins/xfce4-systemload-plugin.nix | 18 ++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/art/xfce4-themes.nix create mode 100644 pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix create mode 100644 pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix b/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix new file mode 100644 index 00000000000..b173d33780d --- /dev/null +++ b/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk }: + +stdenv.mkDerivation rec { + name = "xfwm4-themes-4.10.0"; + + src = fetchurl { + url = "http://archive.xfce.org/src/art/xfwm4-themes/4.10/${name}.tar.bz2"; + sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; + }; + + buildInputs = [ pkgconfig intltool gtk ]; + + meta = { + homepage = http://www.xfce.org/; + description = "Themes for Xfce"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; +} diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 8e6f7c10234..ab128577068 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -79,5 +79,12 @@ rec { #### ART xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; + xfce4themes = callPackage ./art/xfce4-themes.nix {}; + + + #### PANEL PLUGINS + + xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix {}; + xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix {}; } diff --git a/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix new file mode 100644 index 00000000000..c3f34219464 --- /dev/null +++ b/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-cpufreq-plugin.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}: + +stdenv.mkDerivation rec { + name = "xfce4-cpufreq-plugin-1.0.0"; + + src = fetchurl { + url = "http://archive.xfce.org/src/panel-plugins/xfce4-cpufreq-plugin/1.0/${name}.tar.bz2"; + sha256 = "0q2lj8a25iq9w3dynh6qvsmh19y1v7i82g46yza6gvw7fjcrmcz1"; + }; + + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + + meta = { + homepage = http://www.xfce.org/; + description = "CPU Freq load panel plugin for Xfce"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix new file mode 100644 index 00000000000..6d0f997500c --- /dev/null +++ b/pkgs/desktops/xfce-4.8/panel-plugins/xfce4-systemload-plugin.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, gtk}: + +stdenv.mkDerivation rec { + name = "xfce4-systemload-plugin-1.1.1"; + + src = fetchurl { + url = "http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.1/${name}.tar.bz2"; + sha256 = "1bnrr30h6kgb37ixcq7frx2gvj2p99bpa1jyzppwjxp5x7xkxh8s"; + }; + + buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel gtk ]; + + meta = { + homepage = http://www.xfce.org/; + description = "System load panel plugin for Xfce"; + platforms = stdenv.lib.platforms.linux; + }; +} -- GitLab From 4261b8a8ea011f7c2c4274622ebd70bb7c74cdb9 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 5 Oct 2012 17:02:38 +0000 Subject: [PATCH 0847/5607] Adding gigolo app --- pkgs/desktops/xfce-4.8/applications/gigolo.nix | 18 ++++++++++++++++++ pkgs/desktops/xfce-4.8/default.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/applications/gigolo.nix diff --git a/pkgs/desktops/xfce-4.8/applications/gigolo.nix b/pkgs/desktops/xfce-4.8/applications/gigolo.nix new file mode 100644 index 00000000000..1353546bcc1 --- /dev/null +++ b/pkgs/desktops/xfce-4.8/applications/gigolo.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs}: + +stdenv.mkDerivation rec { + name = "gigolo-0.4.1"; + + src = fetchurl { + url = "http://archive.xfce.org/src/apps/gigolo/0.4/${name}.tar.bz2"; + sha256 = "1y8p9bbv1a4qgbxl4vn6zbag3gb7gl8qj75cmhgrrw9zrvqbbww2"; + }; + + buildInputs = [ python gettext intltool gtk pkgconfig gvfs]; + + meta = { + homepage = http://goodies.xfce.org/projects/applications/gigolo; + description = "Gigolo is a frontend to easily manage connections to remote filesystems"; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index ab128577068..53b7c79fde6 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -67,6 +67,8 @@ rec { inherit (pkgs.gnome) vte; }; + gigolo = callPackage ./applications/gigolo.nix { }; + mousepad = callPackage ./applications/mousepad.nix { }; ristretto = callPackage ./applications/ristretto.nix { }; -- GitLab From e0be32f6760e26aab599a09ee2b4d71b4497f7e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Oct 2012 13:45:27 -0400 Subject: [PATCH 0848/5607] =?UTF-8?q?Add=20a=20function=20=E2=80=98getVers?= =?UTF-8?q?ion=E2=80=99=20to=20get=20the=20version=20of=20a=20derivation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/lib/strings.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index 4bd7a5bebde..19d1738182f 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -155,6 +155,12 @@ rec { # Return true iff string v1 denotes a version older than v2. versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; + + # Get the version of the specified derivation, as specified in its + # ‘name’ attribute. + getVersion = drv: (builtins.parseDrvName drv.name).version; + + # Extract name with version from URL. Ask for separator which is # supposed to start extension nameFromURL = url: sep: let -- GitLab From d73a3f618ab4e96096e3d80486136d48a4945342 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 5 Oct 2012 20:52:40 +0200 Subject: [PATCH 0849/5607] Adding xfce4 task manager --- .../applications/xfce4-taskmanager.nix | 18 ++++++++++++++++++ pkgs/desktops/xfce-4.8/default.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix diff --git a/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix new file mode 100644 index 00000000000..cffaa6bfe09 --- /dev/null +++ b/pkgs/desktops/xfce-4.8/applications/xfce4-taskmanager.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + name = "xfce4-taskmanager-1.0.0"; + + src = fetchurl { + url = "http://archive.xfce.org/src/apps/xfce4-taskmanager/1.0/${name}.tar.bz2"; + sha256 = "1vm9gw7j4ngjlpdhnwdf7ifx6xrrn21011almx2vwidhk2f9zvy0"; + }; + + buildInputs = [ intltool pkgconfig gtk ]; + + meta = { + homepage = http://goodies.xfce.org/projects/applications/xfce4-taskmanager; + description = "Easy to use task manager for XFCE"; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 53b7c79fde6..0788b00a2a0 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -77,6 +77,8 @@ rec { xfce4mixer = callPackage ./applications/xfce4-mixer.nix { }; + xfce4_taskmanager = callPackage ./applications/xfce4-taskmanager.nix { }; + #### ART -- GitLab From e8c4748cdba536f6c85e47dea207205795b4c4de Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Oct 2012 16:06:19 -0400 Subject: [PATCH 0850/5607] cabextract: Update to 1.4 --- pkgs/tools/archivers/cabextract/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index 9e11a1bf761..79be818bfb3 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cabextract-1.3"; + name = "cabextract-1.4"; + src = fetchurl { - url = meta.homepage + name + ".tar.gz"; - sha256 = "00f0qcrz9f2gwvm98qglbrjpwrzwrfdgh0hck6im93dl6lx3hr6l"; + url = "http://www.cabextract.org.uk/${name}.tar.gz"; + sha256 = "07p49053a727nwnw7vnx1bpj4xqa43cvx8mads2146fpqai8pfpp"; }; meta = { -- GitLab From d9c01ef51d5dd9ed9ce26de19ff94c0b2f70d243 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Oct 2012 16:06:35 -0400 Subject: [PATCH 0851/5607] p7zip: Update to 9.20.1 --- pkgs/tools/archivers/p7zip/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index bb9743e8e5d..767e85d6773 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "p7zip-9.13"; + name = "p7zip-9.20.1"; src = fetchurl { - url = mirror://sourceforge/p7zip/p7zip_9.13_src_all.tar.bz2; - sha256 = "08yr0cfbjx60r1ia7vhphzvc3gax62xhgsn3vdm7sdmxxai0z77w"; + url = mirror://sourceforge/p7zip/p7zip_9.20.1_src_all.tar.bz2; + sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9"; }; preConfigure = @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildFlags=all3 ''; + enableParallelBuilding = true; + meta = { homepage = http://p7zip.sourceforge.net/; description = "A port of the 7-zip archiver"; -- GitLab From 05d240ceda91df12a6967034df3caec618ce3fd3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Oct 2012 16:15:56 -0400 Subject: [PATCH 0852/5607] thunderbird: Update to 15.0.1 --- .../thunderbird/{11.x.nix => 15.x.nix} | 47 +++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 35 deletions(-) rename pkgs/applications/networking/mailreaders/thunderbird/{11.x.nix => 15.x.nix} (64%) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/15.x.nix similarity index 64% rename from pkgs/applications/networking/mailreaders/thunderbird/11.x.nix rename to pkgs/applications/networking/mailreaders/thunderbird/15.x.nix index 0d36bf88739..0deee99eadf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/15.x.nix @@ -2,6 +2,7 @@ , libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss , libnotify, cairo, pixman, fontconfig , libjpeg +, pythonPackages , # If you want the resulting program to call itself "Thunderbird" # instead of "Shredder", enable this option. However, those @@ -9,47 +10,26 @@ # Mozilla Foundation, see # http://www.mozilla.org/foundation/trademarks/. enableOfficialBranding ? false - }: -let version = "11.0.1"; - - # This patch may become necessary when we use a more recent version of libpng - # for now, it's actually not needed - # pngPatch = fetchurl { - # url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch; - # sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d"; - # }; -in +let version = "15.0.1"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/11.0.1/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3"; + url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + sha1 = "688bed2b48abda000b489f3c84de0ba9f93818f0"; }; enableParallelBuilding = true; buildInputs = [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr - libnotify cairo pixman fontconfig yasm mesa /* nss */ - libjpeg + libnotify cairo pixman fontconfig yasm mesa nss + libjpeg pythonPackages.sqlite3 ]; - # fix some paths in pngPatch - # prePatch = '' - # substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/" - # ''; - - patches = [ - # "png.patch" # produced by postUnpack - - # Fix weird dependencies such as a so file which depends on "-lpthread". - # ./thunderbird-build-deps.patch - ]; - configureFlags = [ "--enable-application=mail" "--enable-optimize" @@ -58,11 +38,13 @@ stdenv.mkDerivation { "--enable-strip" "--with-pthreads" "--with-system-jpeg" - # "--with-system-png" # png 1.5.x not merged in nixpkgs yet + #"--with-system-png" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - "--enable-system-cairo" + "--with-system-nss" + # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975 + #"--enable-system-cairo" "--disable-crashreporter" "--disable-necko-wifi" "--disable-webm" @@ -84,10 +66,7 @@ stdenv.mkDerivation { postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/lib/thunderbird-*/thunderbird \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" + rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl # Create a desktop item. mkdir -p $out/share/applications @@ -109,7 +88,7 @@ stdenv.mkDerivation { # Official branding implies thunderbird name and logo cannot be reuse, # see http://www.mozilla.org/foundation/licensing.html if enableOfficialBranding then licenses.proprietary else licenses.mpl11; - maintainers = with maintainers; [ pierron ]; - platforms = with platforms; linux; + maintainers = maintainers.pierron; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08c4de66b74..b91abcf900d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7754,7 +7754,7 @@ let thinkingRock = callPackage ../applications/misc/thinking-rock { }; - thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/11.x.nix { + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/15.x.nix { inherit (gnome) libIDL; }; -- GitLab From 29aa7abe870519b3ef12568c296dd035195328ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Oct 2012 16:15:56 -0400 Subject: [PATCH 0853/5607] thunderbird: Update to 15.0.1 --- .../thunderbird/{11.x.nix => 15.x.nix} | 47 +++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 35 deletions(-) rename pkgs/applications/networking/mailreaders/thunderbird/{11.x.nix => 15.x.nix} (64%) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/15.x.nix similarity index 64% rename from pkgs/applications/networking/mailreaders/thunderbird/11.x.nix rename to pkgs/applications/networking/mailreaders/thunderbird/15.x.nix index 0d36bf88739..0deee99eadf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/11.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/15.x.nix @@ -2,6 +2,7 @@ , libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss , libnotify, cairo, pixman, fontconfig , libjpeg +, pythonPackages , # If you want the resulting program to call itself "Thunderbird" # instead of "Shredder", enable this option. However, those @@ -9,47 +10,26 @@ # Mozilla Foundation, see # http://www.mozilla.org/foundation/trademarks/. enableOfficialBranding ? false - }: -let version = "11.0.1"; - - # This patch may become necessary when we use a more recent version of libpng - # for now, it's actually not needed - # pngPatch = fetchurl { - # url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch; - # sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d"; - # }; -in +let version = "15.0.1"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/11.0.1/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3"; + url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; + sha1 = "688bed2b48abda000b489f3c84de0ba9f93818f0"; }; enableParallelBuilding = true; buildInputs = [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr - libnotify cairo pixman fontconfig yasm mesa /* nss */ - libjpeg + libnotify cairo pixman fontconfig yasm mesa nss + libjpeg pythonPackages.sqlite3 ]; - # fix some paths in pngPatch - # prePatch = '' - # substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/" - # ''; - - patches = [ - # "png.patch" # produced by postUnpack - - # Fix weird dependencies such as a so file which depends on "-lpthread". - # ./thunderbird-build-deps.patch - ]; - configureFlags = [ "--enable-application=mail" "--enable-optimize" @@ -58,11 +38,13 @@ stdenv.mkDerivation { "--enable-strip" "--with-pthreads" "--with-system-jpeg" - # "--with-system-png" # png 1.5.x not merged in nixpkgs yet + #"--with-system-png" "--with-system-zlib" "--with-system-bz2" "--with-system-nspr" - "--enable-system-cairo" + "--with-system-nss" + # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975 + #"--enable-system-cairo" "--disable-crashreporter" "--disable-necko-wifi" "--disable-webm" @@ -84,10 +66,7 @@ stdenv.mkDerivation { postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/lib/thunderbird-*/thunderbird \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" + rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl # Create a desktop item. mkdir -p $out/share/applications @@ -109,7 +88,7 @@ stdenv.mkDerivation { # Official branding implies thunderbird name and logo cannot be reuse, # see http://www.mozilla.org/foundation/licensing.html if enableOfficialBranding then licenses.proprietary else licenses.mpl11; - maintainers = with maintainers; [ pierron ]; - platforms = with platforms; linux; + maintainers = maintainers.pierron; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1b93ce496f..5e45b644203 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7763,7 +7763,7 @@ let thinkingRock = callPackage ../applications/misc/thinking-rock { }; - thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/11.x.nix { + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/15.x.nix { inherit (gnome) libIDL; }; -- GitLab From 91d58edafc012223bcd86c4fa45231f7f3291a8a Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 13:52:54 -0700 Subject: [PATCH 0854/5607] - Make rili work with new autoconf versions --- pkgs/games/rili/default.nix | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 84bcf5efa7c..9d5764a6307 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -1,30 +1 @@ -{stdenv, fetchurl, SDL_mixer, SDL, autoconf, automake}: - -stdenv.mkDerivation { - name = "ri_li-2.0.1"; - - src = fetchurl { - url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2; - sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; - }; - - patches = [ ./moderinze_cpp.patch ]; - - preConfigure = '' - export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include" - ''; - - buildInputs = [SDL SDL_mixer autoconf automake]; - - meta = { - homepage = http://ri-li.sourceforge.net; - license = "GPL2+"; - description = "A children's train game"; - longDescription = '' - Ri-li is an arcade game licensed under the GPL (General Public License). -You drive a toy wood engine in many levels and you must collect all the coaches -to win. - ''; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; - }; -} +import ./pkgs/top-level/all-packages.nix -- GitLab From 66e43a52972dca165433860ba3734c6a2bfeb42b Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Fri, 5 Oct 2012 13:56:51 -0700 Subject: [PATCH 0855/5607] - Make rili work with new autoconf versions --- pkgs/games/rili/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index 84bcf5efa7c..934213279fa 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { preConfigure = '' export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include" + autoreconf -i ''; buildInputs = [SDL SDL_mixer autoconf automake]; -- GitLab From a4cd5afd0318ca8f9c653472b6ada664994da3cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Oct 2012 16:58:36 -0400 Subject: [PATCH 0856/5607] Fix "Failed to add path to set" error during nixos-rebuild --- pkgs/os-specific/linux/systemd/default.nix | 2 +- .../linux/systemd/ignore-duplicates.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/systemd/ignore-duplicates.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 9d67c5e2f72..36d341af5e6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; }; - patches = [ ./reexec.patch ]; + patches = [ ./reexec.patch ./ignore-duplicates.patch ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl diff --git a/pkgs/os-specific/linux/systemd/ignore-duplicates.patch b/pkgs/os-specific/linux/systemd/ignore-duplicates.patch new file mode 100644 index 00000000000..764eead54ea --- /dev/null +++ b/pkgs/os-specific/linux/systemd/ignore-duplicates.patch @@ -0,0 +1,20 @@ +Ignore duplicate paths in "systemctl start". + +diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c +index a4290c4..d3ac3ad 100644 +--- a/src/systemctl/systemctl.c ++++ b/src/systemctl/systemctl.c +@@ -1596,8 +1596,11 @@ static int start_unit_one( + + r = set_put(s, p); + if (r < 0) { +- log_error("Failed to add path to set."); +- return r; ++ free(p); ++ if (r != -EEXIST) { ++ log_error("Failed to add path %s to set.", p); ++ return r; ++ } + } + + p = NULL; -- GitLab From 90f1e5b6725d9cd1e1dea068451d147a610d12be Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 6 Oct 2012 22:42:06 +0400 Subject: [PATCH 0857/5607] Add V4L support to SANE --- pkgs/misc/sane-backends/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 31372aa8418..ac6fed5deb4 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null +{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null +, pkgconfig ? null , gt68xxFirmware ? null }: let firmware = gt68xxFirmware {inherit fetchurl;}; in assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); -stdenv.mkDerivation { - name = "sane-backends-1.0.22"; +stdenv.mkDerivation rec { + version = "1.0.23"; + name = "sane-backends-${version}"; src = fetchurl { - url = http://alioth.debian.org/frs/download.php/3503/sane-backends-1.0.22.tar.gz; - sha256 = "0m0cz4ljw9asqvpryl6gx1ndwf7ll2qinlvql9whnzs901la314z"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz"; + sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029"; }; udevSupport = hotplugSupport; - buildInputs = if libusb != null then [libusb] else []; + buildInputs = [] + ++ stdenv.lib.optional (libusb != null) libusb + ++ stdenv.lib.optional (libv4l != null) libv4l + ++ stdenv.lib.optional (pkgconfig != null) pkgconfig + ; postInstall = '' if test "$udevSupport" = "1"; then -- GitLab From 79fa3e218136b777c6498fe7915aa244979f739f Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 7 Oct 2012 07:15:03 +0200 Subject: [PATCH 0858/5607] pyaudio: New package, version 0.2.4. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ddc852ffa4a..e7ce262649e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1735,6 +1735,32 @@ let pythonPackages = python.modules // rec { }; }); + + pyaudio = pkgs.stdenv.mkDerivation rec { + name = "python-pyaudio-${version}"; + version = "0.2.4"; + + src = fetchurl { + url = "http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-${version}.tar.gz"; + md5 = "623809778f3d70254a25492bae63b575"; + }; + + buildInputs = [ python pkgs.portaudio ]; + + installPhase = '' + python setup.py install --prefix=$out + ''; + + doCheck = false; + + meta = { + description = "Python bindings for PortAudio"; + homepage = "http://people.csail.mit.edu/hubert/pyaudio/"; + license = stdenv.lib.licenses.mit; + }; + }; + + Babel = buildPythonPackage (rec { name = "Babel-0.9.6"; -- GitLab From e5239b78bdade58995b0741b82987fa0676da8c9 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 7 Oct 2012 11:18:25 +0200 Subject: [PATCH 0859/5607] neko: Rewrite package from scratch, version 1.8.2. This should simplify the input of the derivation builder significantly and of course we don't need to rely on mawercer.de to supply the needed files. Also, the derivation name doesn't include "-cvs" anymore, as we're building from the release tarball. In addition, we don't need the patch anymore, as it was so simple that it could be done easily with sed. Signed-off-by: aszlig --- pkgs/development/compilers/neko/default.nix | 93 +++++++------------ .../compilers/neko/disable-modules.patch | 59 ------------ 2 files changed, 33 insertions(+), 119 deletions(-) delete mode 100644 pkgs/development/compilers/neko/disable-modules.patch diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 28a98fe1e25..64e1741ae5c 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -1,69 +1,42 @@ -{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite -, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }: +{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre }: -let +stdenv.mkDerivation rec { + name = "neko-${version}"; + version = "1.8.2"; - inherit (composableDerivation) edf wwf; - - libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ]; - - includes = lib.concatMapStrings (x: ''"${x}/include",'' ) libs + ''"{gkt}/include/gtk-2.0",''; - -in - -composableDerivation.composableDerivation {} ( fixed : { - - name = "neko-cvs"; - - # REGION AUTO UPDATE: { name="neko"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko"; groups = "haxe_group"; } - src = sourceFromHead "neko-F_16-06-48.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; }); - # END + src = fetchurl { + url = "http://nekovm.org/_media/neko-${version}.tar.gz"; + sha256 = "099727w6dk689z3pcgbhsqjl74zzrh82a5vb2abxynamcqxcgz1w"; + }; - # optionally remove apache mysql like gentoo does? - # they just remove libs/{apache,mod_neko} - buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs; - # apr should be in apacheHttpd propagatedBuildInputs + prePatch = with stdenv.lib; let + libs = concatStringsSep "," (map (lib: "\"${lib}/include\"") buildInputs); + in '' + sed -i -e '/^search_includes/,/^}/c \ + search_includes = function(_) { return $array(${libs}) } + ' src/tools/install.neko + sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \ + vm/load.c + + for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do + sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \ + src/tools/install.neko + done + ''; - preConfigure = '' - sed -i \ - -e 's@"/usr/include",@${includes}@' \ - src/tools/install.neko - sed -i "s@/usr/local@$out@" Makefile vm/load.c - # make sure that nekotools boot finds the neko executable and not our wrapper: - mkdir -p $out/{bin,lib} + makeFlags = "INSTALL_PREFIX=$(out)"; + buildInputs = [ boehmgc zlib sqlite pcre ]; + dontStrip = true; - sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko - ln -s ./neko bin/.neko-wrapped + preInstall = '' + install -vd "$out/lib" "$out/bin" ''; - inherit zlib; - - meta = { - description = "Neko is an high-level dynamicly typed programming language"; + meta = { + description = "A high-level dynamically typed programming language"; homepage = http://nekovm.org; - license = ["GPLv2" ]; # -> docs/license.txt - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; - - # if stripping was done neko and nekoc would be the same. ?! - dontStrip = 1; - - # neko-wrapped: nekotools boot has to find it. So don't prefix wrapped executable by "." - postInstall = '' - for prog in nekotools nekoc; do - wrapProgram "$out/bin/$prog" \ - --prefix "LD_LIBRARY_PATH" $out/lib/neko - done - - wrapProgram "$out/bin/neko" \ - --prefix "LD_LIBRARY_PATH" $out/lib/neko - - # create symlink so that nekotools boot finds not wrapped neko-wrapped executable - ln -s ln -s ../../bin/.neko-wrapped $out/lib/neko - ''; - - # TODO make them optional and make them work - patches = [ ./disable-modules.patch ]; -}) +} diff --git a/pkgs/development/compilers/neko/disable-modules.patch b/pkgs/development/compilers/neko/disable-modules.patch deleted file mode 100644 index d4d5a8eb30e..00000000000 --- a/pkgs/development/compilers/neko/disable-modules.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/src/tools/install.neko b/src/tools/install.neko -index 4cffa5e..5702add 100644 ---- a/src/tools/install.neko -+++ b/src/tools/install.neko -@@ -39,26 +39,6 @@ buffer_string = $loader.loadprim("std@buffer_string",1); - // LIBS DATAS - - libs = { -- mod_neko => { -- src => $array("../../vm/stats","mod_neko","cgi"), -- inc => "httpd.h", -- incname => "Apache 1.3.x" -- }, -- mod_neko2 => { -- src => $array("../../vm/stats","mod_neko","cgi"), -- inc => $array("httpd.h","apr.h"), -- incname => "Apache 2.2.x", -- cflags => "-D_LARGEFILE64_SOURCE", -- realdir => "mod_neko", -- apache2 => true, -- }, -- mysql => { -- src => $array("mysql"), -- inc => "mysql.h", -- incname => "MySQL 4.+" -- lib => "libmysqlclient_r.a", -- lparams => "-lz -lssl" -- }, - mysql5 => { - src => $array("../common/sha1","../common/socket","my_proto/my_proto","my_proto/my_api","mysql"), - inc => $array(), -@@ -83,27 +63,6 @@ libs = { - incname => "Sqlite 3", - lparams => "-lsqlite3", - }, -- ui => { -- src => $array("ui"), -- inc => switch system { "Mac" => "Carbon.h" default => "gtk/gtk.h" }, -- incname => switch system { "Mac" => "Carbon" default => "GTK+2.0" }, -- cflags => switch system { "Mac" => "" default => "`pkg-config --cflags gtk+-2.0`" }, -- lparams => switch system { "Mac" => "-framework Carbon" default => "`pkg-config --libs gtk+-2.0` -lgthread-2.0" }, -- }, -- mod_tora => { -- src => $array("../common/socket","protocol","mod_tora"), -- inc => "httpd.h", -- incname => "Apache 1.3.x", -- cflags => "-I../common", -- }, -- mod_tora2 => { -- src => $array("../common/socket","protocol","mod_tora"), -- inc => $array("httpd.h","apr.h"), -- incname => "Apache 2.2.x", -- cflags => "-D_LARGEFILE64_SOURCE -I../common", -- realdir => "mod_tora", -- apache2 => true, -- }, - } - - // PLATFORM -- GitLab From 064cf682815e953b4f17d8400c9708bca7573137 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 7 Oct 2012 11:24:51 +0200 Subject: [PATCH 0860/5607] haxe: Rewrite package from scratch, version 2.10. As well as for neko, we now have way less cruft within the mkDerivation attribute set. We also now use make to build haxe, which will include haxelib and haxedoc as well. The main reason why I was doing this was because the package didn't build and still was referencing mawercer.de, which does not contain those tarballs anymore. Signed-off-by: aszlig --- pkgs/development/compilers/haxe/default.nix | 162 ++++---------------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 28 insertions(+), 140 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 8018b478e80..f7af2467e5f 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,141 +1,33 @@ -args: with args; +{ stdenv, fetchsvn, ocaml, zlib, neko }: -let +stdenv.mkDerivation { + name = "haxe-2.10"; - src_haxe_swflib = { - # REGION AUTO UPDATE: { name = "haxe_swflib"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/swflib"; groups = "haxe_group"; } - src = sourceFromHead "haxe_swflib-F_10-43-46.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_swflib-F_10-43-46.tar.gz"; sha256 = "a63de75e48bf500ef0e8ef715d178d32f0ef113ded8c21bbca698a8cc70e7b58"; }); - # END - }.src; + buildInputs = [ocaml zlib neko]; - src_haxe_extc = { - # REGION AUTO UPDATE: { name = "haxe_extc"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extc"; groups = "haxe_group"; } - src = sourceFromHead "haxe_extc-F_10-43-47.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extc-F_10-43-47.tar.gz"; sha256 = "d0a9980527d62ac6cfe27925ddb0964d334ec382f813fdfb8bd6c59fbbede730"; }); - # END - }.src; - - src_haxe_extlib_dev = { - # REGION AUTO UPDATE: { name = "haxe_extlib_dev"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/extlib-dev"; groups = "haxe_group"; } - src = sourceFromHead "haxe_extlib_dev-F_10-43-48.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_extlib_dev-F_10-43-48.tar.gz"; sha256 = "6b9037230e2615dd5e22f4e7f4165c84f2816bc526957683afc945394fcdf67e"; }); - # END - }.src; - - src_haxe_xml_light = { - # REGION AUTO UPDATE: { name = "haxe_xml_light"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "ocaml/xml-light"; groups = "haxe_group"; } - src = sourceFromHead "haxe_xml_light-F_10-43-48.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_xml_light-F_10-43-48.tar.gz"; sha256 = "be29d9e22ad0dbcb3d447cbbc14907aff5f89bb562b8db369659d299f3a5b44f"; }); - # END - }.src; - - src_haxe_neko_include = { - # REGION AUTO UPDATE: { name = "haxe_neko_include"; type="cvs"; cvsRoot = ":pserver:anonymous@cvs.motion-twin.com:/cvsroot"; module = "neko/libs/include/ocaml"; groups = "haxe_group"; } - src = sourceFromHead "haxe_neko_include-F_10-43-49.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe_neko_include-F_10-43-49.tar.gz"; sha256 = "e49efc1b348fa6e0f6fb40079a2d380b947d9ebda31843bc293f3cc77f8453db"; }); - # END - }.src; - - src_haxe = { - # REGION AUTO UPDATE: { name="haxe-read-only"; type="svn"; url="http://haxe.googlecode.com/svn/trunk"; groups = "haxe_group"; } - src = sourceFromHead "haxe-read-only-3220.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/haxe-read-only-3220.tar.gz"; sha256 = "2b6702dca95d0829e539cea07b8224e3848e584a425ce8f8e0984a7a2bf7b1f8"; }); - # END - }.src; - - - # the HaXe compiler - haxe = stdenv.mkDerivation { - name = "haxe-cvs"; - - buildInputs = [ocaml zlib makeWrapper]; - - src = src_haxe; - - inherit zlib; - - buildPhase = '' - set -x - mkdir -p ocaml/{swflib,extc,extlib-dev,xml-light} neko/libs - - # strange setup. install.ml seems to co the same repo again into haxe directory! - mkdir haxe - tar xfz $src --strip-components=1 -C haxe - - t(){ tar xfz $1 -C $2 --strip-components=2; } - t ${src_haxe_swflib} ocaml/swflib - t ${src_haxe_extc} ocaml/extc - t ${src_haxe_extlib_dev} ocaml/extlib-dev - t ${src_haxe_xml_light} ocaml/xml-light - t ${src_haxe_neko_include} neko/libs - - sed -e '/download();/d' \ - -e "s@/usr/lib/@''${zlib}/lib/@g" \ - doc/install.ml > install.ml - - ocaml install.ml - ''; - - # probably rpath should be set properly - installPhase = '' - mkdir -p $out/lib/haxe - cp -r bin $out/bin - wrapProgram "$out/bin/haxe" \ - --set "LD_LIBRARY_PATH" $zlib/lib \ - --set HAXE_LIBRARY_PATH "''${HAXE_LIBRARY_PATH}''${HAXE_LIBRARY_PATH:-:}:$out/lib/haxe/std:." - cp -r std $out/lib/haxe/ - ''; - - meta = { - description = "programming language targeting JavaScript, Flash, NekVM, PHP, C++"; - homepage = http://haxe.org; - license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; - }; - }; - - # build a tool found in std/tools/${name} source directory - # the .hxml files contain a recipe to cerate a binary. - tool = { name, description }: stdenv.mkDerivation { - - inherit name; - - src = src_haxe; - - buildPhase = '' - cd std/tools/${name}; - haxe *.hxml - mkdir -p $out/bin - mv ${name} $out/bin/ - ''; - - buildInputs = [haxe neko]; - - dontStrip=1; - - installPhase=":"; - - meta = { - inherit description; - homepage = http://haxe.org; - # license = "?"; TODO - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; - }; - - }; - -in - -{ - - inherit haxe; - - haxelib = tool { - name = "haxelib"; - description = "haxelib is a HaXe library management tool similar to easyinstall or ruby gems"; + src = fetchsvn { + url = "http://haxe.googlecode.com/svn/tags/v2-10"; + sha256 = "dbd3c655e4136eb68a165ef83b96bfc1f0f2eb9ec8729603b19bcd717a61a679"; }; + prePatch = '' + sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml + ''; + + installPhase = '' + install -vd "$out/bin" "$out/lib/haxe/std" + install -vt "$out/bin" haxe haxelib haxedoc + find std -mindepth 1 -maxdepth 1 -path std/tools -o \ + -exec cp -vr '{}' "$out/lib/haxe/std" \; + ''; + + dontStrip = true; + + meta = { + description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; + homepage = http://haxe.org; + license = ["GPLv2" "BSD2" /*?*/ ]; # -> docs/license.txt + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e45b644203..396f9fd9633 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2324,11 +2324,7 @@ let # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; - haxeDist = import ../development/compilers/haxe { - inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko; - }; - haxe = haxeDist.haxe; - haxelib = haxeDist.haxelib; + haxe = callPackage ../development/compilers/haxe { }; falcon = builderDefsPackage (import ../development/interpreters/falcon) { inherit cmake; -- GitLab From 08e025acab07aba03c9ab4ed3566a8b257306a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 5 Oct 2012 23:11:46 +0200 Subject: [PATCH 0861/5607] Adding Qt and GTK support to suil so that they can be used for the LV2 plugin GUIs --- pkgs/development/libraries/audio/suil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index a7300f541c4..9fa76f5b406 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }: +{ stdenv, fetchurl, gtk, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: stdenv.mkDerivation rec { name = "suil-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rqi16zqnaf30gr2gwb8wbhg8a2l3m5fllf7rabldmgj4b4jlyzp"; }; - buildInputs = [ lv2 pkgconfig python serd sord sratom ]; + buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; configurePhase = "python waf configure --prefix=$out"; -- GitLab From 2b31648deed18a7d558204205e0fd222ffbebb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 7 Oct 2012 13:46:16 +0200 Subject: [PATCH 0862/5607] Upgrading suil (LV2 plugin library) from 0.6.2 to 0.6.4 --- pkgs/development/libraries/audio/suil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 9fa76f5b406..0358e1c982c 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "suil-${version}"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1rqi16zqnaf30gr2gwb8wbhg8a2l3m5fllf7rabldmgj4b4jlyzp"; + sha256 = "12pz2w74rhhi6gsskfs6l71vw8qfz8906kbjf5w6jyy1x4kkdca2"; }; buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; -- GitLab From 25b4957e4aaaf1a341b683fc85f3ab6b89dd4d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 7 Oct 2012 13:51:39 +0200 Subject: [PATCH 0863/5607] Add the Distrho collection of audio plugins --- pkgs/applications/audio/distrho/default.nix | 58 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/audio/distrho/default.nix diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix new file mode 100644 index 00000000000..b51c97a6d68 --- /dev/null +++ b/pkgs/applications/audio/distrho/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio +, libxslt, lv2, pkgconfig, premake, xlibs }: + +let + rev = "7815b3545978e"; +in +stdenv.mkDerivation rec { + name = "distrho-${rev}"; + + src = fetchgit { + url = "git://distrho.git.sf.net/gitroot/distrho/distrho"; + inherit rev; + sha256 = "2e260f16ee67b1166c39e2d55c8dd5593902c8b3d8d86485545ef83139e1e844"; + }; + + patchPhase = '' + sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile + sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile + ''; + + buildInputs = [ + alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake + xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext + xlibs.libXinerama xlibs.libXrender + ]; + + buildPhase = '' + sh ./scripts/premake-update.sh linux + make standalone + make lv2 + + # generate lv2 ttl + sh scripts/generate-ttl.sh + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/standalone/* $out/bin/ + mkdir -p $out/lib/lv2 + cp -a bin/lv2/* $out/lib/lv2/ + ''; + + meta = with stdenv.lib; { + homepage = http://distrho.sourceforge.net; + description = "A collection of cross-platform audio effects and plugins"; + longDescription = '' + Includes: + 3BandEQ bitmangler drowaudio-distortion drowaudio-flanger + drowaudio-tremolo eqinox HybridReverb2 juce_pitcher sDelay + TAL-Filter TAL-NoiseMaker TAL-Reverb-2 TAL-Vocoder-2 ThePilgrim + Wolpertinger argotlunar capsaicin drowaudio-distortionshaper + drowaudio-reverb drumsynth highlife JuceDemoPlugin PingPongPan + TAL-Dub-3 TAL-Filter-2 TAL-Reverb TAL-Reverb-3 TheFunction vex + ''; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 396f9fd9633..57078ac3750 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6678,6 +6678,8 @@ let inherit (pkgs.gnome) libart_lgpl libgnomeui; }; + distrho = callPackage ../applications/audio/distrho {}; + djvulibre = callPackage ../applications/misc/djvulibre { }; djview = callPackage ../applications/graphics/djview { }; -- GitLab From 749cc2bf1e1a25d4b53d1f50450da130a4bfaee5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 7 Oct 2012 18:02:46 +0400 Subject: [PATCH 0864/5607] Adding Debian devscripts. Mostly for uscan. I plan to later use uscan for simplifying package updates in some NixPkgs packages. I have no code for that now. I added Perl packages File::DesktopEntry and File::BaseDir in a slightly hascky way because one part of the installation system replaced PREFIX= with --prefix= and the other complained that it doesn't know what to do with --prefix=. I checked that a script using File::DesktopEntry works, and I don't know enough Perl to rewrite buildPerlPackage and hope that my change is an improvement. I removed trnaslated manpages because it uses po4a which has some more Debian-specific dependencies of its own. --- pkgs/tools/misc/debian-devscripts/default.nix | 34 +++++++++++++++++++ .../tools/package-management/dpkg/default.nix | 17 +++++----- pkgs/top-level/all-packages.nix | 4 +++ pkgs/top-level/perl-packages.nix | 27 +++++++++++++++ 4 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/misc/debian-devscripts/default.nix diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix new file mode 100644 index 00000000000..693cf7c78bf --- /dev/null +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile + , FileDesktopEntry, libxslt, docbook_xsl, python, setuptools, makeWrapper +}: +stdenv.mkDerivation rec { + version = "2.12.4"; + name = "debian-devscripts-${version}"; + src = fetchurl { + url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.gz"; + sha256 = "34bcbec78bd4fe34d9f1326b9d1477ff2410e20e2dca6b7bfbf2bf92dbb83904"; + }; + buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile + FileDesktopEntry libxslt python setuptools makeWrapper ]; + preConfigure = '' + export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile + sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile + tgtpy="$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$tgtpy" + export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" + sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile* + sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* + ''; + postInstall = '' + for i in "$out/bin"/*; do + wrapProgram "$i" \ + --prefix PERL5LIB : "$PERL5LIB" \ + --prefix PERL5LIB : "$out/share/devscripts" + done + ''; + meta = { + description = ''Debian package maintenance scripts''; + license = "GPL (variuous)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... + }; +} diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 2ffacb08479..95682df5d39 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, perl, zlib, bzip2}: +{stdenv, fetchurl, perl, zlib, bzip2, xz}: -let version = "1.14.29"; in +let version = "1.16.8"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.gz"; - sha256 = "0cynms4vziy957r4zskybbid87sz99vrfy8d999vlhxgc74c2zpa"; + url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; + sha256 = "4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa"; }; - configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg"; + configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg "; preConfigure = '' # Can't use substitute pending resolution of NIXPKGS-89. @@ -24,11 +24,12 @@ stdenv.mkDerivation { chmod +x $TMPDIR/dpkg PATH=$TMPDIR:$PATH - substituteInPlace src/Makefile.in --replace "install-data-local:" "disabled:" - substituteInPlace dpkg-split/Makefile.in --replace "install-data-local:" "disabled:" + for i in $(find . -name Makefile.in); do + substituteInPlace $i --replace "install-data-local:" "disabled:" ; + done ''; - buildInputs = [ perl zlib bzip2 ]; + buildInputs = [ perl zlib bzip2 xz ]; meta = { description = "The Debian package manager"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57078ac3750..32fb0cb4675 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -587,6 +587,10 @@ let dcraw = callPackage ../tools/graphics/dcraw { }; + debian_devscripts = callPackage ../tools/misc/debian-devscripts { + inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry; + }; + debootstrap = callPackage ../tools/misc/debootstrap { }; detox = callPackage ../tools/misc/detox { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eeba996990d..0e1f11d0b8a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1578,6 +1578,19 @@ rec { }; }; + FileBaseDir = buildPerlPackage rec { + version = "0.03"; + name = "File-BaseDir-${version}"; + configurePhase = '' + preConfigure || true + perl Build.PL PREFIX="$out" prefix="$out" + ''; + src = fetchurl { + url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + sha256 = "0029cba7a3b5d8aa5f7d03cb1b7ba2bcf2829382f7f26aa3bee06fce8611a886"; + }; + }; + FileCopyRecursive = buildPerlPackage rec { name = "File-Copy-Recursive-0.38"; src = fetchurl { @@ -1586,6 +1599,20 @@ rec { }; }; + FileDesktopEntry = buildPerlPackage rec { + version = "0.04"; + name = "File-DesktopEntry-${version}"; + configurePhase = '' + preConfigure || true + perl Build.PL PREFIX="$out" prefix="$out" + ''; + src = fetchurl { + url = "mirror://cpan/modules/by-module/File/${name}.tar.gz"; + sha256 = "d7f80d8bd303651a43dc1810c73740d38a0d2b158fb33cd3b6ca4d3a566da7cb"; + }; + propagatedBuildInputs = [ FileBaseDir ]; + }; + FileFindRule = buildPerlPackage rec { name = "File-Find-Rule-0.32"; src = fetchurl { -- GitLab From 4454e45955e665f955e1176541bb8d195dfcb40c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 7 Oct 2012 19:21:35 +0400 Subject: [PATCH 0865/5607] Adding meta.maintainers --- pkgs/tools/misc/debian-devscripts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index 693cf7c78bf..e8a8abea91d 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { description = ''Debian package maintenance scripts''; - license = "GPL (variuous)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... + license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... + maintainers = with stdenv.lib.maintainers; [raskin]; }; } -- GitLab From f2e82a385e1e4cb508de1010673765d9aac0c3e9 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sun, 7 Oct 2012 17:52:43 +0200 Subject: [PATCH 0866/5607] Add jhc 0.8.0 --- pkgs/development/compilers/jhc/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/compilers/jhc/default.nix diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix new file mode 100644 index 00000000000..4b4d85df890 --- /dev/null +++ b/pkgs/development/compilers/jhc/default.nix @@ -0,0 +1,29 @@ +{ + stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl, + regexCompat, HsSyck, random +}: + +stdenv.mkDerivation rec { + + name = "jhc-${version}"; + + version = "0.8.0"; + + src = fetchurl { + url = "http://repetae.net/dist/${name}.tar.gz"; + sha256 = "0rbv0gpp7glhd9xqy7snbiaiizwnsfg9vzhvyywcvbmb35yivy2a"; + }; + + buildInputs = [ + perl ghc binary zlib utf8String readline fgl regexCompat HsSyck random + ]; + + meta = { + description = '' + A Haskell compiler which aims to produce the most efficient programs + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.aforemny ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e45b644203..c3f78360e11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2280,6 +2280,11 @@ let }; }; + jhc = callPackage ../development/compilers/jhc { + inherit (haskellPackages_ghc6123) ghc binary zlib utf8String readline fgl + regexCompat HsSyck random; + }; + # Haskell and GHC # Import Haskell infrastructure. -- GitLab From 2e7847cd12cbaf8abc32e1d53683700a8e97de22 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 7 Oct 2012 18:03:06 +0200 Subject: [PATCH 0867/5607] making ati dirvers compile again See comments on the nixos patch --- pkgs/os-specific/linux/ati-drivers/builder.sh | 23 +++++++++++++------ .../os-specific/linux/ati-drivers/default.nix | 13 +++++++++-- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index b05093d8915..abb78549cee 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -2,13 +2,14 @@ # TODO gentoo removes some tools because there are xorg sources (?) source $stdenv/setup +set -x die(){ echo $@; exit 1; } - # custom unpack: -cp $src archive -sh archive --extract . +unzip $src +run_file=$(echo amd-driver-installer-*) +sh $run_file --extract . kernelVersion=$(cd ${kernel}/lib/modules && ls) @@ -68,7 +69,7 @@ setModVersions(){ # On kernels with the fix, use arch_compat_alloc_user_space instead # of compat_alloc_user_space since the latter is GPL-only -COMPAT_ALLOC_USER_SPACE=compat_alloc_user_space +COMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space for src_file in \ $kernelBuild/arch/x86/include/asm/compat.h \ @@ -123,6 +124,8 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd + sed -i -e "s@COMPAT_ALLOC_USER_SPACE@$COMPAT_ALLOC_USER_SPACE@" ../kcl_ioctl.c + make CC=${CC} \ LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" | sed -e 's|^\([^/]\)|../\1|') \ MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions" \ @@ -143,12 +146,12 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" cp -r common/usr/share $out cp -r common/usr/X11R6 $out - cp -r arch/$arch/lib $out/lib + # cp -r arch/$arch/lib $out/lib # what are those files used for? cp -r common/etc $out - DIR_DEPENDING_ON_XORG_VERSION=x750_64a + DIR_DEPENDING_ON_XORG_VERSION=xpic_64a cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc @@ -164,12 +167,18 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri $out/lib cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so.* $out/lib + cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/fglrx/fglrx-libGL.so.1.2 $out/lib/fglrx-libGL.so.1.2 + cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib # cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1 - ln -s libGL.so.1.2 $out/lib/libGL.so.1 + ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so.1 + ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so + ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1 + # make xorg use the ati version + ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so} } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index a53058de6a0..49efcc1e76e 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -2,6 +2,7 @@ , mesa # for fgl_glxgears , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf +, unzip }: # If you want to use a different Xorg version probably @@ -16,6 +17,9 @@ # http://wiki.cchtml.com/index.php/Main_Page +# There is one issue left: +# /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so + assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { @@ -27,14 +31,19 @@ stdenv.mkDerivation rec { inherit libXxf86vm xf86vidmodeproto; src = fetchurl { - url = https://www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run; - sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr"; + url = http://www2.ati.com/drivers/linux/amd-driver-installer-12-8-x86.x86_64.zip; + sha256 = "0hdv89vdap6v0dnwhddizfmlkwyh0j910sp4wyj2lq5pn9rm2lk2"; + + # beta + # url = "http://www2.ati.com/drivers/beta/amd-driver-installer-12-9-beta-x86.x86_64.zip"; + # sha256 = "02dmflzfrgr07fa1hv34m7ad8pra21xv7qbk500gqm6v8s9vbplk"; }; buildInputs = [ xlibs.libXext xlibs.libX11 xlibs.libXrandr which imake makeWrapper patchelf + unzip ]; inherit kernel glibc /* glibc only used for setting interpreter */; -- GitLab From 08266083282728d8366493fd5843ca3e262b7d6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 7 Oct 2012 18:55:07 +0200 Subject: [PATCH 0868/5607] spamassassin: don't pass 'IOSocketInet6' Adding that package as a build input makes SpamAssassin print "function re-defined" warnings at run-time. --- pkgs/servers/mail/spamassassin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 0e623f7ac04..dc316267e6c 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, LWP, IOSocketSSL, IOSocketInet6, makeWrapper, gnupg1 +, HTTPDate, MailDKIM, LWP, IOSocketSSL, makeWrapper, gnupg1 }: # TODO: Add the Perl modules ... @@ -21,7 +21,7 @@ buildPerlPackage rec { }; buildInputs = [ makeWrapper HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM - LWP IOSocketSSL IOSocketInet6 ]; + LWP IOSocketSSL ]; # Enabling 'taint' mode is desirable, but that flag disables support # for the PERL5LIB environment variable. Needs further investigation. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32fb0cb4675..28848c19168 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5449,7 +5449,7 @@ let spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile - HTTPDate MailDKIM LWP IOSocketSSL IOSocketInet6; + HTTPDate MailDKIM LWP IOSocketSSL; }; samba = callPackage ../servers/samba { }; -- GitLab From a570a4c9ed9e703a4dffbe9a9153c222ab4403f7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sun, 7 Oct 2012 19:21:02 +0200 Subject: [PATCH 0869/5607] opera: Update to version 12.02 --- .../applications/networking/browsers/opera/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 8c3cd9f11cd..ba052738ad5 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { - name = "opera-12.00-1467"; + name = "opera-12.02-1578"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "${mirror}/linux/1200/${name}.i386.linux.tar.xz"; - sha256 = "d5683f5a4cf0cfd9ce715359b77909c7923c85bcec98513907c1844285356fdc"; + url = "${mirror}/linux/1202/${name}.i386.linux.tar.xz"; + sha256 = "60ccef14673818a8690fe3b76f861d180e2d8d3b87513b1652e6117c6dff3e86"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "${mirror}/linux/1200/${name}.x86_64.linux.tar.xz"; - sha256 = "7c3dbe122b1fd20123f1b48a420dea080cc24ede4183d47d66b383c2b7ca5051"; + url = "${mirror}/linux/1202/${name}.x86_64.linux.tar.xz"; + sha256 = "e861f14b984898b5a2c0d04915e515a5677152dc302b614a3ac1bb13da7a9b81"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; -- GitLab From d72adde5307cb26f0c307575b8a58189d49bd9c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 7 Oct 2012 00:25:38 -0400 Subject: [PATCH 0870/5607] Add nss-myhostname --- .../networking/nss-myhostname/default.nix | 19 +++++++++++++++++++ .../ignore-ipv6-link-local.patch | 13 +++++++++++++ .../nss-myhostname/nscd-segfault.patch | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 49 insertions(+) create mode 100644 pkgs/tools/networking/nss-myhostname/default.nix create mode 100644 pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch create mode 100644 pkgs/tools/networking/nss-myhostname/nscd-segfault.patch diff --git a/pkgs/tools/networking/nss-myhostname/default.nix b/pkgs/tools/networking/nss-myhostname/default.nix new file mode 100644 index 00000000000..80296b0d992 --- /dev/null +++ b/pkgs/tools/networking/nss-myhostname/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "nss-myhostname-0.3"; + + src = fetchurl { + url = "http://0pointer.de/lennart/projects/nss-myhostname/${name}.tar.gz"; + sha256 = "1wnawxklsv3z796l752j7a21gvj2615fk12qr1bir3apipm499rb"; + }; + + patches = [ ./nscd-segfault.patch ./ignore-ipv6-link-local.patch ]; + + meta = { + description = "Name Service Switch module ensuring that the hostname always resolves to a valid address"; + homepage = http://0pointer.de/lennart/projects/nss-myhostname/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch b/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch new file mode 100644 index 00000000000..396bb2e10cc --- /dev/null +++ b/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch @@ -0,0 +1,13 @@ +--- nss-myhostname-0.3/netlink.c 2011-05-09 08:56:34.344579140 -0400 ++++ nss-myhostname-0.3-new/netlink.c 2012-10-06 23:52:10.577755588 -0400 +@@ -179,6 +179,10 @@ + ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE) + continue; + ++ if (ifaddrmsg->ifa_family == AF_INET6 && ++ ifaddrmsg->ifa_scope == RT_SCOPE_LINK) ++ continue; ++ + if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED) + continue; + diff --git a/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch b/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch new file mode 100644 index 00000000000..a2947461c87 --- /dev/null +++ b/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch @@ -0,0 +1,15 @@ +--- nss-myhostname-0.3/nss-myhostname.c 2011-05-09 09:01:27.421581560 -0400 ++++ nss-myhostname-0.3-new/nss-myhostname.c 2012-10-06 23:40:09.836894004 -0400 +@@ -177,7 +177,11 @@ + /* Verify the size matches */ + assert(idx == ms); + +- *pat = r_tuple_prev; ++ /* Nscd expects us to store the first record in **pat. */ ++ if (*pat) ++ **pat = *r_tuple_prev; ++ else ++ *pat = r_tuple_prev; + + if (ttlp) + *ttlp = 0; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28848c19168..5a5fc5e2fb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1165,6 +1165,8 @@ let inherit (pythonPackages) pysqlite; }; + nss_myhostname = callPackage ../tools/networking/nss-myhostname {}; + nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; -- GitLab From aaebab484b26c2cad4fc34a1ee66b7c25deddac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 7 Oct 2012 22:28:45 +0200 Subject: [PATCH 0871/5607] Disable the debug option for FFADO The debug option is enabled by default and causes performance and stability issues --- pkgs/os-specific/linux/ffado/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 1803a201aff..834f98960df 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR buildPhase = '' export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages - scons PYPKGDIR=$out/$PYLIBSUFFIX + scons PYPKGDIR=$out/$PYLIBSUFFIX DEBUG=False sed -e "s#/usr/local#$out#" -i support/mixer-qt4/ffado/config.py ''; -- GitLab From df5abaf8b48ae89b0caa8e546119d523a1bd3571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 7 Oct 2012 22:30:47 +0200 Subject: [PATCH 0872/5607] Update the calf plugin pack to 0.0.19-rc7 This is a significant update with loads of new features, plugins and GUIs --- pkgs/applications/audio/calf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 4b1f6dcd268..fb697678ba2 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, cairo, expat, glib, gtk, jackaudio, ladspaH +{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; - version = "0.0.18.6"; + version = "0.0.19-rc7"; src = fetchurl { url = "mirror://sourceforge/calf/${name}.tar.gz"; - sha256 = "03w6jjkrr6w8da6qzd0x4dlkg295c6jxby500x4cj07wpbpk6irh"; + sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j"; }; buildInputs = - [ cairo jackaudio gtk glib expat libglade ladspaH lv2 pkgconfig ]; + [ cairo jackaudio fftwSinglePrec fluidsynth gtk glib expat libglade ladspaH lv2 pkgconfig ]; meta = with stdenv.lib; { homepage = http://calf.sourceforge.net; -- GitLab From fc817640e5c2623f26a0e6e8207c91ac247b876a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 7 Oct 2012 22:33:20 +0200 Subject: [PATCH 0873/5607] Tidy up the expression for the Calf audio plugin pack --- pkgs/applications/audio/calf/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index fb697678ba2..bc7b3c57e60 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib, gtk, jackaudio, ladspaH -, libglade, lv2, pkgconfig }: +{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib +, gtk, jackaudio, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; @@ -10,13 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0515pzc7ishrq0j5hza83s0yp3x34r977h776lpky389whcyf45j"; }; - buildInputs = - [ cairo jackaudio fftwSinglePrec fluidsynth gtk glib expat libglade ladspaH lv2 pkgconfig ]; + buildInputs = [ + cairo expat fftwSinglePrec fluidsynth glib gtk jackaudio ladspaH + libglade 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 ]; + platforms = platforms.linux; }; } -- GitLab From 026dd8b6f226386c489f53f9313f9445ac4dd721 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 7 Oct 2012 16:54:02 -0400 Subject: [PATCH 0874/5607] rEFInd: 0.4.5 --- pkgs/tools/misc/refind/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/refind/default.nix b/pkgs/tools/misc/refind/default.nix index bd0a7040adf..1fbb177afa0 100644 --- a/pkgs/tools/misc/refind/default.nix +++ b/pkgs/tools/misc/refind/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, gnu_efi, unzip }: -let version = "0.2.3"; in +let version = "0.4.5"; in stdenv.mkDerivation { name = "refind-${version}"; src = fetchurl { url = "mirror://sourceforge/refind/refind-src-${version}.zip"; - sha256 = "0q3p4mczr6wchk4vbgsb0cq7829vk3b3kg9qaizrb02pdak3s2nf"; + sha256 = "05nbalsl5csgph0v2amzgay9k2vzm47z8n1n6blbh9hvb7j5vn2c"; }; buildInputs = [ unzip ]; - buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" ]; + buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" "LOCAL_CFLAGS=-I${gnu_efi}/include" ]; installPhase = '' mkdir -pv $out - install -v -m644 refind/refind.efi refind.conf-sample $out + install -v -m644 refind/refind*.efi refind.conf-sample $out mv -v icons $out ''; -- GitLab From 65358fad8ce2d86f28f7ec485b30ad30b5c9badd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 7 Oct 2012 13:52:51 +0200 Subject: [PATCH 0875/5607] Upgrade libraw1394 to 2.1.0 --- pkgs/development/libraries/libraw1394/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix index 2ca4d1bd090..81cac5be709 100644 --- a/pkgs/development/libraries/libraw1394/default.nix +++ b/pkgs/development/libraries/libraw1394/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libraw1394-2.0.8"; + name = "libraw1394-2.1.0"; src = fetchurl { url = "mirror://kernel/linux/libs/ieee1394/${name}.tar.gz"; - sha256 = "0cwd8xn7wsm7nddbz7xgynxcjb1m4v2vjw1ky4dd6r5cv454hslk"; + sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58"; }; meta = { -- GitLab From c585be861961563db74f035a981d32330eb001bf Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 7 Oct 2012 23:10:42 +0200 Subject: [PATCH 0876/5607] neko: Correctly set 64bit mode in build. Neko seems to think it is running in 32bit, even though it is compiled for 64bit. The fix is included in 1.8.3, which is not yet released as of now, so we add a temporary fix until the release. Signed-off-by: aszlig --- pkgs/development/compilers/neko/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 64e1741ae5c..ddeeb51c25e 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { ' src/tools/install.neko sed -i -e '/allocated = strdup/s|"[^"]*"|"'"$out/lib/neko:$out/bin"'"|' \ vm/load.c + # temporarily, fixed in 1.8.3 + sed -i -e 's/^#if defined(_64BITS)/& || defined(__x86_64__)/' vm/neko.h for disabled_mod in mod_neko{,2} mod_tora{,2} mysql ui; do sed -i -e '/^libs/,/^}/{/^\s*'"$disabled_mod"'\s*=>/,/^\s*}/d}' \ -- GitLab From 529fee610b977d0fbf367753b6ee05a100fb4892 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 7 Oct 2012 18:22:30 -0400 Subject: [PATCH 0877/5607] libicns: Bump --- pkgs/development/libraries/libicns/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 0e582c903c5..970a7a87497 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng, jasper }: -stdenv.mkDerivation { - name = "libicns-0.8.0"; +stdenv.mkDerivation rec { + name = "libicns-0.8.1"; src = fetchurl { - url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz; - sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla"; + url = "mirror://sourceforge/icns/${name}.tar.gz"; + sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk"; }; buildInputs = [ libpng jasper ]; -- GitLab From c6c701909123bb3ee593a96b5a18ee39d8aa30e8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 02:20:32 +0200 Subject: [PATCH 0878/5607] haxe: Remove build files of haxelib/haxedoc early. Previously, we installed std by omitting the tools directory. Now, there are occasions where you actually want to use things like tools.haxelib from within your project, for example to create something that interfaces with the haxelib API. So we now just remove all files in there that were created during the main build in postBuild. Signed-off-by: aszlig --- pkgs/development/compilers/haxe/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index f7af2467e5f..817e4573df2 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -14,11 +14,15 @@ stdenv.mkDerivation { sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml ''; + postBuild = '' + find std/tools -name '*.n' -delete + rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib + ''; + installPhase = '' install -vd "$out/bin" "$out/lib/haxe/std" install -vt "$out/bin" haxe haxelib haxedoc - find std -mindepth 1 -maxdepth 1 -path std/tools -o \ - -exec cp -vr '{}' "$out/lib/haxe/std" \; + cp -vr std "$out/lib/haxe" ''; dontStrip = true; -- GitLab From 5a6fd3d51042a16ae4042bafcdce976c9b26eae3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 7 Oct 2012 23:25:11 -0400 Subject: [PATCH 0879/5607] llvm: Bump to 3.1 --- pkgs/development/compilers/llvm/3.1.nix | 27 --------------------- pkgs/development/compilers/llvm/default.nix | 12 ++++----- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/compilers/llvm/3.1.nix diff --git a/pkgs/development/compilers/llvm/3.1.nix b/pkgs/development/compilers/llvm/3.1.nix deleted file mode 100644 index 204c080b871..00000000000 --- a/pkgs/development/compilers/llvm/3.1.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python }: - -let version = "3.1"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; - }; - - buildInputs = [ perl groff cmake python ]; - - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 0fb1cf82cc2..204c080b871 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, perl, groff, cmake }: +{ stdenv, fetchurl, perl, groff, cmake, python }: -let version = "3.0"; in +let version = "3.1"; in stdenv.mkDerivation { name = "llvm-${version}"; src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz"; - sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji"; + url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; + sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; }; - buildInputs = [ perl groff cmake ]; + buildInputs = [ perl groff cmake python ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation { homepage = http://llvm.org/; description = "Collection of modular and reusable compiler and toolchain technologies"; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric shlevy]; + maintainers = with stdenv.lib.maintainers; [viric shlevy raskin]; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a5fc5e2fb8..21c811dbf84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2402,7 +2402,6 @@ let jikes = callPackage ../development/compilers/jikes { }; julia = callPackage ../development/compilers/julia { - llvm = llvm_3_1; pcre = pcre_8_30; liblapack = liblapack.override {shared = true;}; fftw = fftw.override {pthreads = true;}; @@ -2416,7 +2415,6 @@ let }; llvm = callPackage ../development/compilers/llvm { }; - llvm_3_1 = callPackage ../development/compilers/llvm/3.1.nix { }; mitscheme = callPackage ../development/compilers/mit-scheme { }; -- GitLab From 77d424875c4d035c3025bcb7f8f58c2a11229f93 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 04:54:13 +0200 Subject: [PATCH 0880/5607] chromium: Temporarily use bundled zlib. Well, after looking a bit more thoroughly through the zlib patch from the Chromium team, it seams, that this really fix an issue that hasn't yet been applied upstream. Unfortunately neither Chromium nor Zlib give more information about that issue. Maybe they're waiting until its resolved upstream and thus the temporary patch? The bad news is, that the fix for the vulnerability is incomplete in Chromium and covers only the use cases of Chromium itself, so we can't include that patched version in nixpkgs zlib derivation. Until the issue is fixed upstream we're hereby safer off turning it off in Chromium and thus use the bundled and patched version. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 59b05e94911..7dee8f3d296 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -63,13 +63,13 @@ let use_system_stlport = true; use_system_xdg_utils = true; use_system_yasm = true; - use_system_zlib = true; + use_system_zlib = false; # http://crbug.com/143623 use_system_harfbuzz = false; use_system_icu = false; - use_system_libwebp = false; # See chromium issue #133161 + use_system_libwebp = false; # http://crbug.com/133161 use_system_skia = false; - use_system_sqlite = false; # See chromium issue #22208 + use_system_sqlite = false; # http://crbug.com/22208 use_system_v8 = false; }; @@ -84,18 +84,6 @@ let pre22 = 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_91 = versionOlder sourceInfo.version "22.0.1229.91"; - patch = fetchurl { - name = "revert-r151720"; - url = "http://git.chromium.org/gitweb/?p=chromium.git;a=commitdiff_plain;" - + "hp=4419ec6414b33b6b19bb2e380b4998ed5193ecab;" - + "h=0fabb4fda7059a8757422e8a44e70deeab28e698"; - sha256 = "0n0d6mkg89g8q63cifapzpg9dxfs2n6xvk4k13szhymvf67b77pf"; - }; - in optional (below22_91) patch; - in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -129,8 +117,7 @@ in stdenv.mkDerivation rec { patches = optional (!cfg.selinux) seccompPatch ++ optional cfg.cups ./cups_allow_deprecated.patch - ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch - ++ maybeRevertZlibChanges; + ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch; postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl -- GitLab From 949afcc0f2d82cb00a7f0ca9c0dc4b45f8fe273f Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 05:49:13 +0200 Subject: [PATCH 0881/5607] chromium: New seccomp patch for versions >= 23. The BPF renderer sandbox is now the default in 23. But still, it is not regarded as "adequately sandboxed" from Google so we still need the legacy seccomp sandbox. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 5 ++++- .../browsers/chromium/enable_seccomp23.patch | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7dee8f3d296..62ceb2dfb9b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -82,7 +82,10 @@ let seccompPatch = let pre22 = versionOlder sourceInfo.version "22.0.0.0"; - in if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch; + pre23 = versionOlder sourceInfo.version "23.0.0.0"; + in if pre22 then ./enable_seccomp.patch + else if pre23 then ./enable_seccomp22.patch + else ./enable_seccomp23.patch; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch new file mode 100644 index 00000000000..bde476adbfd --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch @@ -0,0 +1,18 @@ +diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc +index ad73fe6..ee3e6e6 100644 +--- a/content/common/sandbox_linux.cc ++++ b/content/common/sandbox_linux.cc +@@ -42,13 +42,8 @@ bool IsSeccompLegacyDesired() { + return false; + } + #if defined(SECCOMP_SANDBOX) +-#if defined(NDEBUG) +- // Off by default. Allow turning on with a switch. +- return command_line->HasSwitch(switches::kEnableSeccompSandbox); +-#else + // On by default. Allow turning off with a switch. + return !command_line->HasSwitch(switches::kDisableSeccompSandbox); +-#endif // NDEBUG + #endif // SECCOMP_SANDBOX + return false; + } -- GitLab From df64adc2dfbfc2e32319799ef713ecef5976d847 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 05:52:06 +0200 Subject: [PATCH 0882/5607] chromium: Update dev and beta channels. dev: 23.0.1271.10 -> 24.0.1284.2 (not tested, probably won't build?) beta: 22.0.1229.91 -> 23.0.1271.17 (issues, see below) While testing the beta release, I've been bitten by http://crbug.com/149834, so as this is a beta release, I'm not sure if we should patch again to disable the BPF seccomp sandbox. Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 9d2a7893102..8dd406e5ea4 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "23.0.1271.10"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.10.tar.bz2"; - sha256 = "1jm9fhnq978lfn21xripf7l2n362axinggnxlz7rcc9as1y086y3"; + version = "24.0.1284.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1284.2.tar.bz2"; + sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx"; }; beta = { - version = "22.0.1229.91"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.91.tar.bz2"; - sha256 = "1b47rb5hw0k2fwc4jvmjpmxbhmqxgkz66j3mrjy4f8im41hmndyw"; + version = "23.0.1271.17"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.17.tar.bz2"; + sha256 = "1nyc2s378sx7ymmginipiphygg7s59iwg2kirlbgz60fl8wygzv2"; }; stable = { version = "22.0.1229.79"; -- GitLab From 10679a7ba6bb92779f7d24b7ac5682e6497934b2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 07:04:47 +0200 Subject: [PATCH 0883/5607] chromium: Fix chromium bug 149834 for version 23. This is just a temporary fix and will only thrown away as soon as a proper fix is included upstream, see http://crbug.com/149834 for more details about this. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 62ceb2dfb9b..1a1030606cf 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -87,6 +87,14 @@ let else if pre23 then ./enable_seccomp22.patch else ./enable_seccomp23.patch; + maybeBpfTemporaryFix = let + patch = fetchurl { + url = "https://chromiumcodereview.appspot.com/download/issue11032056_1_2.diff"; + sha256 = "eb13dc627940ad56939837ad1093b2c388f6cf79f1f25cdc1b2e25e987c73d1c"; + }; + needPatch = !versionOlder sourceInfo.version "23.0.1271.0"; + in optional needPatch patch; + in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -120,7 +128,8 @@ in stdenv.mkDerivation rec { patches = optional (!cfg.selinux) seccompPatch ++ optional cfg.cups ./cups_allow_deprecated.patch - ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch; + ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch + ++ maybeBpfTemporaryFix; postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl -- GitLab From 17fe198695572fb944bf3b3f6f1faaced63c508d Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 07:16:23 +0200 Subject: [PATCH 0884/5607] chromium: Disable legacy seccomp sandbox in v23. This removes the patch introduced in 949afcc0f2d82cb00a7f0ca9c0dc4b45f8fe273f. The reason behind this is because even though we patch in the legacy seccomp sandbox by default, it won't be used anyway as both cannot coexist anymore. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 11 +++++------ .../browsers/chromium/enable_seccomp23.patch | 18 ------------------ 2 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1a1030606cf..b3a149c8105 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -80,12 +80,11 @@ let xdg_utils yasm zlib ]; - seccompPatch = let + maybeSeccompPatch = let pre22 = versionOlder sourceInfo.version "22.0.0.0"; pre23 = versionOlder sourceInfo.version "23.0.0.0"; - in if pre22 then ./enable_seccomp.patch - else if pre23 then ./enable_seccomp22.patch - else ./enable_seccomp23.patch; + patch = if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch; + in optional pre23 patch; maybeBpfTemporaryFix = let patch = fetchurl { @@ -126,9 +125,9 @@ in stdenv.mkDerivation rec { prePatch = "patchShebangs ."; - patches = optional (!cfg.selinux) seccompPatch - ++ optional cfg.cups ./cups_allow_deprecated.patch + patches = optional cfg.cups ./cups_allow_deprecated.patch ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch + ++ maybeSeccompPatch ++ maybeBpfTemporaryFix; postPatch = optionalString cfg.openssl '' diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch deleted file mode 100644 index bde476adbfd..00000000000 --- a/pkgs/applications/networking/browsers/chromium/enable_seccomp23.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/content/common/sandbox_linux.cc b/content/common/sandbox_linux.cc -index ad73fe6..ee3e6e6 100644 ---- a/content/common/sandbox_linux.cc -+++ b/content/common/sandbox_linux.cc -@@ -42,13 +42,8 @@ bool IsSeccompLegacyDesired() { - return false; - } - #if defined(SECCOMP_SANDBOX) --#if defined(NDEBUG) -- // Off by default. Allow turning on with a switch. -- return command_line->HasSwitch(switches::kEnableSeccompSandbox); --#else - // On by default. Allow turning off with a switch. - return !command_line->HasSwitch(switches::kDisableSeccompSandbox); --#endif // NDEBUG - #endif // SECCOMP_SANDBOX - return false; - } -- GitLab From 58a4edd294b855057bedb97c302a681f4544c385 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 07:30:16 +0200 Subject: [PATCH 0885/5607] chromium: Drop seccomp patch for version 21. Version 22 is the current version of the stable channel, so we don't need to carry around a patch for earlier versions. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 4 +--- .../browsers/chromium/enable_seccomp.patch | 22 +++++++++---------- .../browsers/chromium/enable_seccomp22.patch | 20 ----------------- 3 files changed, 12 insertions(+), 34 deletions(-) delete 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 b3a149c8105..b34e13c920e 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -81,10 +81,8 @@ let ]; maybeSeccompPatch = let - pre22 = versionOlder sourceInfo.version "22.0.0.0"; pre23 = versionOlder sourceInfo.version "23.0.0.0"; - patch = if pre22 then ./enable_seccomp.patch else ./enable_seccomp22.patch; - in optional pre23 patch; + in optional pre23 ./enable_seccomp.patch; maybeBpfTemporaryFix = let patch = fetchurl { diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch index edeee37f19c..f947d796f18 100644 --- a/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch +++ b/pkgs/applications/networking/browsers/chromium/enable_seccomp.patch @@ -1,12 +1,12 @@ -diff --git a/content/common/seccomp_sandbox.h b/content/common/seccomp_sandbox.h -index a07d6f3..a622a35 100644 ---- a/content/common/seccomp_sandbox.h -+++ b/content/common/seccomp_sandbox.h -@@ -29,15 +29,9 @@ static bool SeccompSandboxEnabled() { - // TODO(evan): turn on for release too once we've flushed out all the bugs, - // allowing us to delete this file entirely and just rely on the "disabled" - // switch. --#ifdef NDEBUG +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); @@ -15,6 +15,6 @@ index a07d6f3..a622a35 100644 return !CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableSeccompSandbox); -#endif // NDEBUG - } #endif // SECCOMP_SANDBOX - + return false; + } diff --git a/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch b/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch deleted file mode 100644 index f947d796f18..00000000000 --- a/pkgs/applications/networking/browsers/chromium/enable_seccomp22.patch +++ /dev/null @@ -1,20 +0,0 @@ -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; - } -- GitLab From 4f178d1698209627f535af9071e51522c78e7ee9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 8 Oct 2012 01:57:39 -0400 Subject: [PATCH 0886/5607] clang: Bump to 3.1 --- .../compilers/llvm/clang-include-paths.patch | 54 ++++--------- .../compilers/llvm/clang-ld-flags.patch | 75 ++++++++++++------- pkgs/development/compilers/llvm/clang.nix | 21 +++--- 3 files changed, 70 insertions(+), 80 deletions(-) diff --git a/pkgs/development/compilers/llvm/clang-include-paths.patch b/pkgs/development/compilers/llvm/clang-include-paths.patch index 828c554175e..5e7370718ab 100644 --- a/pkgs/development/compilers/llvm/clang-include-paths.patch +++ b/pkgs/development/compilers/llvm/clang-include-paths.patch @@ -1,49 +1,21 @@ -diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp ---- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 -+++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 06:29:27.562428830 -0500 -@@ -1926,14 +1926,17 @@ +diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp +--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 ++++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400 +@@ -2146,9 +2146,6 @@ if (DriverArgs.hasArg(options::OPT_nostdinc)) return; -+#if 0 - if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) - addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); - -+#endif +- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) +- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); +- if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { llvm::sys::Path P(D.ResourceDir); P.appendComponent("include"); - addSystemInclude(DriverArgs, CC1Args, P.str()); - } -+#if 0 - - if (DriverArgs.hasArg(options::OPT_nostdlibinc)) - return; -@@ -1998,6 +2001,8 @@ +@@ -2264,6 +2261,7 @@ return; - addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); -+#endif -+ addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + C_INCLUDE_PATH); - } - - static bool addLibStdCXXIncludePaths(Twine Base, Twine TargetArchDir, -@@ -2030,6 +2035,7 @@ - bool IsTarget64Bit = (TargetArch == llvm::Triple::x86_64 || - TargetArch == llvm::Triple::ppc64); - -+#if 0 - StringRef CxxIncludeRoot(CXX_INCLUDE_ROOT); - if (!CxxIncludeRoot.empty()) { - StringRef CxxIncludeArch(CXX_INCLUDE_ARCH); -@@ -2072,6 +2078,10 @@ - GCCInstallation.getTriple() + Suffix, - DriverArgs, CC1Args); - } -+#endif -+ addLibStdCXXIncludePaths(CPP_INCLUDE_PATH, -+ CPP_HOST, -+ DriverArgs, CC1Args); - } - - /// DragonFly - DragonFly tool chain which can call as(1) and ld(1) directly. + // Check if libc++ has been enabled and provide its include paths if so. ++ // !!! Will need to modify this if/when nixpkgs uses libc++ + if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) { + // libc++ is always installed at a fixed path on Linux currently. + addSystemInclude(DriverArgs, CC1Args, diff --git a/pkgs/development/compilers/llvm/clang-ld-flags.patch b/pkgs/development/compilers/llvm/clang-ld-flags.patch index 62b8bc763f9..ffa67b464ec 100644 --- a/pkgs/development/compilers/llvm/clang-ld-flags.patch +++ b/pkgs/development/compilers/llvm/clang-ld-flags.patch @@ -1,38 +1,57 @@ -diff -Naur clang-3.0.src-orig/lib/Driver/ToolChains.cpp clang-3.0.src/lib/Driver/ToolChains.cpp ---- clang-3.0.src-orig/lib/Driver/ToolChains.cpp 2011-11-17 02:40:32.000000000 -0500 -+++ clang-3.0.src/lib/Driver/ToolChains.cpp 2011-12-19 05:32:38.695513475 -0500 -@@ -1800,6 +1800,7 @@ - - Linker = GetProgramPath("ld"); - -+#if 0 - LinuxDistro Distro = DetectLinuxDistro(Arch); +diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp +--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 ++++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400 +@@ -2077,16 +2077,6 @@ + addPathIfExists(LibPath + "/../" + Multilib, Paths); + } + } +- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); +- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); +- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); +- +- // Try walking via the GCC triple path in case of multiarch GCC +- // installations with strange symlinks. +- if (GCCInstallation.isValid()) +- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + +- "/../../" + Multilib, Paths); - if (IsOpenSuse(Distro) || IsUbuntu(Distro)) { -@@ -1882,6 +1883,7 @@ - addPathIfExists(SysRoot + "/lib", Paths); - addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); - addPathIfExists(SysRoot + "/usr/lib", Paths); -+#endif + // Add the non-multilib suffixed paths (if potentially different). + if (GCCInstallation.isValid()) { +@@ -2100,8 +2090,6 @@ + addPathIfExists(LibPath, Paths); + } + } +- addPathIfExists(SysRoot + "/lib", Paths); +- addPathIfExists(SysRoot + "/usr/lib", Paths); } bool Linux::HasNativeLLVMSupport() const { -diff -Naur clang-3.0.src-orig/lib/Driver/Tools.cpp clang-3.0.src/lib/Driver/Tools.cpp ---- clang-3.0.src-orig/lib/Driver/Tools.cpp 2011-11-07 05:27:39.000000000 -0500 -+++ clang-3.0.src/lib/Driver/Tools.cpp 2011-12-19 05:34:44.075325534 -0500 -@@ -4306,6 +4306,7 @@ +diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp +--- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400 ++++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400 +@@ -5210,24 +5210,6 @@ ToolChain.getArch() == llvm::Triple::thumb || (!Args.hasArg(options::OPT_static) && !Args.hasArg(options::OPT_shared))) { -+#if 0 - CmdArgs.push_back("-dynamic-linker"); - if (ToolChain.getArch() == llvm::Triple::x86) - CmdArgs.push_back("/lib/ld-linux.so.2"); -@@ -4318,6 +4319,7 @@ - CmdArgs.push_back("/lib64/ld64.so.1"); - else - CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+#endif +- CmdArgs.push_back("-dynamic-linker"); +- if (ToolChain.getArch() == llvm::Triple::x86) +- CmdArgs.push_back("/lib/ld-linux.so.2"); +- else if (ToolChain.getArch() == llvm::Triple::arm || +- ToolChain.getArch() == llvm::Triple::thumb) +- CmdArgs.push_back("/lib/ld-linux.so.3"); +- else if (ToolChain.getArch() == llvm::Triple::mips || +- ToolChain.getArch() == llvm::Triple::mipsel) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::mips64 || +- ToolChain.getArch() == llvm::Triple::mips64el) +- CmdArgs.push_back("/lib64/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::ppc) +- CmdArgs.push_back("/lib/ld.so.1"); +- else if (ToolChain.getArch() == llvm::Triple::ppc64) +- CmdArgs.push_back("/lib64/ld64.so.1"); +- else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); } CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 663e1bfab28..48e4c4946f3 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, perl, groff, llvm, cmake }: -let version = "3.0"; in +let version = "3.1"; in stdenv.mkDerivation { name = "clang-${version}"; @@ -10,20 +10,19 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals (stdenv.gcc.libc != null) [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ - -e 's,CPP_HOST,"'$(${stdenv.gcc}/bin/cc -dumpmachine)'",' \ - -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ - lib/Driver/ToolChains.cpp - ''; - - cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all"]; + cmakeFlags = [ + "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" + "-DCMAKE_BUILD_TYPE=Release" + "-DLLVM_TARGETS_TO_BUILD=all" + ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ + "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" + ]; enableParallelBuilding = true; src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.tar.gz"; - sha256 = "0v8j9rgmb7w74ihc44zfxa22q17c946n5b6prwl38z3d6pd74kmn"; + url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; + sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz"; }; passthru = { gcc = stdenv.gcc.gcc; }; -- GitLab From 778635384804813f454519426a499e5363f45117 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 8 Oct 2012 02:32:09 -0400 Subject: [PATCH 0887/5607] Add libc++ --- pkgs/development/libraries/libc++/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/libc++/default.nix diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix new file mode 100644 index 00000000000..bed95311915 --- /dev/null +++ b/pkgs/development/libraries/libc++/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, cmake }: + +let rev = "165151"; in + +stdenv.mkDerivation { + name = "libc++-pre${rev}"; + + src = fetchsvn { + url = "http://llvm.org/svn/llvm-project/libcxx/trunk"; + inherit rev; + sha256 = "00l8xx5nc3cjlmln7c1sy1i4v844has9kbfxrsziwkalzbgwaslz"; + }; + + buildInputs = [ cmake ]; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; + + enableParallelBuilding = true; + + meta = { + homepage = http://libcxx.llvm.org/; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = "BSD"; + maintainers = stdenv.lib.maintainers.shlevy; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21c811dbf84..bcb7a356a25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3030,6 +3030,8 @@ let csslint = callPackage ../development/web/csslint { }; + libcxx = callPackage ../development/libraries/libc++ { stdenv = pkgs.clangStdenv; }; + dejagnu = callPackage ../development/tools/misc/dejagnu { }; ddd = callPackage ../development/tools/misc/ddd { }; -- GitLab From 29fd8d4eaa6f09f8987044fae0bdfefd0c67eecf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 8 Oct 2012 03:12:42 -0400 Subject: [PATCH 0888/5607] cmake: Bump --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index cab217fef97..d66149a9509 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "2.8"; - minorVersion = "7"; + minorVersion = "9"; version = "${majorVersion}.${minorVersion}"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "17zmxh0gyis6w05d2km0swlvy94h3w10jgra0fpa5qcg7l2j628k"; + sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw"; }; patches = -- GitLab From 18ccd4b34073dd981babab7436becf51100f4e2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 10:46:10 +0200 Subject: [PATCH 0889/5607] haskell-cabal-install: add version 1.16.0 --- .../cabal-install/1.16.0.nix | 23 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/package-management/cabal-install/1.16.0.nix diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.nix b/pkgs/tools/package-management/cabal-install/1.16.0.nix new file mode 100644 index 00000000000..7c977989471 --- /dev/null +++ b/pkgs/tools/package-management/cabal-install/1.16.0.nix @@ -0,0 +1,23 @@ +{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }: + +cabal.mkDerivation (self: { + pname = "cabal-install"; + version = "1.16.0"; + sha256 = "0yg8h028sixvzx42v1spjyx4qfhpsar38cvz9188m62rac8ak8az"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + Cabal filepath HTTP mtl network random time zlib + ]; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + ''; + meta = { + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + 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 16d315056ea..10f3238b223 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); transformers = self.transformers_0_3_0_0; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_0; # 7.6 ok - cabalInstall = self.cabalInstall_0_14_0; # 7.6 ok + cabalInstall = self.cabalInstall_1_16_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_10; # 7.6 ok @@ -1889,7 +1889,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; - cabalInstall = self.cabalInstall_0_14_0; + cabalInstall_1_16_0 = callPackage ../tools/package-management/cabal-install/1.16.0.nix {}; + cabalInstall = self.cabalInstall_1_16_0; jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; -- GitLab From 3b9a7e59b29993c37925f8fe039467a8bedd9e14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 10:46:55 +0200 Subject: [PATCH 0890/5607] haskell-Cabal: update to versions 1.16.0.1 --- .../libraries/haskell/Cabal/{1.16.0.nix => 1.16.0.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/Cabal/{1.16.0.nix => 1.16.0.1.nix} (81%) diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.1.nix similarity index 81% rename from pkgs/development/libraries/haskell/Cabal/1.16.0.nix rename to pkgs/development/libraries/haskell/Cabal/1.16.0.1.nix index 14e811b5e94..e4698c72cad 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.16.0"; - sha256 = "0ia2ysqbnnbfv75l8617bys5iaq8aygcbd1ijqcbzd3asf8flyms"; + version = "1.16.0.1"; + sha256 = "03h0fsdm00i5pq37j3d7rjw3gnqkmacvgvdhcrmmamn5q81qld5g"; buildDepends = [ filepath ]; meta = { homepage = "http://www.haskell.org/cabal/"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 10f3238b223..488d5ccdb42 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -537,7 +537,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_16_0 = callPackage ../development/libraries/haskell/Cabal/1.16.0.nix { cabal = self.cabal.override { Cabal = null; }; }; + Cabal_1_16_0_1 = callPackage ../development/libraries/haskell/Cabal/1.16.0.1.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; -- GitLab From 0a9568df7bc58e2921e6916c5a69ccf9f4738c7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 10:47:32 +0200 Subject: [PATCH 0891/5607] haskell-tar: update to version 0.4.0.1 --- .../tools/haskell/tar/{0.4.0.0.nix => 0.4.0.1.nix} | 8 ++++---- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/tools/haskell/tar/{0.4.0.0.nix => 0.4.0.1.nix} (65%) diff --git a/pkgs/development/tools/haskell/tar/0.4.0.0.nix b/pkgs/development/tools/haskell/tar/0.4.0.1.nix similarity index 65% rename from pkgs/development/tools/haskell/tar/0.4.0.0.nix rename to pkgs/development/tools/haskell/tar/0.4.0.1.nix index 7f6b70a52e6..04257960a64 100644 --- a/pkgs/development/tools/haskell/tar/0.4.0.0.nix +++ b/pkgs/development/tools/haskell/tar/0.4.0.1.nix @@ -1,10 +1,10 @@ -{ cabal, filepath }: +{ cabal, filepath, time }: cabal.mkDerivation (self: { pname = "tar"; - version = "0.4.0.0"; - sha256 = "04qijdfyiqb64q58g0bf46qfgaxqjl3kl68x6z31cv36p3hpplx3"; - buildDepends = [ filepath ]; + version = "0.4.0.1"; + sha256 = "0vbsv7h3zgp30mlgsw156jkv1rqy5zbm98as9haf7x15hd6jf254"; + buildDepends = [ filepath time ]; meta = { description = "Reading, writing and manipulating \".tar\" archive files."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 488d5ccdb42..96ff9d0960f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1841,8 +1841,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; tar_0_3_2_0 = callPackage ../development/tools/haskell/tar/0.3.2.0.nix {}; - tar_0_4_0_0 = callPackage ../development/tools/haskell/tar/0.4.0.0.nix {}; - tar = self.tar_0_4_0_0; + tar_0_4_0_1 = callPackage ../development/tools/haskell/tar/0.4.0.1.nix {}; + tar = self.tar_0_4_0_1; threadscope = callPackage ../development/tools/haskell/threadscope {}; -- GitLab From 3ed8a0c9dc3ab570bb2a6f853ba54970a9120ee3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:14:39 +0200 Subject: [PATCH 0892/5607] haskell-persistent: jail-break to support current versions of lifted-base --- pkgs/development/libraries/haskell/persistent/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index b4010959d77..b410b36ea56 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { unorderedContainers vector ]; extraLibraries = [ sqlite ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; -- GitLab From 5387c501578d7ca09b119f6e22c3cc74b5258b92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:15:03 +0200 Subject: [PATCH 0893/5607] haskell-resourcet: jail-break to support current versions of lifted-base --- pkgs/development/libraries/haskell/resourcet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index e3190749f1c..efbd56cbe6a 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -9,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; + jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; -- GitLab From 3e5dc7a950ecae099c926fc036cc74c331bb6f14 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:16:16 +0200 Subject: [PATCH 0894/5607] haskell-yesod-auth: jail-break to support current versions of lifted-base --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index ac5c87d7613..ec7b78fe6fd 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; -- GitLab From 0f54bd6130500508720031ad55f3b19a65c0cde1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:23 +0200 Subject: [PATCH 0895/5607] haskell-idris: update to version 0.9.4.1 --- pkgs/development/compilers/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index deb97a19b1c..b240824ff73 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.3.1"; - sha256 = "1dqb7gd5jn5f062hfwrirrfxv6ac1f6khkfax912j01mg147hv9a"; + version = "0.9.4.1"; + sha256 = "1f1jrgnclr0443rbhfcnm0vvbb2jcliskqm6vq1c0xgywab7bjhx"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 9812fb396174cae49c30713daf331ef8a174b3f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:23 +0200 Subject: [PATCH 0896/5607] haskell-binary: update to version 0.6.2.0 --- 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 f0757bcca02..303e67c3b99 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.6.1.0"; - sha256 = "0d423k37973f5v9mz9401zmsfdgspnf9h6s9xgr3zh19giz7c3js"; + version = "0.6.2.0"; + sha256 = "0nm4vsgyz7ml6w3lk5hrh34i7s7li32gj7bgs75w636kln338aab"; meta = { homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; -- GitLab From fbb2b63632427e24aa163092ce17fee847650fea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:23 +0200 Subject: [PATCH 0897/5607] haskell-citeproc-hs: update to version 0.3.5 --- pkgs/development/libraries/haskell/citeproc-hs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index 3cd0c09c3b2..2899f526f36 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "citeproc-hs"; - version = "0.3.4"; - sha256 = "17w6fpmlhbfd8jxxz4s6ybz3dswf0i96fjjbs05ykh4i97rs62nv"; + version = "0.3.5"; + sha256 = "134sdz22h2aqwy3cmn0vw91nmbp3ckpjg5djxsg93ddl08ahr4zr"; buildDepends = [ filepath hsBibutils HTTP json mtl network pandocTypes parsec syb time utf8String xml -- GitLab From ce15d915bbdbc90f3cf3ead87a62f5b1933b0cb2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0898/5607] haskell-conduit: update to version 0.5.2.5 --- pkgs/development/libraries/haskell/conduit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index c383c46f30b..e1a5fc10a42 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,12 +4,13 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.5.2.4"; - sha256 = "17959j5frfbl5af4pmxhfb4swrjckk4fh5wmd5bwsbs824glb97a"; + version = "0.5.2.5"; + sha256 = "1savaq8n29cry75jl8rfk35q24s5bvm57j1zhnp3dcvj2i6w9k3y"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void ]; + jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; -- GitLab From 10eda4938a2b6decc5aafcc2291bbf5063b58ce8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0899/5607] haskell-data-accessor-template: update to version 0.2.1.10 --- .../haskell/data-accessor/data-accessor-template.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index 077e31c683e..41bd2347012 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-accessor-template"; - version = "0.2.1.9"; - sha256 = "14zp2zjxlkdi33cjif9lc1kl8m0x4brh0pk3d34wk1g1bfzynijc"; + version = "0.2.1.10"; + sha256 = "11a4c0g74ppl7nls0dhx6xs47dfcq1wp7bd8qgdba6hhn645afzy"; buildDepends = [ dataAccessor utilityHt ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; -- GitLab From d44ce8ee8b40dc5e1b2eb5dc30a66624683eeb97 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0900/5607] haskell-distributed-process-simplelocalnet: update to version 0.2.0.6 --- .../haskell/distributed-process-simplelocalnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index 650f82a99ec..bec44a0b8e2 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process-simplelocalnet"; - version = "0.2.0.5"; - sha256 = "04cx5pb3pf4wpmqx1zhdc9lrfs0mb8zk7p1qxxlsqg0x63f3353w"; + version = "0.2.0.6"; + sha256 = "1mgsmxxy1fcbxh8p82078c70fj7iv6wr8g47r4d0c3jwz84xya57"; buildDepends = [ binary dataAccessor distributedProcess network networkMulticast networkTransport networkTransportTcp transformers -- GitLab From 136581a717b878b089af27a961f0643021b41479 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0901/5607] haskell-distributed-process: update to version 0.4.0.1 --- .../libraries/haskell/distributed-process/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 25b53834f94..7b478d8cd99 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -5,8 +5,10 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.3.1"; - sha256 = "048j27mpdmknz2s4ja3q2mla1d2sjbvrpmzx0lz2qas123qz1siq"; + version = "0.4.0.1"; + sha256 = "0yi0403665l01gkqbsix9f4hj8c8m4i42nwjq2i63x259qz2njwi"; + isLibrary = true; + isExecutable = true; buildDepends = [ binary dataAccessor distributedStatic mtl networkTransport random rank1dynamic stm syb time transformers -- GitLab From e7a86c9ded110409d393327d0a17e5dd2d5687d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0902/5607] haskell-distributed-static: update to version 0.2.1 --- .../libraries/haskell/distributed-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 0778089bdd0..c09558449df 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.2.0.0"; - sha256 = "04s3iils9ji8bwizvm36r5ihnd11098346br0919dv1x6g67a610"; + version = "0.2.1"; + sha256 = "0cdwizm4fr2akw7hsqdrvqk06h1lybpxjiczv3kmd0lyc4cb7kyc"; buildDepends = [ binary rank1dynamic ]; meta = { homepage = "http://www.github.com/haskell-distributed/distributed-process"; -- GitLab From 0ab16be804e299d016ebbd335238e8fdff5c864b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0903/5607] haskell-edit-distance: update to version 0.2.1.1 --- pkgs/development/libraries/haskell/edit-distance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index 07744765adb..b6d0b4668f8 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "edit-distance"; - version = "0.2.1"; - sha256 = "1zhiyzgqmxi4mn7zn5q6rg03hgff9y5f9xizbs00069v7ncygi38"; + version = "0.2.1.1"; + sha256 = "1d8h38cn3azvsp2dp5gycglm5bwwd8plbag8ypi38yj6c35a82yn"; isLibrary = true; isExecutable = true; buildDepends = [ random ]; -- GitLab From bf151cdbd732c5324d65e5c18f866731483cea3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0904/5607] haskell-file-embed: update to version 0.0.4.6 --- 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 0a6fdf6c8cc..a36d333e909 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.5"; - sha256 = "18rhcjll5gj790g5balk3xhnmmgjh2bixik8vna5drs7y9i0innp"; + version = "0.0.4.6"; + sha256 = "0p2vs56s1jy5xaw3axzfsir925z2a46624n32x797lga9khm3qvp"; meta = { homepage = "https://github.com/snoyberg/file-embed"; description = "Use Template Haskell to embed file contents directly"; -- GitLab From c9cdb612d3cdf19b5d73c461992b6b5aede2218d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 0905/5607] haskell-gloss: update to version 1.7.6.4 --- 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 e988eae9adf..4911b743d42 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.6.1"; - sha256 = "1gwmrnwn1x0hs9jp2qsjp737wahbdsjrp2kp7gpz9pkq4a6jmjmx"; + version = "1.7.6.4"; + sha256 = "0nyz9iicc6d96yn6yxzwz08g106qb2aadrxlw120wl01aqfw4xis"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; -- GitLab From 143650b1b1dd7807dad423b3a7fc0d5868ac2d8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0906/5607] haskell-happstack-server: update to version 7.0.7 --- .../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 5d4b4365f39..e864075b42a 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.5"; - sha256 = "11ialzvjdqmf62yl5r9yxir8fg5agfg1fysf3c3ja5456k07b466"; + version = "7.0.7"; + sha256 = "0r9bk82zjzlsi6j6dnz5b73qacpfdyhsn5ds98cn7gkqyf4yg7cj"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath -- GitLab From be0fe5c0d8710800cc9578e80878c41a1cbbf0d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0907/5607] haskell-hashtables: update to version 1.0.1.8 --- pkgs/development/libraries/haskell/hashtables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index 08f93355910..8b8616fce20 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.0.1.7"; - sha256 = "0swk501whj08jj9q1d1lwg06nakimxnr7797zx8y8275f5mmisi7"; + version = "1.0.1.8"; + sha256 = "0skrzvzasm0hg4631nhfppsb7mn60pnxk4v31gipzz780sbx9zi8"; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; -- GitLab From a191dca5e79e8f477db04ea6aa2089716281da70 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0908/5607] haskell-hspec: update to version 1.3.0.1 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 1a22ff5df0d..d525f2a6e0b 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.3.0"; - sha256 = "0kl9mdksy8bifb37dfb9y8mnnjlq0x1h970cgzv9idq61gafii4n"; + version = "1.3.0.1"; + sha256 = "1xgj1yg49vb524blswclr0yw4pvfpbmjyh0b62fac14mawl89v36"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 7c35fd86ede30880231fe62287ab6e56eed4280e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0909/5607] haskell-http-conduit: update to version 1.6.1.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 4aad24d1cc7..3e094e0c6b1 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.1"; - sha256 = "1yzsa6gqhq6s4b2drhx4jd6qdfawf1swrjyffi2bfq1vq8i9ikf2"; + version = "1.6.1.1"; + sha256 = "00xixsp1n37mb2in20lsxf460cyjbsp8dj2avys6hyrdn14ki130"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { monadControl mtl network regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; -- GitLab From ce72803dff685b92f8a04fe19c00710d3ead0563 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0910/5607] haskell-json: update to version 0.7 --- pkgs/development/libraries/haskell/json/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index 09ebeb847b9..9a56f412fe2 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, parsec, syb }: +{ cabal, mtl, parsec, syb, text }: cabal.mkDerivation (self: { pname = "json"; - version = "0.6"; - sha256 = "1f5l1992r2gm8fivqfljhgs3nix4qf7h3rji78rsq1kf3r9shz32"; - buildDepends = [ mtl parsec syb ]; + version = "0.7"; + sha256 = "18v8vbx3pyskf3ap4lpy2d3461gghfsq5bzjyrjvqsd2r9r44rfk"; + buildDepends = [ mtl parsec syb text ]; meta = { description = "Support for serialising Haskell to and from JSON"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 4af7e7d46c691a8417776765b9ad257f4a8dbc0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0911/5607] haskell-libmpd: update to version 0.8.0.1 --- pkgs/development/libraries/haskell/libmpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index c0ba821d5f1..f6185597af1 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0"; - sha256 = "0sn9yqiqr011glb7q0f3xj24wkkvnib0khzf833npcas4420d0ya"; + version = "0.8.0.1"; + sha256 = "16j2c0dnwllsb979gqf1cl4ylvpldcj8k32ddpp4wf62lbb1mqxm"; buildDepends = [ filepath mtl network text time utf8String ]; meta = { homepage = "http://github.com/joachifm/libmpd-haskell"; -- GitLab From 22caa0a77731a91d6e8f4619beef4ba84103212d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0912/5607] haskell-lifted-base: update to version 0.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 09264ab57f4..e5c334e1b22 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.2"; - sha256 = "0js94dlfy2wjl026jcj2l399ly4zgw0cgxkmil6lsm34gcy9vrvq"; + version = "0.2"; + sha256 = "12ai34wb1sd6fza50arlpvsdc6l2nwrrcik0xakf2q0ddzjmhjfb"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; -- GitLab From 5049bf557319960c5af87f43feabb71a0165f16d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 0913/5607] haskell-multiarg: update to version 0.6.0.0 --- pkgs/development/libraries/haskell/multiarg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index c376ab0cbd6..8b2871c3ce4 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.4.0.0"; - sha256 = "04m4ynf6x8rlnlmnl6a7jj42fszjc1bly4h3jyjxxsqjdynrv81q"; + version = "0.6.0.0"; + sha256 = "1qrw1rajdvrvd297a7lpfkxm5qqhwmnnl5jiagjwzb9lckgpy87y"; buildDepends = [ explicitException utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; -- GitLab From 1148be313edd1987a7033135887bca57bc516e7c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0914/5607] haskell-network-conduit: update to version 0.6.0 --- .../libraries/haskell/network-conduit/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index d5c04d8e2b8..45f65e932c0 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,11 +3,12 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.5.0.2"; - sha256 = "0ragnwhc8szh680iyzyz6fbprqd3drr8sb970h1p2l4i22srkm39"; + version = "0.6.0"; + sha256 = "0y296v8b6xrxs9jw6az6flz9nsqgk60cnpc954pmp6mi5q8mbv7i"; buildDepends = [ conduit liftedBase monadControl network transformers ]; + jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Stream socket data using conduits"; -- GitLab From 7901fa7d9669a446d743692d7419c3f62851084f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0915/5607] haskell-network-transport-tcp: update to version 0.3.0 --- .../libraries/haskell/network-transport-tcp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index 61ebc4ec1d9..f0f6957c036 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.2.0.3"; - sha256 = "0jlw59ib6yzkv2qggza571k2nhxnwvwj42zdgzz6wh2bgdyihayw"; + version = "0.3.0"; + sha256 = "0x2rz0h890bfay52af2wcvja706dr4r6wgfs9csjf7y3jf53nc63"; buildDepends = [ dataAccessor network networkTransport ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; - description = "TCP instantation of Network.Transport"; + description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; -- GitLab From 2833c14608cd12a907eb576f7d6417241fb0e385 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0916/5607] haskell-network-transport: update to version 0.3.0 --- .../libraries/haskell/network-transport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index 9e3ab7e7796..813e8372cfc 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.2.0.2"; - sha256 = "1pipykqwbjmbkgkmk0ss2pvfp72rkxwmz49d1j5xi8b0rlfgw05c"; + version = "0.3.0"; + sha256 = "1i6sn5x3z1r9l7xwag68s5gsii137d5dajwr0abcbv6143ph3bvm"; buildDepends = [ binary transformers ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; -- GitLab From 093aa60a74e0cf0eccc75ee474dc98168a0e59e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0917/5607] haskell-parallel-io: update to version 0.3.2.1 --- pkgs/development/libraries/haskell/parallel-io/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix index 1cb682d2b91..d16f42f52ff 100644 --- a/pkgs/development/libraries/haskell/parallel-io/default.nix +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -2,12 +2,11 @@ cabal.mkDerivation (self: { pname = "parallel-io"; - version = "0.3.2"; - sha256 = "1n9y1d1lcdwvhjsfqdlxknl89fxncq17kgin43wlki0c39cgirga"; + version = "0.3.2.1"; + sha256 = "0wrmz0i5s8p87840pacdnpf2fi12nips4yc72vymifrc1wvlc42q"; isLibrary = true; isExecutable = true; buildDepends = [ extensibleExceptions random ]; - jailbreak = true; meta = { homepage = "http://batterseapower.github.com/parallel-io"; description = "Combinators for executing IO actions in parallel on a thread pool"; -- GitLab From 587bf8d2d8c9c39cbed2e51eb708ae16eb8c4c7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0918/5607] haskell-snap-loader-dynamic: update to version 0.9.0.1 --- pkgs/development/libraries/haskell/snap/loader-dynamic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix index 5815496695c..3f6c5db004b 100644 --- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix +++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "snap-loader-dynamic"; - version = "0.9.0"; - sha256 = "1pbpvi20an077klvha1dflnlxpfb6m81n9d50hjhidf6430cmmhm"; + version = "0.9.0.1"; + sha256 = "1pzn8lfqngn8cqm1dpxn5wsx70xcd7r90rd2948n4p5309qgh9mq"; buildDepends = [ directoryTree hint mtl snapCore time ]; meta = { homepage = "http://snapframework.com/"; -- GitLab From 58f227a11f8c7213b026d3b368e6ff2c50e40c88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0919/5607] haskell-stringsearch: update to version 0.3.6.4 --- pkgs/development/libraries/haskell/stringsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix index fb31ab76a2c..f8032f8cde4 100644 --- a/pkgs/development/libraries/haskell/stringsearch/default.nix +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "stringsearch"; - version = "0.3.6.3"; - sha256 = "1f0sl1zjya8glvlscf3g5i0in0ai1knls7kg9dp82grg2k287sgz"; + version = "0.3.6.4"; + sha256 = "16g0x0n8x3bg3mij7w3r5m3h2i2dn3bd298n14iccdwhfnlzm91b"; meta = { homepage = "https://bitbucket.org/dafis/stringsearch"; description = "Fast searching, splitting and replacing of ByteStrings"; -- GitLab From e55f32d2d7e0fca16a3a7dc5faff7bf8ef2c3190 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0920/5607] haskell-stylish-haskell: update to version 0.5.2.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index f2ebed7cc6a..59c10c40133 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.1.0"; - sha256 = "0vriwgx7z8azqmci9lq7xlvn0v12p5nj9s6i4jvxsjam538qll94"; + version = "0.5.2.0"; + sha256 = "1g02ih4hgn2chv56vy8dcql7x421w15m4fsgqnff236znxarn0v7"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 92e4df6ff4246dd692520ecb5aba2318880ad249 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0921/5607] haskell-temporary: update to version 1.1.2.4 --- pkgs/development/libraries/haskell/temporary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index 99ce29b1991..df93cae198a 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "temporary"; - version = "1.1.2.3"; - sha256 = "1x4jljggbcdq90h578yyvc8z1i9zmlhvqfz2dym8kj8pq4qiwixd"; + version = "1.1.2.4"; + sha256 = "1j8kc22rz2wqg90n5wcxb06ylqv3lnz764077kvwhrw7mhmbp7jz"; buildDepends = [ filepath ]; meta = { homepage = "http://www.github.com/batterseapower/temporary"; -- GitLab From 0f654ae6240e7bec5c25069bca9e28e3897847a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 0922/5607] haskell-tls-extra: update to version 0.4.7 --- pkgs/development/libraries/haskell/tls-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 349c4e05754..362dab2125f 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.6"; - sha256 = "1xl55i4nr7kyc3qxi8zmq18m0xhlwlrx9fwkck22krshqgq2i6nn"; + version = "0.4.7"; + sha256 = "1ykmwkzq2vwjvcvg8c9b020baqxp3w7w0x7ka7jrk88aqmil9hiq"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From fc608ef86a0968939d58eb1eb1a7489cbe2e348f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0923/5607] haskell-uu-parsinglib: update to version 2.7.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 1bb3cb76dac..02356789bc3 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.4"; - sha256 = "1f582cr17qxwrhxx6pdv503ldm4ccbnbv9pcksibgparfyc25bnv"; + version = "2.7.4"; + sha256 = "1cznyn09a3glfkvvzqma3bhjinddkp6v2xwiy5x403v0wy8y565j"; buildDepends = [ ListLike time ]; meta = { homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators"; -- GitLab From 6af81dcb12f28fc210daf952752c8555487c7ef3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0924/5607] haskell-vector-algorithms: update to version 0.5.4.2 --- .../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 2704942b360..dc8c9dd35ba 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.1"; - sha256 = "00dikjmy1pyyn3mmq7sjnmd91xcg7q3n3yiil3dqi1fgr0787xng"; + version = "0.5.4.2"; + sha256 = "08pb6mkghf9h5011vxrfdrfq6g26jk4gxmjh9s3hpdiwybf3ab64"; buildDepends = [ primitive vector ]; meta = { homepage = "http://code.haskell.org/~dolio/"; -- GitLab From 963a0bfc40aa840844bc6457de69a449e2497d6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0925/5607] haskell-warp: update to version 1.3.3.1 --- pkgs/development/libraries/haskell/warp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index bb168f7d990..c4c2bfc4a69 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,13 +5,14 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.2"; - sha256 = "14yib72x3z6fylpkzpr77cvvnr4bn1vdadh2pq6rknszspl6g7iq"; + version = "1.3.3.1"; + sha256 = "0nz5n574lgaii6i9ncc6dkzw2aw6g7hwjjq7v8njly2vpwygxn7s"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; + patchPhase = "sed -i -e 's|, lifted-base.*|, lifted-base|' warp.cabal"; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; -- GitLab From e754ab10ed6c5dfb8cf536508646c1fb9e96c3a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0926/5607] haskell-yaml: update to version 0.8.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 52460c8246b..20d0bf3bc89 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.2"; - sha256 = "14blcsylbf9wx4yw8fsk8ddjvg844x97xfc1h7r4ls9l9ar7k95j"; + version = "0.8.1"; + sha256 = "0cirffxydjh5650s1i0mq1v839pl2dljwmrjnmjf44fcqsvanvyg"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector -- GitLab From f273a6054f061957e9d27c4076897e16923662ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0927/5607] haskell-yesod-core: update to version 1.1.2.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index c0bef5018ba..87723df26c3 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.2"; - sha256 = "1pgwqghj9kc9kh90515nswz5ssbmm2y6miw5j6sx4dha0xncqvgs"; + version = "1.1.2.1"; + sha256 = "195r19xsd3fvsirz62mkfxqgw5zi4lx700ly08h1i0kvmfnfx1g8"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes @@ -19,6 +19,7 @@ cabal.mkDerivation (self: { text time transformers transformersBase vector wai waiExtra yesodRoutes ]; + jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; -- GitLab From 559a6cc24fcc7b781f037141c3cb4da8aa0c1e91 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0928/5607] haskell-yesod-default: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/yesod-default/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index c3dce8ca7d3..5a82c8b30af 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-default"; - version = "1.1.0"; - sha256 = "124407a0in474l71jja04ds0xh84ac5i3jv62iswxlcp1y9f52bq"; + version = "1.1.0.2"; + sha256 = "0gjf819mrg3h50c8qlnh8i3xzq0z8mdz8bbqrpjx1haljcgxrzm3"; buildDepends = [ dataDefault hamlet networkConduit shakespeareCss shakespeareJs text transformers unorderedContainers wai waiExtra warp yaml yesodCore -- GitLab From 3ff871a11d8395196f6bdf753685a7dad06bec1c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0929/5607] haskell-yesod-routes: update to version 1.1.0.1 --- 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 9a801d62df8..20374285337 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.1.0"; - sha256 = "0r0a3s1dngqp2vcq0cdsbqf1lsyhygj2x4a93csr2iyn244zgxnx"; + version = "1.1.0.1"; + sha256 = "1b248ry96p1nyp21c3r9rd3awpdhpqrwj3s6d66pmjf8p0gl5vda"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; -- GitLab From 8cf5551b6ac1b127bc396928814593c6eac31bde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0930/5607] haskell-yesod: update to version 1.1.1.2 --- pkgs/development/libraries/haskell/yesod/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 10d8013f1b3..11bbc9bb6d7 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.1"; - sha256 = "0666g2ap6ignqif9vwis2bnsb45jb19llw9z20nsfs0q3wj8ykn3"; + version = "1.1.1.2"; + sha256 = "0gq4ijfjlkiqw4bp9hxs8r41vlhz33v5l9k1maqjy62d446lrgvw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { transformers unixCompat unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore yesodForm yesodJson yesodPersistent zlib ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; -- GitLab From 8029d18f7ac8655793a18898f4a9b561b5611b82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0931/5607] haskell-BNFC-meta: update to version 0.3.0.5 --- pkgs/development/tools/haskell/BNFC-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index 1b0397ead1b..d4a6090fb1e 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BNFC-meta"; - version = "0.3.0.3"; - sha256 = "06k8jnb4gw96gc0ffmczbywn4q2n87zwqa0pl0ada3ldvwaagv4l"; + version = "0.3.0.5"; + sha256 = "0blssa72r2ff4avbibw9a4p8gxy228f3lb1vc9aqr881v79b2cpp"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; noHaddock = true; meta = { -- GitLab From fc470f1d5a7716b333146d5ca79edd236269f49a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 0932/5607] haskell-alex-meta: update to version 0.3.0.4 --- pkgs/development/tools/haskell/alex-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 661c9c7895b..1b971f3b3df 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "alex-meta"; - version = "0.3.0.3"; - sha256 = "08w7z2iq2s557vi9kp2x8qp1lwvh49skffbjm8kxrf2bn2il5q48"; + version = "0.3.0.4"; + sha256 = "0d0ii1djigydj2papcilkr8mazp70vg6hy179h28j9i1bshp3anp"; buildDepends = [ haskellSrcMeta QuickCheck ]; noHaddock = true; meta = { -- GitLab From e6f26c5142ade55ea23574edf722f52b636b9213 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 8 Oct 2012 11:25:28 +0200 Subject: [PATCH 0933/5607] haskell-happy-meta: update to version 0.2.0.5 --- pkgs/development/tools/haskell/happy-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index 3b9a6d4c983..a3d885c6008 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happy-meta"; - version = "0.2.0.4"; - sha256 = "1s1inv2l2hwdlvypn6wpiadmi5y5mpcjawiqjb1hv0d8y43dpz54"; + version = "0.2.0.5"; + sha256 = "103hi87azqv11l8lq1rv0v9v88sl227g31snvkn8db6b4cfrwrxk"; buildDepends = [ haskellSrcMeta mtl ]; meta = { description = "Quasi-quoter for Happy parsers"; -- GitLab From 58afd436155c7e49a9096d6a70320e6d98603b77 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 8 Oct 2012 12:35:25 +0200 Subject: [PATCH 0934/5607] obnam: Update to version 1.2. Also update its dependencies (python libraries) --- pkgs/tools/backup/obnam/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 119633e0638..07b86c2e41e 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.1"; + name = "obnam-1.2"; namePrefix = ""; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.1.orig.tar.gz"; - sha256 = "763693e5ea4e8d6a63b1a16c2aacd5fe0dc97abc687c8f0dde5840f77d549349"; + url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.2.orig.tar.gz"; + sha256 = "33457452726d5c393d98c565b8e1ab3ac11276cc42bf67c4eee6c4e4ac9976d6"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7ce262649e..f511b64ceda 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3120,11 +3120,11 @@ let pythonPackages = python.modules // rec { }; cliapp = buildPythonPackage rec { - name = "cliapp-1.20120630"; + name = "cliapp-1.20120929"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120630.orig.tar.gz"; - sha256 = "6beeb1fb3077561540094584ce36055266ac67b80f158b9b82fe4075096f4716"; + url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120929.orig.tar.gz"; + sha256 = "30d5077e53b3e45f892b1c49feaaf4f47e4664400ed71435e77a82a2b823a0f8"; }; buildInputs = [ sphinx ]; @@ -3140,11 +3140,11 @@ let pythonPackages = python.modules // rec { }; tracing = buildPythonPackage rec { - name = "tracing-0.6"; + name = "tracing-0.7"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.6.orig.tar.gz"; - sha256 = "1164cf05891f9bca93fb87413f32d2c4da90348adbf69b0ad36a464b7adcd354"; + url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.7.orig.tar.gz"; + sha256 = "9954a1b0cc6b957d15975b048f929bbdd46766d397a6fa51bf8f6498b9459276"; }; buildInputs = [ sphinx ]; @@ -3160,11 +3160,11 @@ let pythonPackages = python.modules // rec { }; ttystatus = buildPythonPackage rec { - name = "ttystatus-0.19"; + name = "ttystatus-0.21"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.19.orig.tar.gz"; - sha256 = "7cc112a4783f2e0c354c5244f8e50b18733b5957677b56a755c1016e04c0c28d"; + url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.21.orig.tar.gz"; + sha256 = "4a1f3a41c9bd3b5d2bd8e6f093890857301e590aa1d428fc9a6dca591227244c"; }; buildInputs = [ sphinx ]; @@ -3180,11 +3180,11 @@ let pythonPackages = python.modules // rec { }; larch = buildPythonPackage rec { - name = "larch-1.20120527"; + name = "larch-1.20121006"; src = fetchurl rec { - url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20120527.orig.tar.gz"; - sha256 = "2865a1bfa6bd276bf746e8e7cb73d5199d0b6d00045d8c92e158626687d3bbe1"; + url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20121006.orig.tar.gz"; + sha256 = "b4482981010e9c22ee3fce6fdc664b8fc0a1a3a18ed30b40f247f3b44437ccfa"; }; buildInputs = [ sphinx ]; -- GitLab From 692ad8059a4d9e10e6310a2256ad8f618463844c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 15:05:00 +0200 Subject: [PATCH 0935/5607] chromium: Build using libexif from nixpkgs. While libexif has been bundled with chromium for some months already, they only recently added the GYP option to switch to using the system library. So, let's enable it. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b34e13c920e..c4dc413c0f5 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,6 +5,7 @@ , libevent, expat, libjpeg , libpng, libxml2, libxslt , xdg_utils, yasm, zlib +, libexif , python, perl, pkgconfig , nspr, udev, krb5 @@ -55,6 +56,7 @@ let use_system_flac = true; use_system_libevent = true; use_system_libexpat = true; + use_system_libexif = true; use_system_libjpeg = true; use_system_libpng = true; use_system_libxml = true; @@ -78,6 +80,7 @@ let libevent expat libjpeg libpng libxml2 libxslt xdg_utils yasm zlib + libexif ]; maybeSeccompPatch = let -- GitLab From 1983d4fdfc28640993dd00c1ceed0e87a09d345c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 8 Oct 2012 15:06:15 +0200 Subject: [PATCH 0936/5607] chromium: Build using libusb (1.0) from nixpkgs. This dependency has recently been added to chromium while we didn't notice it, so let's avoid to use the bundled version. It might make sense to remove the unneeded files in third_party/ based on a whitelist, so that we notice future changes like this earlier. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c4dc413c0f5..1ea854c5e9d 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg , libpng, libxml2, libxslt , xdg_utils, yasm, zlib -, libexif +, libusb1, libexif , python, perl, pkgconfig , nspr, udev, krb5 @@ -59,6 +59,7 @@ let use_system_libexif = true; use_system_libjpeg = true; use_system_libpng = true; + use_system_libusb = true; use_system_libxml = true; use_system_speex = true; use_system_ssl = cfg.openssl; @@ -80,7 +81,7 @@ let libevent expat libjpeg libpng libxml2 libxslt xdg_utils yasm zlib - libexif + libusb1 libexif ]; maybeSeccompPatch = let -- GitLab From 1c3ed1b8d401b01c89e104778b5ea3f4bc0434a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 14:20:30 -0400 Subject: [PATCH 0937/5607] gtk+: Update to 3.2.4 --- pkgs/development/libraries/gtk+/3.2.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index df59c017626..9f333c03fab 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-3.2.3"; + name = "gtk+-3.2.4"; src = fetchurl { - url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz; - sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2"; + url = "mirror://gnome/sources/gtk+/3.2/${name}.tar.xz"; + sha256 = "f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd"; }; enableParallelBuilding = true; -- GitLab From f32979e2d8de33f83404e68d357cb2257350bd90 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 14:43:42 -0400 Subject: [PATCH 0938/5607] Revert "cups: Drop unused dependencies and add libusb1 dependency" This reverts commit 6f700142c4a5794b349e6233c3e964a3de15407e. --- pkgs/misc/cups/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index bf55182058b..63018380580 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, zlib, pam, openssl, dbus, libusb1, acl }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl +, dbus, libusb, acl }: let version = "1.6.1"; in @@ -12,7 +13,7 @@ stdenv.mkDerivation { sha256 = "143pk8a0kqqr7m9j0b8c9h2nn0zf6awpivk7wq7iclz68h8snhjq"; }; - buildInputs = [ pkgconfig zlib libusb1 ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; propagatedBuildInputs = [ openssl ]; -- GitLab From 318202951e8396e0fc1c8c6e49fcba0c1d2e27bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 14:43:47 -0400 Subject: [PATCH 0939/5607] Revert "Remove cups-pdf-filter" This reverts commit 006002d16f24068668fef77ea8b2f3c653d22b4d. --- pkgs/misc/cups/pdf-filter.nix | 39 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/misc/cups/pdf-filter.nix diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix new file mode 100644 index 00000000000..8a08eadc6a4 --- /dev/null +++ b/pkgs/misc/cups/pdf-filter.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, cups, poppler }: + +stdenv.mkDerivation { + name = "cups-pdf-filter-${cups.version}"; + + inherit (cups) src; + + buildInputs = [ pkgconfig cups poppler ]; + + preConfigure = '' + sed -e 's@\.\./cups/$(LIBCUPS)@@' -e 's@$(LIBCUPSIMAGE)@@' -i filter/Makefile + ''; + + NIX_LDFLAGS="-L${cups}/lib"; + + configureFlags = '' + --localstatedir=/var --enable-dbus + --enable-image --with-pdftops=pdftops''; + + buildPhase = '' + cd filter + make pdftops + ''; + + installPhase = '' + mkdir -pv $out/lib/cups/filter $out/share/cups/mime + cp -v pdftops $out/lib/cups/filter + echo >$out/share/cups/mime/pdftops.convs 'application/pdf application/vnd.cups-postscript 66 pdftops' + ''; + + + meta = { + homepage = http://www.cups.org/; + description = "Image and pdf filters for CUPS"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0704abb5796..153da2fd227 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8691,6 +8691,8 @@ let cups = callPackage ../misc/cups { }; + cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; + gutenprint = callPackage ../misc/drivers/gutenprint { }; gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; -- GitLab From f5e0a05f80c7a0d298f2b20a8edc27116996652f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 14:43:49 -0400 Subject: [PATCH 0940/5607] Revert "cups: Update to 1.6.1" This reverts commit 5046d0628f1ec187b56fd847fd5dc1a41d04df50. --- pkgs/misc/cups/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 63018380580..bf4e4d1d7e5 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let version = "1.6.1"; in - +let + version = "1.5.2"; +in stdenv.mkDerivation { name = "cups-${version}"; @@ -10,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "143pk8a0kqqr7m9j0b8c9h2nn0zf6awpivk7wq7iclz68h8snhjq"; + sha256 = "1yw7l5rq93zg91akqf68b871frrs4q0krc9cx43ly7v3ih8all5i"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] -- GitLab From c961c840f6e7c475daeaa47c896b15f7c7fdcf87 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 14:50:19 -0400 Subject: [PATCH 0941/5607] cups: Update to 1.5.4 --- pkgs/misc/cups/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index bf4e4d1d7e5..f19298e7ccd 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl -, dbus, libusb, acl }: +, dbus, libusb1, acl }: + +let version = "1.5.4"; in -let - version = "1.5.2"; -in stdenv.mkDerivation { name = "cups-${version}"; @@ -11,10 +10,10 @@ stdenv.mkDerivation { src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1yw7l5rq93zg91akqf68b871frrs4q0krc9cx43ly7v3ih8all5i"; + md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; }; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] + buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ] ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ; propagatedBuildInputs = [ openssl ]; -- GitLab From a779d2ba18d3e4530c14f8ff5eae78d914e40af8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 14:52:06 -0400 Subject: [PATCH 0942/5607] foomatic-filters: Update to 4.0.12 --- pkgs/misc/drivers/foomatic-filters/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 867f4f440d5..ff03770014d 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, perl, cups, coreutils, gnused }: +{ stdenv, fetchurl, pkgconfig, perl, cups, dbus }: stdenv.mkDerivation rec { - name = "foomatic-filters-4.0.6"; + name = "foomatic-filters-4.0.12"; src = fetchurl { url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz"; - sha256 = "0wa9hlq7s99sh50kl6bj8j0vxrz7pcbwdnqs1yfjjhqshfh7hsav"; + sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8"; }; - buildInputs = [ perl cups ]; + buildInputs = [ pkgconfig perl cups dbus ]; preConfigure = '' -- GitLab From 90d9f8ec1883ac10266a2c0c70d7b15566c81bfa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 15:15:05 -0400 Subject: [PATCH 0943/5607] Update xcb-proto and libxcb --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/tarballs-7.7.list | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 847ffb92ba0..28eb2a1b8e4 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -888,11 +888,11 @@ let })) // {inherit ;}; libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { - name = "libxcb-1.8.1"; + name = "libxcb-1.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libxcb-1.8.1.tar.bz2; - sha256 = "03gspxcdl8r7jwbwg7fyp4cc6zic9z91amp4g5z0wwahx48nix6j"; + url = mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2; + sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1138,11 +1138,11 @@ let })) // {inherit ;}; xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) { - name = "xcb-proto-1.7.1"; + name = "xcb-proto-1.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2; - sha256 = "0ds4qg6slidrzyz6q9ckq0a19hn6blzpnvciy4brh741gn49jpdd"; + url = mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2; + sha256 = "1c11652h9sjynw3scm1pn5z3a6ci888pq7hij8q5n8qrl33icg93"; }; buildInputs = [pkgconfig python ]; })) // {inherit python ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 1560e4bfd28..81fab682bfc 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -60,7 +60,7 @@ mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libxcb-1.8.1.tar.bz2 +mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 @@ -103,7 +103,7 @@ mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2 mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xcb-proto-1.7.1.tar.bz2 +mirror://xorg/individual/xcb/xcb-proto-1.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2 -- GitLab From 18c0bca167484f2b30e8d5df4047edc27f12d5d1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 9 Oct 2012 11:02:06 +0400 Subject: [PATCH 0944/5607] Fix some of the debian-devscripts shell references --- pkgs/tools/misc/debian-devscripts/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index e8a8abea91d..ddf30f342d1 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* ''; postInstall = '' + sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* for i in "$out/bin"/*; do wrapProgram "$i" \ --prefix PERL5LIB : "$PERL5LIB" \ -- GitLab From 27cadaa404b3aa4df8ff4bdab3e09d442715e299 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 9 Oct 2012 11:40:06 +0200 Subject: [PATCH 0945/5607] Added package for netbeans IDE --- .../applications/editors/netbeans/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/editors/netbeans/default.nix diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix new file mode 100644 index 00000000000..dccc92a91f5 --- /dev/null +++ b/pkgs/applications/editors/netbeans/default.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, oraclejdk, unzip, which, makeWrapper, makeDesktopItem}: + +let + desktopItem = makeDesktopItem { + name = "netbeans"; + exec = "netbeans"; + comment = "Integrated Development Environment"; + desktopName = "Netbeans IDE"; + genericName = "Integrated Development Environment"; + categories = "Application;Development;"; + }; +in +stdenv.mkDerivation { + name = "netbeans-7.2"; + src = fetchurl { + url = http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-ml.zip; + sha256 = "18ya1w291hdnc35vb12yqnai82wmqm7351wn82fax12kzha5fmci"; + }; + buildCommand = '' + # Unpack and copy the stuff + unzip $src + mkdir -p $out + cp -a netbeans $out + + # Create a wrapper capable of starting it + mkdir -p $out/bin + makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ + --prefix PATH : ${oraclejdk}/bin:${which}/bin + + # Create desktop item, so we can pick it from the KDE/GNOME menu + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + buildInputs = [ unzip makeWrapper ]; + + meta = { + description = "An integrated development environment for Java, C, C++ and PHP"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcb7a356a25..ddca30bfa9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7450,6 +7450,8 @@ let navit = callPackage ../applications/misc/navit { }; + netbeans = callPackage ../applications/editors/netbeans { }; + ncdu = callPackage ../tools/misc/ncdu { }; nedit = callPackage ../applications/editors/nedit { -- GitLab From 759f17d7d007fd63f0e4aaa74aef25f151b9de76 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Tue, 9 Oct 2012 14:46:16 +0200 Subject: [PATCH 0946/5607] Drop eelco as a maintaner due copy&paste --- pkgs/desktops/xfce-4.8/art/xfce4-themes.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix b/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix index b173d33780d..b462b3ccd7b 100644 --- a/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix +++ b/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix @@ -14,6 +14,5 @@ stdenv.mkDerivation rec { homepage = http://www.xfce.org/; description = "Themes for Xfce"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; }; } -- GitLab From 332c6de7367fe145e9df4faae2899216b8d51937 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 9 Oct 2012 13:18:46 +0200 Subject: [PATCH 0947/5607] linux-3.0: upgrade to 3.0.45 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index def318a1f3a..cc6fd89e46e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.43"; + version = "3.0.45"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1mrsdqsphkixvd5x97nz465r490hr679rq6f98jbyr0g5m4fyc29"; + sha256 = "0mgv6iqnfam16v2s8hdxpf2imx49sjhndjc80646lk9053l5rh0d"; }; config = configWithPlatform stdenv.platform; -- GitLab From 76aa428ac6306bd26b8d940dda2377894ba669f4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 9 Oct 2012 13:19:04 +0200 Subject: [PATCH 0948/5607] linux-3.4: upgrade to 3.4.13 --- 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 dbff9bba07e..e79bb111a3d 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.11"; + version = "3.4.13"; 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 = "0fda9z5dxvn8sbgr1c143ly8ixm0grymwm4r94nryby9i03s03a2"; + sha256 = "16wpnqnjxcrm2aszjdkrn4vlcdm9j35ixnq7myvc432w7pkdqk11"; }; config = configWithPlatform stdenv.platform; -- GitLab From 2f39ec92e3979ba526462a3ea55eaa7f90e246cf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 9 Oct 2012 13:19:42 +0200 Subject: [PATCH 0949/5607] linux-3.5: upgrade to 3.5.6 --- 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 9bcc6514f49..a5d375a68a7 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.4"; + version = "3.5.6"; 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 = "09pi00sk55rpl4mbhd27mnfajgy22bm0zwcgi68iyilc5wir1m12"; + sha256 = "0z6hklmpm33d1cjwzsny5s03kajp9zmdgxhfrd0aky98x36202gf"; }; config = configWithPlatform stdenv.platform; -- GitLab From 8f480e3035f5d36212e99f2ff4b73f8e339b8439 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 9 Oct 2012 13:21:19 +0200 Subject: [PATCH 0950/5607] linux-3.6: upgrade to 3.6.1 - enable aufs3 patch - check other patches needing upgrade/enable --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 5 ++--- pkgs/os-specific/linux/kernel/patches.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 5f23928ebc9..8afcffba87f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,8 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6"; - modDirVersion = "3.6.0"; + version = "3.6.1"; testing = false; preConfigure = '' @@ -254,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0kvqj6bhzcq581aav8mjzzxisz7s5vwng7b5kwzp2d8p3kpsdfaa"; + sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a7f737d65e7..4fb7563c9a1 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -189,6 +189,21 @@ rec { features.aufs3 = true; }; + # not officially released yet, but 3.x seems to work fine + aufs3_6 = rec { + name = "aufs3.6"; + version = "3.x.20120827"; + utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; + utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "46660ad144289fa1f0aca59bd00d592b560d0dbb"; + sha256 = "823b7b4c011c103d63711900b3213008de3c9e408b909e0cc2b8697c1e82b67d"; + }; + 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 = @@ -226,6 +241,7 @@ rec { patch = ./dell-rfkill.patch; }; + # seems no longer necessary on 3.6 perf3_5 = { name = "perf-3.5"; patch = ./perf-3.5.patch; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddca30bfa9b..e0eeb7ecb01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5870,8 +5870,7 @@ let kernelPatches = [ kernelPatches.sec_perm_2_6_24 -# kernelPatches.aufs3_5 -# kernelPatches.perf3_5 + kernelPatches.aufs3_6 ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill -- GitLab From 10462c7a820e9c4e34a3b618c8b3383aacb0888e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 9 Oct 2012 14:08:17 +0200 Subject: [PATCH 0951/5607] btrfsprogs: upgrade to current version (0.20 pre) --- pkgs/tools/filesystems/btrfsprogs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 861bacd46c2..4c1963f4633 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }: -let version = "0.19-20120328"; in +let version = "0.20pre20121005"; in stdenv.mkDerivation { name = "btrfs-progs-${version}"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"; - rev = "1957076ab4fefa47b6efed3da541bc974c83eed7"; - sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1"; + rev = "91d9eec1ff044394f2b98ee7fcb76713dd33b994"; + sha256 = "72d4cd4fb23d876a17146d6231ad40a2151fa47c648485c54cf7478239b43764"; }; buildInputs = [ zlib libuuid acl attr e2fsprogs ]; -- GitLab From da8b2dfcc74cec1b4cfbd4a4b69db17b4d162f8e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 9 Oct 2012 15:49:51 +0200 Subject: [PATCH 0952/5607] samba: upgrade to 3.6.8 --- pkgs/servers/samba/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 7a73a041798..7952c73f48c 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -18,11 +18,11 @@ assert useKerberos -> kerberos != null; stdenv.mkDerivation rec { - name = "samba-3.6.7"; + name = "samba-3.6.8"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "1jnl9v6axz30ymh6in1fwan7zjy9n5n7x70vi1afazxs27qa0n5q"; + sha256 = "1phl6mmrc72jyvbyrw6cv6b92cxq3v2pbn1fh97nnb4hild1fnjg"; }; patches = @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { '' mkdir -p $out mv $TMPDIR/inst/$out/* $out/ - + mkdir -pv $out/lib/cups/backend ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb mkdir -pv $out/etc/openldap/schema -- GitLab From da52aeefadef9f42651ebbc5a744261b17c1dc9d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 9 Oct 2012 16:41:01 +0200 Subject: [PATCH 0953/5607] Bump MySQL java connector version to 5.1.22 --- pkgs/servers/sql/mysql/jdbc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 0f411b43f9f..07c4d6a0aba 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation { - name = "mysql-connector-java-5.1.17"; + name = "mysql-connector-java-5.1.22"; builder = ./builder.sh; src = fetchurl { - url = ftp://mirror.leaseweb.com/mysql/Downloads/Connector-J/mysql-connector-java-5.1.17.zip; - sha256 = "1c4hsx0qwb3rp66a1dllnah2zi9gqqnr4aqm9p59yrqj5jr22ldp"; + url = http://cdn.mysql.com/Downloads/Connector-J/mysql-connector-java-5.1.22.zip; + sha256 = "0hfx1znq0iqclkc8visca7x67lvlk3cswni69ghi2c5cpa2d4ijm"; }; buildInputs = [ unzip ant ]; -- GitLab From 85398493bf4edcdda3ce50f3b546c2c41027ce5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 9 Oct 2012 17:01:55 +0200 Subject: [PATCH 0954/5607] go: updating to 1.0.3 --- pkgs/development/compilers/go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 1d9765539bf..60ea7981931 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation { - name = "go-1.0.2"; + name = "go-1.0.3"; src = fetchurl { - url = http://go.googlecode.com/files/go1.0.2.src.tar.gz; - sha256 = "1a4mpkb3bd9dwp0r3fgrfcyk5lgw0f0cfrbskg2lrhc7a12zpz3h"; + url = http://go.googlecode.com/files/go1.0.3.src.tar.gz; + sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz"; }; buildInputs = [ bison glibc bash makeWrapper ]; -- GitLab From 5150b55bf21e39ae6a7513b8bd7541ff6a4afb64 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 9 Oct 2012 11:11:19 -0400 Subject: [PATCH 0955/5607] openjdk: Add lib{fontconfig,Xcursor,Xinerama} to rpaths. --- pkgs/development/compilers/openjdk/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 56daf43595d..0aaa275ccc5 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -17,6 +17,9 @@ , libXrender , libXtst , libXi +, libXinerama +, libXcursor +, fontconfig , cpio , jreOnly ? false }: @@ -82,8 +85,13 @@ stdenv.mkDerivation rec { libXrender libXtst libXi + libXinerama + libXcursor + fontconfig ]; + NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; + postUnpack = '' mkdir -p drops cp ${jaxp_src} drops/${jaxp_src_name} -- GitLab From 58082f0acb922f84f3747269486dd0d5961c2bdb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 11:23:56 -0400 Subject: [PATCH 0956/5607] libgnomecups: Fix build http://hydra.nixos.org/build/3149255 --- .../desktops/gnome-2/platform/libgnomecups/default.nix | 10 +++++----- .../gnome-2/platform/libgnomeprint/default.nix | 10 ++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 0521ce9058f..9a0afd1275d 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: -let +stdenv.mkDerivation rec { name = "libgnomecups-0.2.3"; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { url = "mirror://gnome/sources/libgnomecups/0.2/${name}.tar.bz2"; sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; }; + patches = [ ./glib.patch ]; + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; + propagatedBuildInputs = [ libxml2 ]; } diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 410e408baa3..0b6d3e25e2e 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -1,11 +1,8 @@ -{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison, -flex }: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl +, libgnomecups, bison, flex }: -let +stdenv.mkDerivation rec { name = "libgnomeprint-2.18.8"; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { url = "mirror://gnome/sources/libgnomeprint/2.18/${name}.tar.bz2"; @@ -15,5 +12,6 @@ stdenv.mkDerivation { patches = [ ./bug653388.patch ]; buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; + propagatedBuildInputs = [ libxml2 ]; } -- GitLab From 4eb7fa7c9aea61faad3b5a823fe2a5d6dd27213b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 11:24:21 -0400 Subject: [PATCH 0957/5607] goffice: Update to 0.8.17 Fixes http://hydra.nixos.org/build/3149255 --- pkgs/development/libraries/goffice/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index b90cbbad920..1eaa1baf86d 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,19 +1,18 @@ { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 , pango, libgsf, libxml2, libart, intltool, gettext -, cairo, gconf, libgnomeui }: +, cairo, gconf, libgnomeui, pcre }: stdenv.mkDerivation rec { - name = "goffice-0.6.6"; + name = "goffice-0.8.17"; src = fetchurl { - # An old version, but one that's actually usable for Gnucash. - url = "mirror://gnome/sources/goffice/0.6/${name}.tar.bz2"; - sha256 = "11lzhmk7g6mdsbyn4p4a6q2d9m8j71vad2haw6pmzyjzv2gs4rq7"; + url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz"; + sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15"; }; buildInputs = [ pkgconfig libglade bzip2 libart intltool gettext - gconf libgnomeui + gconf libgnomeui pcre ]; propagatedBuildInputs = [ @@ -21,6 +20,12 @@ stdenv.mkDerivation rec { glib libgsf libxml2 gtk libglade libart cairo pango ]; + postInstall = + '' + # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig. + substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires + ''; + doCheck = true; meta = { -- GitLab From b713d13bb48ac937570f1568b04ca777b7f67be4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 11:24:38 -0400 Subject: [PATCH 0958/5607] gnucash: Update to 2.4.11 --- pkgs/applications/office/gnucash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index a2c3ed5d6ba..26879a6f660 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -9,11 +9,11 @@ */ stdenv.mkDerivation rec { - name = "gnucash-2.4.10"; + name = "gnucash-2.4.11"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "1k76b6hnsmljggxsq5l9w94krfmhx58ij8jcxf72p0ddnlimdrjj"; + sha256 = "0qbpgd6spclkmwryi66cih0igi5a6pmsnk41mmnscpfpz1mddhwk"; }; buildInputs = [ -- GitLab From f81a86d4b965655c48ef80d1d5a66eb3b7816ffd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 11:28:38 -0400 Subject: [PATCH 0959/5607] loudmouth: Fix building with the latest glib http://hydra.nixos.org/build/3148780 --- .../libraries/loudmouth/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index ffa3ebdef92..ae9f3fc6c18 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,16 +1,22 @@ -{stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib}: +{ stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "loudmouth-1.4.3"; - + src = fetchurl { - url = mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2; + url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2"; md5 = "55339ca42494690c3942ee1465a96937"; }; - + + patches = [ ./glib-2.32.patch ]; + configureFlags = "--with-ssl=openssl"; - - propagatedBuildInputs = [openssl libidn glib zlib]; - - buildInputs = [pkgconfig]; + + propagatedBuildInputs = [ openssl libidn glib zlib ]; + + buildInputs = [ pkgconfig ]; + + meta = { + description = "A lightweight C library for the Jabber protocol"; + }; } -- GitLab From a1300037d222714b1a58f2ea9072fefcbbb118f2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 11:34:02 -0400 Subject: [PATCH 0960/5607] glib: Propagate pcre http://hydra.nixos.org/build/3150785 --- pkgs/development/libraries/glib/2.34.x.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/2.34.x.nix index 6925571020c..904647721dd 100644 --- a/pkgs/development/libraries/glib/2.34.x.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -20,14 +20,11 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ pcre ] - ++ (if libiconvOrNull != null - then [ libiconvOrNull ] - else []); + buildInputs = [ libiconvOrNull ]; buildNativeInputs = [ perl pkgconfig gettext python ]; - propagatedBuildInputs = [ zlib libffi ]; + propagatedBuildInputs = [ pcre zlib libffi ]; configureFlags = "--with-pcre=system --disable-fam"; -- GitLab From 54aea93a845b8533fa540ab84c198b690a7da230 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 12:10:45 -0400 Subject: [PATCH 0961/5607] inkscape: Update to 0.48.3.1 http://hydra.nixos.org/build/3151653 --- pkgs/applications/graphics/inkscape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 9ef5382eaf9..150bb071cb1 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -4,11 +4,11 @@ , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }: stdenv.mkDerivation rec { - name = "inkscape-0.48.2"; + name = "inkscape-0.48.3.1"; src = fetchurl { url = "mirror://sourceforge/inkscape/${name}.tar.bz2"; - sha256 = "10v7ixdz7f8vgk2wv0m81zli9p0f446cm1f4aqlvni1ndsx44fi2"; + sha256 = "126vfsafkfj6z65i5vp6g5dg9hvp3dd1zppjhms78257ns2zafq7"; }; patches = [ ./configure-python-libs.patch ./libpng-1.5.patch ]; -- GitLab From 0b056a06a06430c1340e046ef01ffaf61de79d65 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 12:41:24 -0400 Subject: [PATCH 0962/5607] VirtualBox-GuestAdditions: Install drivers for X.org server 1.12 --- .../virtualization/virtualbox/guest-additions/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 63939cc5e65..8c92b5e0ed3 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -5,11 +5,14 @@ let version = "4.2.0"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; + src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3"; }; + KERN_DIR = "${kernel}/lib/modules/*/build"; + buildInputs = [ patchelf cdrkit makeWrapper ]; installPhase = '' @@ -101,9 +104,7 @@ stdenv.mkDerivation { # Install Xorg drivers 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/vboxvideo_drv_112.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so # Install kernel modules cd src -- GitLab From 156e1f1e1fb9feaf88044ce05d2cefaa7642fd92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 8 Oct 2012 17:26:02 -0400 Subject: [PATCH 0963/5607] Add psqlodbc for iodbc --- .../sql/postgresql/psqlodbc/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/psqlodbc/default.nix diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix new file mode 100644 index 00000000000..ce57c214183 --- /dev/null +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libiodbc, postgresql, openssl }: + +stdenv.mkDerivation rec { + name = "psqlodbc-09.01.0200"; + + src = fetchurl { + url = "http://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; + }; + + buildInputs = [ libiodbc postgresql openssl ]; + + configureFlags = "--with-iodbc=${libiodbc}"; + + meta = { + homepage = http://psqlodbc.projects.postgresql.org/; + description = "ODBC driver for PostgreSQL"; + license = "LGPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0eeb7ecb01..2524a05ded2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5431,6 +5431,10 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; + psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { + postgresql = postgresql91; + }; + pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) { inherit xmpppy pythonIRClib python makeWrapper; }; -- GitLab From 29d3112ee9591645d58f6be48fb2982386488302 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Sat, 6 Oct 2012 12:42:09 +0200 Subject: [PATCH 0964/5607] Rename plowshare-git to plowshare --- pkgs/tools/misc/plowshare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index d98dc33478a..4634585cbd2 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "plowshare-${version}"; - version = "git20120916"; + version = "20120916"; src = fetchurl { - url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz"; + url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${version}.tar.gz"; sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067"; }; -- GitLab From c3e12acb5a0a48522de1073ab61be56381397d63 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 Sep 2012 21:22:20 +0200 Subject: [PATCH 0965/5607] Update extlib to version 1.5.2 --- pkgs/development/ocaml-modules/extlib/default.nix | 9 ++++----- .../extlib/hashtable-ocaml4-compat.patch | 12 ------------ 2 files changed, 4 insertions(+), 17 deletions(-) delete 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 a520f8196d8..d59dbae45fe 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -4,11 +4,10 @@ stdenv.mkDerivation { name = "ocaml-extlib-1.5.2"; src = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz"; - sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa"; + url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; }; - patches = [ ./hashtable-ocaml4-compat.patch ]; buildInputs = [ocaml findlib]; createFindlibDestdir = true; @@ -19,9 +18,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://code.google.com/p/ocaml-extlib/"; + homepage = http://code.google.com/p/ocaml-extlib/; description = "Enhancements to the OCaml Standard Library modules"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch deleted file mode 100644 index c587f2b6cd3..00000000000 --- a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 -- GitLab From 3989f09ae660d625dae036f06ef2a90649072ff9 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 Sep 2012 21:23:33 +0200 Subject: [PATCH 0966/5607] Update ounit to version 1.1.2 --- pkgs/development/ocaml-modules/ounit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 8f21ba649bf..533f1ec8d1c 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ounit-1.1.0"; + name = "ounit-1.1.2"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz; - sha256 = "12vybg9xlw5c8ip23p8cljfzhkdsm25482sf1yh46fcqq8p2jmqx"; + url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz; + sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3"; }; buildInputs = [ocaml findlib]; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; description = "Unit test framework for OCaml"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z -- GitLab From a0904241158a0e8798fd8fb4fad4446bbf342940 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 Sep 2012 21:40:17 +0200 Subject: [PATCH 0967/5607] Update ocamlnet to version 3.6. (Does not compile under 4.00.0 though.) --- pkgs/development/ocaml-modules/ocamlnet/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index e4dc43743f3..4d9e934b628 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -2,15 +2,14 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "3.1"; in stdenv.mkDerivation { - name = "ocamlnet-${version}"; + name = "ocamlnet-3.6"; src = fetchurl { - url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "0kdc2540ad84j6haj9jxlwryz9cb8q8kjdr48f2wgvcaii38v9f5"; + url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz; + sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69"; }; buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl]; -- GitLab From 2221bf0593c68cfbcb53a75fed16867b6cbf4bd8 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 Sep 2012 21:54:00 +0200 Subject: [PATCH 0968/5607] Update camlp5 to 6.06. --- .../tools/ocaml/camlp5/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 315bca38f36..74b3368293c 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -2,28 +2,18 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - pname = "camlp5"; - version = "6.02.3"; - webpage = http://pauillac.inria.fr/~ddr/camlp5/; metafile = ./META; in stdenv.mkDerivation { - name = "${pname}${if transitional then "_transitional" else ""}-${version}"; + name = "camlp5${if transitional then "_transitional" else ""}-6.06"; src = fetchurl { - url = "${webpage}/distrib/src/${pname}-${version}.tgz"; - sha256 = "1z9bwh267117br0vlhirv9yy2niqp2n25zfnl14wg6kgg9bqx7rj"; + url = http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz; + sha256 = "763f89ee6cde4ca063a50708c3fe252d55ea9f8037e3ae9801690411ea6180c5"; }; - patches = fetchurl { - url = "${webpage}/distrib/src/patch-${version}-1"; - sha256 = "159qpvr07mnn72yqwx24c6mw7hs6bl77capsii7apg9dcxar8w7v"; - }; - - patchFlags = "-p 0"; - buildInputs = [ ocaml ]; prefixKey = "-prefix "; @@ -41,8 +31,8 @@ stdenv.mkDerivation { Camlp5 is a preprocessor and pretty-printer for OCaml programs. It also provides parsing and printing tools. ''; - homepage = "${webpage}"; - license = "BSD"; + homepage = http://pauillac.inria.fr/~ddr/camlp5/; + license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z -- GitLab From e32567bcf75361a4b60093c8da8f0634029ddd68 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Mon, 8 Oct 2012 00:05:48 +0200 Subject: [PATCH 0969/5607] OCaml 4.00.1 --- pkgs/development/compilers/ocaml/{4.00.0.nix => 4.00.1.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/compilers/ocaml/{4.00.0.nix => 4.00.1.nix} (95%) diff --git a/pkgs/development/compilers/ocaml/4.00.0.nix b/pkgs/development/compilers/ocaml/4.00.1.nix similarity index 95% rename from pkgs/development/compilers/ocaml/4.00.0.nix rename to pkgs/development/compilers/ocaml/4.00.1.nix index e25654a2481..d7c14e031b3 100644 --- a/pkgs/development/compilers/ocaml/4.00.0.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { - name = "ocaml-4.00.0"; + name = "ocaml-4.00.1"; src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-4.00/${name}.tar.bz2"; - sha256 = "ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7"; + sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; prefixKey = "-prefix "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2524a05ded2..3b0c1de13cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2442,7 +2442,7 @@ 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 { }; + ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { }; metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; -- GitLab From 34ff91d6028445371599ccc4c1b8a77724fb3c95 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 14:20:44 -0400 Subject: [PATCH 0970/5607] nginx: Update to 1.2.4 --- pkgs/servers/http/nginx/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 4a1c0be649f..5c0b1c2d723 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,10 +1,13 @@ { stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }: + stdenv.mkDerivation rec { - name = "nginx-1.1.7"; + name = "nginx-1.2.4"; + src = fetchurl { url = "http://nginx.org/download/${name}.tar.gz"; - sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51"; + sha256 = "0hvcv4lgfcrsl40azkd3rxhf73l05jzzgflclpkdvjd95xgw51y5"; }; + buildInputs = [ openssl zlib pcre libxml2 libxslt ]; configureFlags = [ @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { "--with-http_gzip_static_module" "--with-http_secure_link_module" # Install destination problems - # "--with-http_perl_module" + # "--with-http_perl_module" ]; preConfigure = '' @@ -27,11 +30,8 @@ stdenv.mkDerivation rec { ''; meta = { - description = "nginx - 'engine x' - reverse proxy and lightweight webserver"; - maintainers = [ - stdenv.lib.maintainers.raskin - ]; - platforms = with stdenv.lib.platforms; - all; + description = "A reverse proxy and lightweight webserver"; + maintainers = [ stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.all; }; } -- GitLab From 5dbe17f315fa49af6c8667d7f51acd6ac18e31e7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 9 Oct 2012 22:53:38 +0200 Subject: [PATCH 0971/5607] darktable: Update to version 1.0.5 --- pkgs/applications/graphics/darktable/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 4d3b1a12b62..15d7042e7dd 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,17 +3,17 @@ , libgnome_keyring, gphoto2, gtk, ilmbase, intltool, lcms, lcms2 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg , libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb -, openexr, pixman, pkgconfig, sqlite }: +, openexr, pixman, pkgconfig, sqlite, bash }: assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.0"; + version = "1.0.5"; name = "darktable-${version}"; src = fetchurl { url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz"; - sha256 = "0wjv2x62kf25db61ivbn8y8xr9hr8hdlcjq6l1qxfqn2bn8a3qkm"; + sha256 = "0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd"; }; buildInputs = @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR" + + substituteInPlace tools/create_preferences.sh.in --replace '#!/usr/bin/env bash' '#!${bash}/bin/bash' ''; cmakeFlags = [ -- GitLab From 44da496dcf0b6e7829ae340c85ba56463e40eb1d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 17:06:57 -0400 Subject: [PATCH 0972/5607] Forgot to add some files --- .../gnome-2/platform/libgnomecups/glib.patch | 38 +++++++++++++++++++ .../libraries/loudmouth/glib-2.32.patch | 13 +++++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch create mode 100644 pkgs/development/libraries/loudmouth/glib-2.32.patch diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch b/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch new file mode 100644 index 00000000000..3f73af861c0 --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/glib.patch @@ -0,0 +1,38 @@ +From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sun, 27 Nov 2011 21:36:41 +0100 +Subject: [PATCH] Fix: Only glib.h can be included + +--- + libgnomecups/gnome-cups-i18n.c | 2 +- + libgnomecups/gnome-cups-init.h | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c +index 8987c5c..127756d 100644 +--- a/libgnomecups/gnome-cups-i18n.c ++++ b/libgnomecups/gnome-cups-i18n.c +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include "gnome-cups-i18n.h" + + #ifdef ENABLE_NLS +diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h +index 22b682a..c4600fc 100644 +--- a/libgnomecups/gnome-cups-init.h ++++ b/libgnomecups/gnome-cups-init.h +@@ -1,8 +1,7 @@ + #ifndef GNOME_CUPS_INIT + #define GNOME_CUPS_INIT + +-#include +-#include ++#include + + G_BEGIN_DECLS + +-- +1.7.7 + diff --git a/pkgs/development/libraries/loudmouth/glib-2.32.patch b/pkgs/development/libraries/loudmouth/glib-2.32.patch new file mode 100644 index 00000000000..87fc170c80d --- /dev/null +++ b/pkgs/development/libraries/loudmouth/glib-2.32.patch @@ -0,0 +1,13 @@ +Index: loudmouth-1.4.3/loudmouth/lm-error.c +=================================================================== +--- loudmouth-1.4.3.orig/loudmouth/lm-error.c ++++ loudmouth-1.4.3/loudmouth/lm-error.c +@@ -19,7 +19,7 @@ + */ + + #include +-#include ++#include + #include "lm-error.h" + + /** -- GitLab From b949359a140df37586a29b9f8f1d0ffe1bd91c0d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 10 Oct 2012 00:20:16 +0200 Subject: [PATCH 0973/5607] probable fix for failing hydra build since e32567bcf75361a4b60093c8da8f0634029ddd68 (ocaml_4_00_0 not found). I'm not an ocaml user so I don't understand the implications of my change. It is only meant to get the nix expressions valid again. --- 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 3b0c1de13cb..5ba86bc6dc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2541,7 +2541,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; + ocamlPackages_4_00_0 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_0; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; -- GitLab From abf60bdb08e509dda5e95ce13f606e7586dacdfc Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 9 Oct 2012 23:18:50 -0700 Subject: [PATCH 0974/5607] Upgrade firmware-linux-nonfree to 0.36, because the last version disappeared from the Debian mirrors. --- .../firmware-linux-nonfree/default.nix | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index e2ba47abb9a..f6173fcf5f5 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -6,25 +6,26 @@ { stdenv, fetchurl, buildEnv, dpkg }: let - version = "0.35"; + version = "0.36"; + packages = [ - { name = "linux-nonfree"; sha256 = "8c0701500e5252e3e05ad0e5403cc5295899ccb2d6d731380b5f4c2d90003ed1"; } - { name = "atheros"; sha256 = "df411d76e3d55cb256b0974df16cf18f316c1325f33670fbc9e36abba5aa46c0"; } - { name = "bnx2"; sha256 = "124e74aa6ce477f7b6a0b5eff3870b0104fd885b4bdfb9977175e75bdb9a7525"; } - { name = "bnx2x"; sha256 = "4cbcf3422a9aaa6e31704770c724179765dceabd2e6867e24cf47039925e6545"; } - { name = "brcm80211"; sha256 = "eefba7ba31c018d514ea15878cfd7bca36a65b0df3e9024fc3875a990678a684"; } - { name = "intelwimax"; sha256 = "436a3bd128224f43988630318aa3e74abfbe838916e1e10a602ddc468b75d843"; } - { name = "ipw2x00"; sha256 = "9c214e3a9f7f7d710b5cb30282d5ca2b2ccafc3bb208dfe7e18de16d3aadc7a3"; } - { name = "ivtv"; sha256 = "ced47d8b87ff8ff70a8c32492cc4fb5818860ef018b5c04a4415ab26c9b16300"; } - { name = "iwlwifi"; sha256 = "5d9615ec128b59cc5834e0261ea74127c0bc64bafabdaef1028a8f1acf611568"; } - { name = "libertas"; sha256 = "b109fb5c392928ac5495f8ce1d0f41d123b193031f8b548e8b68e9563db37016"; } - { name = "linux"; sha256 = "8e87f75c120904f2ca5fd9017e4503c23d8705b9ccaeb570374d1747163620ab"; } - { name = "myricom"; sha256 = "4c9e19d8b2cea97eb05f9d577537dba81aa36ac06c6da9bbed0bfa20434b7acc"; } - { name = "netxen"; sha256 = "3bd129229cf548a533c79cb55deefa7e4919e09fcc1f655773f4fa5078d81b9b"; } - { name = "qlogic"; sha256 = "213d098435c657115d2754ef5ead52e64f5fa05be4dcbcb0d5d3ca745376959c"; } - { name = "ralink"; sha256 = "51f3001ed15ca72bb088297b9e6e4a821ba6250f0ccc8886d77d2f5386a21836"; } - { name = "realtek"; sha256 = "a6338f5cd8bbe9627fa994016ebb0a91b40914021bec280ddc8f8a56eab22287"; } + { name = "linux-nonfree"; sha256 = "668d262dfcf18ffef2fe2a0b853b81bf5855f49fd2133203cbda097b1507c953"; } + { name = "atheros"; sha256 = "27cbd2099ce28c742f42833b09a61bdc7fb5b2ebcf5b35a52e750160ea1001b6"; } + { name = "bnx2"; sha256 = "32730fdeb0fb15a36e0ca046bde69e1a6fece8561af57afc7d9f1cf978fd25ab"; } + { name = "bnx2x"; sha256 = "22f23f4abb4aa2dac22718f12cf3bbd3fd2d63870b13e81c8401e6f841a719e8"; } + { name = "brcm80211"; sha256 = "17055c4199cc7e2aaa7d1d76dd5e718d24dbebb84020bb2d95ffab03bcfc7e8a"; } + { name = "intelwimax"; sha256 = "cc1b894990d3074e93b3f79b2b617614aab554b5e832d34993b5a16f64bdb84a"; } + { name = "ipw2x00"; sha256 = "2ef0810e2e037f7d536b24cc35527c456ff13b7aa5fd2df607b7035227553c9d"; } + { name = "ivtv"; sha256 = "7bf30e142679d53ad376002f29026bbe28de51e1cb71bcc3ec5c5f5f119a7118"; } + { name = "iwlwifi"; sha256 = "46ce0915583674ec10bfde3840b66ff450237edf604804ff51b9872fe767c1bb"; } + { name = "libertas"; sha256 = "c5d370d244f1c3a42f0a0280ed0cab067dbf36fa2926d387c9d10cf4ccd1b000"; } + { name = "linux"; sha256 = "e19bedc2cacf2cd7a1fc38e25820effe9e58fdc56608e9f7c320c85b80cba6ea"; } + { name = "myricom"; sha256 = "038bd618c00e852206a8a1443ba47ea644c04052bd8f10af9392c716ebf16b3c"; } + { name = "netxen"; sha256 = "29e3c1707dab6439f391318a223e5d4b6508d493c8d8bad799aef4f35b4704e7"; } + { name = "qlogic"; sha256 = "cc43c6016f2b7661d39e1d678ac0e8ca70081be8a0c76c2ec4d2e71493afa7d8"; } + { name = "ralink"; sha256 = "4db8dc6b98821c59f008c8bf7464317443b031cebf6d7e56c06f0824e69e3922"; } + { name = "realtek"; sha256 = "c39e65e5a589325ceb365d11b9ea10b0244134b7e5b3b05fd91fe6ad66b2f093"; } ]; fetchPackage = -- GitLab From e74916ed629a57f0255cfd7827ac80e7bc014bda Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 10 Oct 2012 16:05:37 +0200 Subject: [PATCH 0975/5607] xscreensaver: Update to 5.19 --- pkgs/misc/screensavers/xscreensaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index cf4f81ea407..e3932744286 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "5.18"; + version = "5.19"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9"; + sha256 = "fd62ea0f996abe1bea3770dd7141681454521b49302f9bced8af9c2ee428c0e0"; }; buildInputs = @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { '' # 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 + #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 -- GitLab From b8471def244a0d325d9e9c8dbb45c41b7819a461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 10 Oct 2012 16:36:31 +0200 Subject: [PATCH 0976/5607] firefox: adding 16.0. Enabling profiling, to see the new profiling features. --- .../networking/browsers/firefox/16.0.nix | 180 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 + 2 files changed, 187 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/16.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/16.0.nix new file mode 100644 index 00000000000..d9ad100f318 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/16.0.nix @@ -0,0 +1,180 @@ +{ 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 = "16.0"; + + xulVersion = "16.0"; # this attribute is used by other packages + + + src = fetchurl { + url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha1 = "8f79e4ccf28c57afd341b9fc258931b5f9e62064"; + }; + + commonConfigureFlags = + [ "--enable-optimize" + "--enable-profiling" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + # "--enable-system-cairo" # disabled for the moment because our Cairo is too old + "--enable-system-sqlite" + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + ]; + + + xulrunner = stdenv.mkDerivation rec { + name = "xulrunner-${xulVersion}"; + + inherit src; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + enableParallelBuilding = 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 5ba86bc6dc1..9eb0db98df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6972,6 +6972,13 @@ let firefox15Wrapper = lowPrio (wrapFirefox { browser = firefox15Pkgs.firefox; }); + firefox16Pkgs = callPackage ../applications/networking/browsers/firefox/16.0.nix { + inherit (gnome) libIDL; + inherit (pythonPackages) pysqlite; + }; + + firefox16Wrapper = lowPrio (wrapFirefox { browser = firefox16Pkgs.firefox; }); + flac = callPackage ../applications/audio/flac { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 { -- GitLab From c35a43315c20708ce79f1e306160e8e90e4cbe75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 9 Oct 2012 16:14:29 -0400 Subject: [PATCH 0977/5607] Fix evaluation http://hydra.nixos.org/build/3153986 --- 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 9eb0db98df7..504e6452394 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2541,7 +2541,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_1 pkgs.ocamlPackages_4_00_0; + ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; -- GitLab From 7dd1e71c2e646cdc951df72f17607d0c98a8a79f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Oct 2012 18:39:02 +0200 Subject: [PATCH 0978/5607] gamin: fix download URL for patch files --- pkgs/development/libraries/gamin/debian-patches.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix index 1da558db141..f784b8ccfee 100644 --- a/pkgs/development/libraries/gamin/debian-patches.nix +++ b/pkgs/development/libraries/gamin/debian-patches.nix @@ -1,6 +1,6 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4"; + prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4.1"; in [ { -- GitLab From a352796e0d83902559614e3abb3a9159d9b7ec49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Oct 2012 19:24:37 +0200 Subject: [PATCH 0979/5607] lua: add version 5.1 The 5.1 build system doesn't seem to support building a shared object anymore? --- pkgs/development/interpreters/lua-5/5.1.nix | 30 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/lua-5/5.1.nix diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix new file mode 100644 index 00000000000..e3dfd4711a1 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, readline}: + +stdenv.mkDerivation rec { + name = "lua-5.1.5"; + + src = fetchurl { + url = "http://www.lua.org/ftp/${name}.tar.gz"; + sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; + }; + + buildInputs = [ readline ]; + + configurePhase = "makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux )"; + + meta = { + homepage = "http://www.lua.org"; + description = "Lua is a powerful, fast, lightweight, embeddable scripting language."; + longDescription = '' + Lua combines simple procedural syntax with powerful data + description constructs based on associative arrays and extensible + semantics. Lua is dynamically typed, runs by interpreting bytecode + for a register-based virtual machine, and has automatic memory + management with incremental garbage collection, making it ideal + for configuration, scripting, and rapid prototyping. + ''; + license = "MIT"; + platforms = stdenv.lib.platforms.unix; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 504e6452394..1befce29415 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2716,10 +2716,9 @@ let love = callPackage ../development/interpreters/love {}; lua4 = callPackage ../development/interpreters/lua-4 { }; - lua5 = callPackage ../development/interpreters/lua-5 { }; - lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; + lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { }; maude = callPackage ../development/interpreters/maude { }; -- GitLab From 8f662e0663c5f96f7a132523b7a43b9f95d52bc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Oct 2012 19:25:10 +0200 Subject: [PATCH 0980/5607] asymptote: update to version 2.20 --- pkgs/tools/graphics/asymptote/src-for-default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/src-for-default.nix b/pkgs/tools/graphics/asymptote/src-for-default.nix index ddd0860ccd1..277393283ab 100644 --- a/pkgs/tools/graphics/asymptote/src-for-default.nix +++ b/pkgs/tools/graphics/asymptote/src-for-default.nix @@ -1,7 +1,7 @@ rec { - version="2.18"; - name="asymptote-2.18"; - hash="0i7jm12lzj983gvpa95a85wxb4v4ksk3cxb0cq359x2kka0b6g5m"; + version="2.20"; + name="asymptote-2.20"; + hash="0ji45v0d9jps8clsl86pvmr22acci3f0ciicmyzak6dbczqyrj80"; url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz"; - advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.18/asymptote-2.18.src.tgz"; + advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.20/asymptote-2.20.src.tgz"; } -- GitLab From 64556b022b61ce4666722aede6f640aa56970bb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Oct 2012 19:25:42 +0200 Subject: [PATCH 0981/5607] gravit: update to version 0.5.0 --- .../science/astronomy/gravit/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 388e65c9f75..820b4fb2979 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_0 }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, mesa, lua5_1, automake, autoconf }: -let - name = "gravit-0.4.2"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "gravit-0.5.0"; src = fetchurl { - url = "http://gravit.slowchop.com/dist/${name}.tar.gz"; - sha256 = "f37f3ac256a4acbf575f709addaae8cb01eda4f85537affa28c45f2df6fddb07"; + url = "http://gravit.slowchop.com/media/downloads/${name}.tgz"; + sha256 = "0lyw0skrkb04s16vgz7ggswjrdxk1h23v5s85s09gjxzjp1xd3xp"; }; - buildInputs = [mesa SDL SDL_ttf SDL_image lua5_0]; + buildInputs = [mesa SDL SDL_ttf SDL_image lua5_1 automake autoconf]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3"; - - postInstall = '' - mv $out/etc/gravit $out/share/gravit/sample-config - rmdir $out/etc - ''; + preConfigure = "sh autogen.sh"; meta = { homepage = "http://gravit.slowchop.com"; -- GitLab From 6ef73f57c308cb11a98f2d56bee46e491a4e87a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Oct 2012 19:26:02 +0200 Subject: [PATCH 0982/5607] smartmontools: update to version 6.0 --- pkgs/tools/system/smartmontools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index b79e92b5237..2f93f18ade5 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -7,14 +7,14 @@ let }; in stdenv.mkDerivation rec { - name = "smartmontools-5.43"; + name = "smartmontools-6.0"; src = fetchurl { url = "mirror://sourceforge/smartmontools/${name}.tar.gz"; - sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e"; + sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6"; }; - patchPhase = "cp ${driverdb} drivedb.h"; + # patchPhase = "cp ${driverdb} drivedb.h"; meta = { description = "Tools for monitoring the health of hard drivers"; -- GitLab From 537fa309b5ddcd1591e5d7729a34d213f2780d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Wed, 10 Oct 2012 23:17:35 +0200 Subject: [PATCH 0983/5607] Remove phat Phat was only used by Specimen, which has been replaced by Petri-Foo. Petri-Foo dropped the dependency on Phat, so it is no longer being used at all, and it also fails to build. --- pkgs/development/libraries/phat/default.nix | 21 --------------------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/phat/default.nix diff --git a/pkgs/development/libraries/phat/default.nix b/pkgs/development/libraries/phat/default.nix deleted file mode 100644 index 6e68e3d9da8..00000000000 --- a/pkgs/development/libraries/phat/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gtk, libgnomecanvas, pkgconfig }: - -stdenv.mkDerivation rec { - name = "phat-${version}"; - version = "0.4.1"; - - src = fetchurl { - url = "http://download.berlios.de/phat/${name}.tar.gz"; - sha256 = "1icncp2d8hbarzz8mmflkw13blg7blgwfic8q2wll7s6n01ii2av"; - }; - - buildInputs = [ gtk libgnomecanvas pkgconfig ]; - - meta = with stdenv.lib; { - description = "GTK+ widgets geared toward pro-audio apps"; - homepage = http://phat.berlios.de; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1befce29415..dd60798ec97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6124,10 +6124,6 @@ let config = config.pcmciaUtils.config or null; }; - phat = callPackage ../development/libraries/phat { - inherit (gnome) libgnomecanvas; - }; - pmount = callPackage ../os-specific/linux/pmount { }; pmutils = callPackage ../os-specific/linux/pm-utils { }; -- GitLab From bc4d201478bce1ef125536a946ab7b2bee40f6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 11 Oct 2012 01:23:10 +0200 Subject: [PATCH 0984/5607] distrho: fix HybridReverb2 --- pkgs/applications/audio/distrho/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index b51c97a6d68..7a1d24844b6 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { patchPhase = '' sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile + sed -e "s#/etc/HybridReverb2#$out/etc/Hybridreverb2#" \ + -i ports/hybridreverb2/source/SystemConfig.cpp + sed -e "s#/usr#$out#" -i ports/hybridreverb2/data/HybridReverb2.conf ''; buildInputs = [ @@ -38,6 +41,12 @@ stdenv.mkDerivation rec { cp bin/standalone/* $out/bin/ mkdir -p $out/lib/lv2 cp -a bin/lv2/* $out/lib/lv2/ + + # HybridReverb2 data + mkdir -p $out/etc/HybridReverb2 + cp ports/hybridreverb2/data/HybridReverb2.conf $out/etc/HybridReverb2/ + mkdir -p $out/share + cp -a ports/hybridreverb2/data/HybridReverb2 $out/share/ ''; meta = with stdenv.lib; { -- GitLab From ebd2b0e1ab5f9b7eff598ec3784bef2be7efddff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Oct 2012 21:51:19 -0400 Subject: [PATCH 0985/5607] linux: Update to 3.2.31 --- 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 2f36792d353..47048509905 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.30"; + version = "3.2.31"; 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 = "1yg353alkk7vddd8b2d7dlgpwaxjigk8i9qq1xifln3i842zinvw"; + sha256 = "0b2yklmgxv1sk847701f1wgh2kg2jxqqp7bg1279p7fj8vnmbmrq"; }; config = configWithPlatform stdenv.platform; -- GitLab From 7b40d67d618ab80200380d8c219bae519c289155 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 11 Oct 2012 06:11:49 +0200 Subject: [PATCH 0986/5607] adding taskwarrior --- pkgs/tools/misc/task/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/task/default.nix diff --git a/pkgs/tools/misc/task/default.nix b/pkgs/tools/misc/task/default.nix new file mode 100644 index 00000000000..529eacd377e --- /dev/null +++ b/pkgs/tools/misc/task/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, cmake}: + +stdenv.mkDerivation { + name = "task-2.1.2"; + + enableParallelBuilding = true; + + src = fetchurl { + url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz; + sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; + }; + + buildInputs = [ cmake ]; + + meta = { + description = "GTD (getting things done) implementation"; + homepage = http://taskwarrior.org; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 504e6452394..1b9eca5e07c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1525,6 +1525,8 @@ let autoconf = autoconf213; }; + task = callPackage ../tools/misc/task { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; /* -- GitLab From 0bf1789b6a64f8654325412de2a1a40c7834f6ba Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 11 Oct 2012 10:50:53 +0400 Subject: [PATCH 0987/5607] Use newly-added taskwarrior as an update to existing taskwarrior attribute --- .../applications/misc/taskwarrior/default.nix | 31 +++++++------------ pkgs/tools/misc/task/default.nix | 22 ------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 pkgs/tools/misc/task/default.nix diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 95f9de2f42b..dbb3c3f6a4e 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -1,29 +1,22 @@ -{ stdenv, fetchurl, cmake, lua5 }: +{stdenv, fetchurl, cmake}: stdenv.mkDerivation { - name = "task-warrior-2.0.0"; + name = "taskwarrior-2.1.2"; - src = fetchurl { - url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz; - sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq"; - }; - - NIX_LDFLAGS = "-ldl"; - - buildNativeInputs = [ cmake ]; - buildInputs = [ lua5 ]; + enableParallelBuilding = true; - crossAttrs = { - preConfigure = '' - export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl" - ''; + src = fetchurl { + url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz; + sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; }; - enableParallelBuilding = true; + buildInputs = [ cmake ]; meta = { - description = "Command-line todo list manager"; - homepage = http://taskwarrior.org/; - license = "GPLv2+"; + description = "GTD (getting things done) implementation"; + homepage = http://taskwarrior.org; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/task/default.nix b/pkgs/tools/misc/task/default.nix deleted file mode 100644 index 529eacd377e..00000000000 --- a/pkgs/tools/misc/task/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, cmake}: - -stdenv.mkDerivation { - name = "task-2.1.2"; - - enableParallelBuilding = true; - - src = fetchurl { - url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz; - sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg"; - }; - - buildInputs = [ cmake ]; - - meta = { - description = "GTD (getting things done) implementation"; - homepage = http://taskwarrior.org; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f855a2ab34..caedbfdb783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1525,8 +1525,6 @@ let autoconf = autoconf213; }; - task = callPackage ../tools/misc/task { }; - tcpdump = callPackage ../tools/networking/tcpdump { }; /* -- GitLab From 8e8143262b11396834371e133aee7b121652d7d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 09:53:33 +0200 Subject: [PATCH 0988/5607] haskell-primitive: add version 0.5.0.1 --- .../libraries/haskell/primitive/0.5.0.1.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/primitive/0.5.0.1.nix diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix new file mode 100644 index 00000000000..af6778ccd14 --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "primitive"; + version = "0.5.0.1"; + sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j"; + meta = { + homepage = "http://code.haskell.org/primitive"; + description = "Primitive memory-related operations"; + 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 96ff9d0960f..d6b2f4491c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1292,7 +1292,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); primitive_0_4_1 = callPackage ../development/libraries/haskell/primitive/0.4.1.nix {}; primitive_0_5 = callPackage ../development/libraries/haskell/primitive/0.5.nix {}; - primitive = self.primitive_0_4_1; + primitive_0_5_0_1 = callPackage ../development/libraries/haskell/primitive/0.5.0.1.nix {}; + primitive = self.primitive_0_5_0_1; processExtras = callPackage ../development/libraries/haskell/process-extras {}; -- GitLab From 5b2191bf2217816489ca2b50aac43f91e1215284 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 09:53:45 +0200 Subject: [PATCH 0989/5607] haskell-vector: add version 0.10.0.1 --- .../libraries/haskell/vector/0.10.0.1.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/vector/0.10.0.1.nix diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix new file mode 100644 index 00000000000..7acc89d6a91 --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -0,0 +1,15 @@ +{ cabal, deepseq, primitive }: + +cabal.mkDerivation (self: { + pname = "vector"; + version = "0.10.0.1"; + sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc"; + buildDepends = [ deepseq primitive ]; + meta = { + homepage = "http://code.haskell.org/vector"; + description = "Efficient Arrays"; + 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 d6b2f4491c4..44bb7aef8c7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1635,8 +1635,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {}; - vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; - vector = self.vector_0_9_1; + vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; + vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; + vector = self.vector_0_10_0_1; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; -- GitLab From 182c28ba4a7565d30942575d00047514e2b6bb2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 0990/5607] haskell-DSH: update to version 0.8.0.1 --- pkgs/development/libraries/haskell/DSH/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index 3275db0e0d8..bb3e335eafa 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -1,15 +1,10 @@ -{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl -, Pathfinder, syb, text, xhtml -}: +{ cabal, csv, FerryCore, HaXml, HDBC, mtl, Pathfinder, text }: cabal.mkDerivation (self: { pname = "DSH"; - version = "0.7.8.2"; - sha256 = "1rs42c05q4s46a1a03srzdq0aijwalhilzifc8ryq4qwjgh7vkwz"; - buildDepends = [ - convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text - xhtml - ]; + version = "0.8.0.1"; + sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s"; + buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ]; meta = { description = "Database Supported Haskell"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 101cc0bde5f9cf09b62caf35c2fe81de9b17c360 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 0991/5607] haskell-conduit: update to version 0.5.2.6 --- pkgs/development/libraries/haskell/conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index e1a5fc10a42..d5b45960cb9 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.5.2.5"; - sha256 = "1savaq8n29cry75jl8rfk35q24s5bvm57j1zhnp3dcvj2i6w9k3y"; + version = "0.5.2.6"; + sha256 = "0zmls6gl02mdwapdggw340s7pn5fjsvaky40m31ph3n28qr71kww"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; -- GitLab From 0d6432e26c3920005096e3ce7eb35c90b3b324c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 0992/5607] haskell-criterion: update to version 0.6.2.0 --- 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 54b6b20dc83..64f03d4dcca 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.1.1"; - sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw"; + version = "0.6.2.0"; + sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx"; buildDepends = [ aeson deepseq filepath hastache mtl mwcRandom parsec statistics time transformers vector vectorAlgorithms -- GitLab From 86750b45675842cd3c674711160e7611235bd167 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 0993/5607] haskell-data-memocombinators: update to version 0.4.4 --- .../libraries/haskell/data-memocombinators/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index 25f063c20ac..2b3adde1d72 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-memocombinators"; - version = "0.4.3"; - sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc"; + version = "0.4.4"; + sha256 = "06x79rgxi6cxrpzjzzsjk7yj7i0ajmcgns0n12lxakz9vxbqxyn2"; buildDepends = [ dataInttrie ]; meta = { homepage = "http://github.com/luqui/data-memocombinators"; -- GitLab From 4a383ed6c70c83154e838bdef13d057f26ca4e08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 0994/5607] haskell-ghc-mtl: update to version 1.0.1.2 --- pkgs/development/libraries/haskell/ghc-mtl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index f885b9a5313..ea2495f6586 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-mtl"; - version = "1.0.1.1"; - sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn"; + version = "1.0.1.2"; + sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva"; buildDepends = [ MonadCatchIOMtl mtl ]; meta = { homepage = "http://darcsden.com/jcpetruzza/ghc-mtl"; -- GitLab From 09aef77b4ea6313c7c805d5ac2a85a8e3ad34a4a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 0995/5607] haskell-heist: update to version 0.8.2 --- pkgs/development/libraries/haskell/heist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 44ba8ba15ee..d87f4fe239e 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -1,16 +1,16 @@ { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree , filepath, MonadCatchIOTransformers, mtl, random, text, time -, transformers, unorderedContainers, vector, xmlhtml +, unorderedContainers, vector, xmlhtml }: cabal.mkDerivation (self: { pname = "heist"; - version = "0.8.1.1"; - sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh"; + version = "0.8.2"; + sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree filepath - MonadCatchIOTransformers mtl random text time transformers - unorderedContainers vector xmlhtml + MonadCatchIOTransformers mtl random text time unorderedContainers + vector xmlhtml ]; meta = { homepage = "http://snapframework.com/"; -- GitLab From 6f4063686ea48296e2e4a7e73eafcce9dbd664d1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 0996/5607] haskell-hint: update to version 0.3.3.5 --- pkgs/development/libraries/haskell/hint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index 795d8c1d674..106b8591778 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hint"; - version = "0.3.3.4"; - sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy"; + version = "0.3.3.5"; + sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq"; buildDepends = [ extensibleExceptions filepath ghcMtl ghcPaths haskellSrc MonadCatchIOMtl mtl random utf8String -- GitLab From 000791e74a511f862081aff90ab27304c88f0aba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 0997/5607] haskell-http-conduit: update to version 1.6.1.2 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 3e094e0c6b1..9a1d45c40f1 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.1.1"; - sha256 = "00xixsp1n37mb2in20lsxf460cyjbsp8dj2avys6hyrdn14ki130"; + version = "1.6.1.2"; + sha256 = "02dh7gh9pk5dj6dl28hn3vqvf9280b57bqas4w7zsgnhjivxy20x"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { monadControl mtl network regexCompat resourcet socks text time tls tlsExtra transformers transformersBase utf8String void zlibConduit ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; -- GitLab From 5f8a0e285a942a32616e5440c8d1d19ea58ec020 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 0998/5607] haskell-network-conduit: update to version 0.6.1.1 --- .../libraries/haskell/network-conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 45f65e932c0..3b86b0699ca 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -3,12 +3,11 @@ cabal.mkDerivation (self: { pname = "network-conduit"; - version = "0.6.0"; - sha256 = "0y296v8b6xrxs9jw6az6flz9nsqgk60cnpc954pmp6mi5q8mbv7i"; + version = "0.6.1.1"; + sha256 = "00x5ks1qcq5smmd2g4bm23lb3ngdxmdlz822qkkj9l9c27lkn67n"; buildDepends = [ conduit liftedBase monadControl network transformers ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Stream socket data using conduits"; -- GitLab From b7cc6df1de045e30d80cac852156551518e20fc3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 0999/5607] haskell-numbers: update to version 3000.1.0.0 --- pkgs/development/libraries/haskell/numbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 8b57b3d7e96..b37ab7e5d4c 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "numbers"; - version = "3000.0.0.0"; - sha256 = "073xjrnbv6z16va2h3arlxq3z8kywb961dwh4jcm8g7w5m84b2xb"; + version = "3000.1.0.0"; + sha256 = "0iqpch8j2i2pnjq8waqb5y95jpmvbzx2r6zsvkja7sl4d578fgpn"; meta = { homepage = "https://github.com/DanBurton/numbers"; description = "Various number types"; -- GitLab From fca72874915ac187e202d50416269f619d0a712b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 1000/5607] haskell-persistent: update to version 1.0.1.3 --- pkgs/development/libraries/haskell/persistent/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index b410b36ea56..449debe0405 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.2"; - sha256 = "0gw635mhbn6w8aswiw9j41rdpi7rhnnhay2qgvlc8103s0g5lp9j"; + version = "1.0.1.3"; + sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit liftedBase monadControl monadLogger pathPieces poolConduit @@ -15,7 +15,6 @@ cabal.mkDerivation (self: { unorderedContainers vector ]; extraLibraries = [ sqlite ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; -- GitLab From 864924a65df91939fd9096d814b980a2ff32a40c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 1001/5607] haskell-resourcet: update to version 0.4.0.2 --- pkgs/development/libraries/haskell/resourcet/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index efbd56cbe6a..95e051a3eec 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,12 +4,11 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.0.1"; - sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x"; + version = "0.4.0.2"; + sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2"; buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; -- GitLab From 7d22f8d91ba84df601b88f7d25f844c1d418fbd3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 1002/5607] haskell-snap-core: update to version 0.9.2.2 --- pkgs/development/libraries/haskell/snap/core.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index a39442aef07..16df3f34756 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,19 +1,19 @@ { cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq , enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl -, random, regexPosix, text, time, transformers, unixCompat -, unorderedContainers, vector, zlibEnum +, random, regexPosix, text, time, unixCompat, unorderedContainers +, vector, zlibEnum }: cabal.mkDerivation (self: { pname = "snap-core"; - version = "0.9.2.1"; - sha256 = "18i0hfzc37q12nyp7g4sc87s4xcqz1crjwpnhh4y5fw66glzmq3q"; + version = "0.9.2.2"; + sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator bytestringMmap caseInsensitive deepseq enumerator filepath HUnit - MonadCatchIOTransformers mtl random regexPosix text time - transformers unixCompat unorderedContainers vector zlibEnum + MonadCatchIOTransformers mtl random regexPosix text time unixCompat + unorderedContainers vector zlibEnum ]; meta = { homepage = "http://snapframework.com/"; -- GitLab From 4b9b535b74fe4e7a93c7388d938a677fbc40a468 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 1003/5607] haskell-snap-server: update to version 0.9.2.4 --- .../libraries/haskell/snap/server.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index c17b8e50e61..7f8dc878024 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,20 +1,18 @@ -{ cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder -, blazeBuilderEnumerator, caseInsensitive, directoryTree -, enumerator, filepath, MonadCatchIOTransformers, mtl, network -, snapCore, text, time, transformers, unixCompat +{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder +, blazeBuilderEnumerator, caseInsensitive, enumerator +, MonadCatchIOTransformers, mtl, network, snapCore, text, time +, unixCompat }: cabal.mkDerivation (self: { pname = "snap-server"; - version = "0.9.2.3"; - sha256 = "0wl7clzwrd34d32sikd6vkj3pla9yni26mmdsnrjw1s3lq412yqd"; + version = "0.9.2.4"; + sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl"; buildDepends = [ - attoparsec attoparsecEnumerator binary blazeBuilder - blazeBuilderEnumerator caseInsensitive directoryTree enumerator - filepath MonadCatchIOTransformers mtl network snapCore text time - transformers unixCompat + attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator + caseInsensitive enumerator MonadCatchIOTransformers mtl network + snapCore text time unixCompat ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; -- GitLab From c30dc2231e1a5ce65b365386c48ef23be5baf2aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 1004/5607] haskell-snap: update to version 0.9.2.2 --- pkgs/development/libraries/haskell/snap/snap.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 83e149391c5..1676de1e840 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -2,14 +2,14 @@ , dataLens, dataLensTemplate, directoryTree, filepath, hashable , heist, logict, MonadCatchIOTransformers, mtl, mwcRandom , pwstoreFast, snapCore, snapServer, stm, syb, text, time -, transformers, unorderedContainers, utf8String, vector -, vectorAlgorithms, xmlhtml +, transformers, unorderedContainers, vector, vectorAlgorithms +, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.9.2.1"; - sha256 = "0gxnkr6icx2g16w3ab54cqy4x15xj6y9cs6qv8dg0xamm7kyyfhl"; + version = "0.9.2.2"; + sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17,9 +17,8 @@ cabal.mkDerivation (self: { dataLensTemplate directoryTree filepath hashable heist logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore snapServer stm syb text time transformers unorderedContainers - utf8String vector vectorAlgorithms xmlhtml + vector vectorAlgorithms xmlhtml ]; - jailbreak = true; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; -- GitLab From 4db1166d011d92ec2a1b668c54feca3c4c32eda7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 1005/5607] haskell-wai-extra: update to version 1.3.0.3 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 7c460681fcb..bc70d14ddf9 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.0.2"; - sha256 = "0w69wjfbzgg523n0rcs700qx0gsdhvlr0qjvqg1hppvi188llpwl"; + version = "1.3.0.3"; + sha256 = "0nfk24mwzf2v35vlvvhzb7a6ldr6pvw37m3ws3b3cv2m80jdd7kr"; buildDepends = [ ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes network -- GitLab From 2112958f8a957d3d6d343963090e955d7d3b94ca Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 1006/5607] haskell-warp: update to version 1.3.3.2 --- pkgs/development/libraries/haskell/warp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index c4c2bfc4a69..0f4764c3e0e 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,14 +5,13 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.3.1"; - sha256 = "0nz5n574lgaii6i9ncc6dkzw2aw6g7hwjjq7v8njly2vpwygxn7s"; + version = "1.3.3.2"; + sha256 = "1w2i5nf3qh7p0xfrrp6x34rw3sxa48v703w1vlsikhyjdqs2crq8"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile transformers unixCompat void wai ]; - patchPhase = "sed -i -e 's|, lifted-base.*|, lifted-base|' warp.cabal"; meta = { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; -- GitLab From d330da6f54714d26b9e99a10bc897db6c7152758 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 1007/5607] haskell-yesod-auth: update to version 1.1.1.2 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index ec7b78fe6fd..765724e00d4 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.1"; - sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9"; + version = "1.1.1.2"; + sha256 = "1agyazzkgwmp63vwx84bzalf9lwg14k5jshj6n97g1iagsiaxqa0"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 @@ -16,7 +16,6 @@ cabal.mkDerivation (self: { unorderedContainers wai yesodCore yesodForm yesodJson yesodPersistent ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; -- GitLab From a47d1d856908737fa36ecabfebf238d1d6205420 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 1008/5607] haskell-yesod-core: update to version 1.1.2.2 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 87723df26c3..061e3261d2a 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.2.1"; - sha256 = "195r19xsd3fvsirz62mkfxqgw5zi4lx700ly08h1i0kvmfnfx1g8"; + version = "1.1.2.2"; + sha256 = "13852r6s7p9b4zvg4pi9qfmgv8g21m0gqlw7bky05jy5a9c8v3a7"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { text time transformers transformersBase vector wai waiExtra yesodRoutes ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; -- GitLab From b8e30a8af6e1626a351f12f9736f5f1d7d9d7918 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 11 Oct 2012 10:31:42 +0200 Subject: [PATCH 1009/5607] Changed the netbeans expression to use openjdk, which should work now --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index dccc92a91f5..f1fd9adbe86 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, oraclejdk, unzip, which, makeWrapper, makeDesktopItem}: +{stdenv, fetchurl, jdk, unzip, which, makeWrapper, makeDesktopItem}: let desktopItem = makeDesktopItem { @@ -25,7 +25,7 @@ stdenv.mkDerivation { # Create a wrapper capable of starting it mkdir -p $out/bin makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ - --prefix PATH : ${oraclejdk}/bin:${which}/bin + --prefix PATH : ${jdk}/bin:${which}/bin # Create desktop item, so we can pick it from the KDE/GNOME menu mkdir -p $out/share/applications -- GitLab From 018068d7c5657b37a61f092936007c0a89134ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 11 Oct 2012 12:02:46 +0200 Subject: [PATCH 1010/5607] samba: fix cross-compilation --- pkgs/servers/samba/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 7952c73f48c..08c53182dd5 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { postPatch = # XXX: Awful hack to allow cross-compilation. '' sed -i source3/configure \ - -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g' + -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g' ''; # " preConfigure = -- GitLab From 702aec188157461c4bf410f0b1709a692e68fc5c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Oct 2012 10:54:24 +0200 Subject: [PATCH 1011/5607] chromium: Use final implementation of BPF patch. The new version is the one already committed in trunk as revision 160697. In order to get into beta and stable this could take some while so we're going need to carry around that patch for some time. Signed-off-by: aszlig --- 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 1ea854c5e9d..acfb43e7caa 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -90,8 +90,8 @@ let maybeBpfTemporaryFix = let patch = fetchurl { - url = "https://chromiumcodereview.appspot.com/download/issue11032056_1_2.diff"; - sha256 = "eb13dc627940ad56939837ad1093b2c388f6cf79f1f25cdc1b2e25e987c73d1c"; + url = "https://chromiumcodereview.appspot.com/download/issue11073003_6001_7001.diff"; + sha256 = "bf61871cdaa8fea27ce15482a17048f67b426a55813c3832f9bd39ec47a9eb06"; }; needPatch = !versionOlder sourceInfo.version "23.0.1271.0"; in optional needPatch patch; -- GitLab From 50faa2cbef570f1f9a637f203d4786f95b5a734c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 11 Oct 2012 12:42:08 +0200 Subject: [PATCH 1012/5607] chromium: Update stable and beta channels. stable: 22.0.1229.79 (build tested) beta: 22.0.1229.94 (build and usage tested) Signed-off-by: aszlig --- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 8dd406e5ea4..dbb0de72f30 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,13 +6,13 @@ sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx"; }; beta = { - version = "23.0.1271.17"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.17.tar.bz2"; - sha256 = "1nyc2s378sx7ymmginipiphygg7s59iwg2kirlbgz60fl8wygzv2"; + version = "23.0.1271.26"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.26.tar.bz2"; + sha256 = "1iimpmm5lm5rvak49320lmmvwqr8xv4znp4h1pf65jzzx0apbgkh"; }; stable = { - version = "22.0.1229.79"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.79.tar.bz2"; - sha256 = "0f7py2hd7fnx5z0xrg2vwf675xbg9xvamx79jjyzbpljh32b3jh6"; + version = "22.0.1229.94"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-22.0.1229.94.tar.bz2"; + sha256 = "1bqwlgmn0dm1xvd6v52zf9gjmykgq4fnw7rancbplfpl3rl7xbx0"; }; } -- GitLab From 21e59f4a5fe6e4c6719c8cf6802e8de71f6d853a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Thu, 11 Oct 2012 14:22:26 +0200 Subject: [PATCH 1013/5607] sphinx 1.1.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f511b64ceda..d0a2bd420d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2584,11 +2584,11 @@ let pythonPackages = python.modules // rec { }); sphinx = buildPythonPackage (rec { - name = "Sphinx-1.0.7"; + name = "Sphinx-1.1.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - md5 = "42c722d48e52d4888193965dd473adb5"; + md5 = "8f55a6d4f87fc6d528120c5d1f983e98"; }; propagatedBuildInputs = [docutils jinja2 pygments]; -- GitLab From fa27534ec6be24f3b165dd47959cff46fe03ce8a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 11:05:33 -0400 Subject: [PATCH 1014/5607] pylint: Update to 0.26.0 --- pkgs/top-level/python-packages.nix | 35 +++++++++++++++++++----------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d0a2bd420d4..387e8964705 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -187,14 +187,15 @@ let pythonPackages = python.modules // rec { }); - astng = buildPythonPackage rec { - name = "logilab-astng-0.21.1"; + logilab_astng = buildPythonPackage rec { + name = "logilab-astng-0.24.1"; src = fetchurl { - url = "ftp://ftp.logilab.org/pub/astng/${name}.tar.gz"; - sha256 = "0rqp2vwrnv6gkzdd96j078h1sz26plh49cmnyswy2wb6l4wans67"; + url = "http://download.logilab.org/pub/astng/${name}.tar.gz"; + sha256 = "00qxaxsax80sknwv25xl1r49lc4gbhkxs1kjywji4ad8y1npax0s"; }; - propagatedBuildInputs = [logilabCommon]; + + propagatedBuildInputs = [ logilab_common ]; }; beautifulsoup = buildPythonPackage (rec { @@ -1053,14 +1054,15 @@ let pythonPackages = python.modules // rec { }; }; - logilabCommon = buildPythonPackage rec { - name = "logilab-common-0.56.0"; + logilab_common = buildPythonPackage rec { + name = "logilab-common-0.58.2"; src = fetchurl { - url = "ftp://ftp.logilab.org/pub/common/${name}.tar.gz"; - sha256 = "14p557nqypbd10d8k7qs6jlm58pksiwh86wvvl0axyki00hj6971"; + url = "http://download.logilab.org/pub/common/${name}.tar.gz"; + sha256 = "0qfdyj2is0scpnkgpnqm12lh4yl27617l0irlilhk25cpgbbfbf9"; }; - propagatedBuildInputs = [unittest2]; + + propagatedBuildInputs = [ unittest2 ]; }; lxml = buildPythonPackage ( rec { @@ -1976,13 +1978,20 @@ let pythonPackages = python.modules // rec { pylint = buildPythonPackage rec { - name = "pylint-0.23.0"; + name = "pylint-0.26.0"; + namePrefix = ""; src = fetchurl { url = "ftp://ftp.logilab.org/pub/pylint/${name}.tar.gz"; - sha256 = "07091avcc2b374i5f3blszmawjcin8xssjfryz91qbxybb8r7c6d"; + sha256 = "1mg1ywpj0klklv63s2hwn5xwxi3wfwgnyz9d4pz32hzb53azq835"; + }; + + propagatedBuildInputs = [ logilab_astng ]; + + meta = { + homepage = http://www.logilab.org/project/pylint; + description = "A bug and style checker for Python"; }; - propagatedBuildInputs = [astng]; }; -- GitLab From 2fa1b38853fc3c9eba02f47bf2d7031bf93e6f34 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 12:33:28 -0400 Subject: [PATCH 1015/5607] systemd: Properly handle device aliases used as dependencies http://lists.freedesktop.org/archives/systemd-devel/2012-October/006872.html --- pkgs/os-specific/linux/systemd/default.nix | 2 +- .../linux/systemd/fix-device-aliases.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/systemd/fix-device-aliases.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 36d341af5e6..5abef22395e 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; }; - patches = [ ./reexec.patch ./ignore-duplicates.patch ]; + patches = [ ./reexec.patch ./ignore-duplicates.patch ./fix-device-aliases.patch ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl diff --git a/pkgs/os-specific/linux/systemd/fix-device-aliases.patch b/pkgs/os-specific/linux/systemd/fix-device-aliases.patch new file mode 100644 index 00000000000..508fd0ec074 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/fix-device-aliases.patch @@ -0,0 +1,14 @@ +diff --git a/src/core/device.c b/src/core/device.c +index 5307341..7bbe99a 100644 +--- a/src/core/device.c ++++ b/src/core/device.c +@@ -255,8 +255,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p + if (!is_path(alias)) + log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias); + else { +- if ((r = device_add_escaped_name(u, alias)) < 0) +- goto fail; ++ device_update_unit(m, dev, alias, false); + } + } + -- GitLab From bf5967e77e9c4cfc69501cc12a626cb5c6f22537 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 12:33:47 -0400 Subject: [PATCH 1016/5607] systemd: Add libgcrypt dependency This is required for forward secure sealing of the journal. --- pkgs/os-specific/linux/systemd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5abef22395e..2219d82138f 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod , xz, pam, acl, cryptsetup, libuuid, m4, utillinux, usbutils, pciutils -, glib, kbd, libxslt, coreutils +, glib, kbd, libxslt, coreutils, libgcrypt }: assert stdenv.gcc.libc or null != null; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl - /* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt + /* cryptsetup */ libuuid m4 usbutils pciutils glib libxslt libgcrypt ]; configureFlags = @@ -56,6 +56,9 @@ stdenv.mkDerivation rec { # lead to a cyclic dependency. "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" "-fno-stack-protector" + # Work around our kernel headers being too old. FIXME: remove + # this after the next stdenv update. + "-DFS_NOCOW_FL=0x00800000" ]; makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; -- GitLab From e117d037e39ac185327cf86282331185f19268c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 11 Oct 2012 15:38:54 -0400 Subject: [PATCH 1017/5607] iproute: Update to 3.6.0 --- pkgs/os-specific/linux/iproute/default.nix | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index cc5339ba900..c97c7416de1 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,11 +1,11 @@ -{fetchurl, stdenv, flex, bison, db4, iptables}: +{ fetchurl, stdenv, flex, bison, db4, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-2.6.35"; + name = "iproute2-3.6.0"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/iproute/iproute2-2.6.35.tar.bz2/b0f281b3124bf04669e18f5fe16d4934/iproute2-2.6.35.tar.bz2"; - sha256 = "18why1wy0v859axgrlfxn80zmskss0410hh9rf5gn9cr29zg9cla"; + url = http://kernel.org/pub/linux/utils/net/iproute2/iproute2-3.6.0.tar.xz; + sha256 = "0d05av2s7p552yszgj6glz6d74jlmg392s7n74hicgqfl16m85rd"; }; patches = [ ./vpnc.patch ]; @@ -15,20 +15,25 @@ stdenv.mkDerivation rec { patchShebangs ./configure sed -e '/ARPDDIR/d' -i Makefile ''; + postConfigure = "cat Config"; makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" - + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" - + " MANDIR=$(out)/share/man"; + + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" + + " MANDIR=$(out)/share/man"; + + buildInputs = [ db4 iptables ]; + buildNativeInputs = [ bison flex pkgconfig ]; + + enableParallelBuilding = true; - buildInputs = [db4 iptables]; - buildNativeInputs = [bison flex db4]; + # Get rid of useless TeX/SGML docs. + postInstall = "rm -rf $out/share/doc"; meta = { - homepage = - http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; - description = "A collection of utilities for controlling TCP / IP" - + " networking and traffic control in Linux"; + homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; + description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } -- GitLab From b70d41d309f63ffee761b1131d13c03ddec024a9 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Thu, 11 Oct 2012 13:50:28 -0700 Subject: [PATCH 1018/5607] - long descriptions --- pkgs/os-specific/linux/spl/default.nix | 16 ++++++++++++++++ pkgs/os-specific/linux/zfs/default.nix | 20 +++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 96565fffa0e..63a2a8454aa 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -31,6 +31,22 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)"; + + longDescription = '' + This kernel module is a porting layer for ZFS to work inside the linux kernel. + + LICENSE NOTE: the Linux kernel is licensed under the GNU General Public + License which is incompatible with ZFS which is licensed under the Sun CDDL. + While both the GPL and CDDL are open source licenses their terms are such that + it is impossible to simultaneously satisfy both licenses. This means that a + single derived work of the Linux kernel and ZFS cannot be legally distributed. + + The ZFS code can be modified to build as a CDDL licensed kernel module + which is not distributed as part of the Linux kernel. This makes a Native ZFS + on Linux implementation possible if you are willing to download and build it + yourself. + ''; + homepage = http://zfsonlinux.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.cddl; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 43e7b2fd95d..fa0a5b47f55 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -25,7 +25,25 @@ stdenv.mkDerivation { ''; meta = { - description = "Native ZFS for Linux"; + description = "ZFS Filesystem Linux Kernel module"; + longDescription = '' + + ZFS is a filesystem that combines a logical volume manager with a + Copy-On-Write filesystem with data integrity detection and repair, + snapshotting, cloning, block devices, deduplication, and more. + + LICENSE NOTE: the Linux kernel is licensed under the GNU General Public + License which is incompatible with ZFS which is licensed under the Sun CDDL. + While both the GPL and CDDL are open source licenses their terms are such that + it is impossible to simultaneously satisfy both licenses. This means that a + single derived work of the Linux kernel and ZFS cannot be legally distributed. + + The ZFS code can be modified to build as a CDDL licensed kernel module + which is not distributed as part of the Linux kernel. This makes a Native ZFS + on Linux implementation possible if you are willing to download and build it + yourself. + ''; + homepage = http://zfsonlinux.org/; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.cddl; -- GitLab From aa4dc424596989d9ecac5047ea5126ec2a85cbf3 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 12 Oct 2012 01:20:47 +0200 Subject: [PATCH 1019/5607] Using a patch to load plugins to xfce4-panel --- .../desktops/xfce-4.8/core/xfce4-panel-datadir.patch | 12 ++++++++++++ pkgs/desktops/xfce-4.8/core/xfce4-panel.nix | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch b/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch new file mode 100644 index 00000000000..33853c5f60f --- /dev/null +++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch @@ -0,0 +1,12 @@ +diff --git a/panel/panel-module-factory.c b/panel/panel-module-factory.c +index 529fe85..8c792b7 100644 +--- a/panel/panel-module-factory.c ++++ b/panel/panel-module-factory.c +@@ -39,6 +39,7 @@ + #include + #include + ++#define DATADIR "/run/current-system/sw/share/xfce4" + #define PANEL_PLUGINS_DATA_DIR (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") + #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins") + diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix index bb263712962..e14d1acf33d 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha1 = "332fc968332e6271e1bb65d6de8de2524b0440ec"; }; + patches = [ ./xfce4-panel-datadir.patch ]; + patchFlags = "-p1"; + buildInputs = [ pkgconfig intltool gtk libxfce4util garcon libxfce4ui xfconf exo libwnck -- GitLab From 74196058eeb32f655ea0cdafe40f9b601bcf213d Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 12 Oct 2012 00:45:42 +0000 Subject: [PATCH 1020/5607] added gsmartcontrol 0.8.7 to nixpkgs --- pkgs/tools/misc/gsmartcontrol/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/gsmartcontrol/default.nix diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix new file mode 100644 index 00000000000..60003b3b5d5 --- /dev/null +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -0,0 +1,23 @@ +{ fetchurl, stdenv, smartmontools, gtk, gtkmm, libglademm, pkgconfig, pcre }: + +stdenv.mkDerivation rec { + version="0.8.7"; + name = "gsmartcontrol"; + + src = fetchurl { + url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; + sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; + }; + + buildInputs = [ smartmontools gtk gtkmm libglademm pkgconfig pcre ]; + + #installTargets = "install datainstall"; + + meta = { + description = "GSmartControl is a graphical user interface for smartctl (from smartmontools package), which is a tool for querying and controlling SMART (Self-Monitoring, Analysis, and Reporting Technology) data on modern hard disk drives."; + homepage = http://gsmartcontrol.berlios.de; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [qknight]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc5b67f6745..fa88d4b5bc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8145,8 +8145,12 @@ let inherit (gnome) gnomedocutils; }; - gtypist = callPackage ../games/gtypist { }; + gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { + inherit (gnome) libglademm; + }; + gtypist = callPackage ../games/gtypist { }; + hexen = callPackage ../games/hexen { }; icbm3d = callPackage ../games/icbm3d { }; -- GitLab From 9e6e5391ad8014342f69a46e93c2dd1be5ba3510 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 11 Oct 2012 21:49:25 -0700 Subject: [PATCH 1021/5607] Update Firefox 16.0 to 16.0.1, and switch to the high-bandwidth releases.mozilla.org for the source. --- .../applications/networking/browsers/firefox/16.0.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/16.0.nix index d9ad100f318..5b3c0723b45 100644 --- a/pkgs/applications/networking/browsers/firefox/16.0.nix +++ b/pkgs/applications/networking/browsers/firefox/16.0.nix @@ -15,14 +15,17 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "16.0"; + firefoxVersion = "16.0.1"; - xulVersion = "16.0"; # this attribute is used by other packages + xulVersion = "16.0.1"; # this attribute is used by other packages src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "8f79e4ccf28c57afd341b9fc258931b5f9e62064"; + # Use this url for official releases. + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + # Use this url only for versions not available at releases.mozilla.org, to take load off Mozilla's ftp server. + #url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha256 = "1rrg2rmhczcwx5p5gilavqp4cvlig40ipw9avbgczahqjw89ivap"; }; commonConfigureFlags = -- GitLab From 85140f590afcd57eb3f6cb7940fcc019c234194b Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 12 Oct 2012 08:38:38 +0200 Subject: [PATCH 1022/5607] zfs: fix udev rules This patch fixes Nixos checking of udev rules: Checking that all programs call by absolute paths in udev rules exist ... FAIL /lib/udev/vdev_id is called in udev rules but not installed by udev --- pkgs/os-specific/linux/zfs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index fa0a5b47f55..cbb8f30e1b3 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" ''; configureFlags = '' -- GitLab From 170b01ba77abb31a212189550f123b8a18cc7ead Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 12 Oct 2012 09:11:05 +0200 Subject: [PATCH 1023/5607] Adding libdir into the patch --- .../desktops/xfce-4.8/core/xfce4-panel-datadir.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch b/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch index 33853c5f60f..ed9df9ef36f 100644 --- a/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch +++ b/pkgs/desktops/xfce-4.8/core/xfce4-panel-datadir.patch @@ -10,3 +10,15 @@ index 529fe85..8c792b7 100644 #define PANEL_PLUGINS_DATA_DIR (DATADIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") #define PANEL_PLUGINS_DATA_DIR_OLD (DATADIR G_DIR_SEPARATOR_S "panel-plugins") +diff --git a/panel/panel-module.c b/panel/panel-module.c +index ba39320..519440b 100644 +--- a/panel/panel-module.c ++++ b/panel/panel-module.c +@@ -35,6 +35,7 @@ + #include + #include + ++#define LIBDIR "/run/current-system/sw/lib/xfce4" + #define PANEL_PLUGINS_LIB_DIR (LIBDIR G_DIR_SEPARATOR_S "panel" G_DIR_SEPARATOR_S "plugins") + #define PANEL_PLUGINS_LIB_DIR_OLD (LIBDIR G_DIR_SEPARATOR_S "panel-plugins") + -- GitLab From c322dc6844f267bd5a87298b42525f0ef6d52480 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 12 Oct 2012 09:52:16 +0200 Subject: [PATCH 1024/5607] Remove themes, not working for now --- pkgs/desktops/xfce-4.8/art/xfce4-themes.nix | 18 ------------------ pkgs/desktops/xfce-4.8/default.nix | 2 -- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/desktops/xfce-4.8/art/xfce4-themes.nix diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix b/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix deleted file mode 100644 index b462b3ccd7b..00000000000 --- a/pkgs/desktops/xfce-4.8/art/xfce4-themes.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk }: - -stdenv.mkDerivation rec { - name = "xfwm4-themes-4.10.0"; - - src = fetchurl { - url = "http://archive.xfce.org/src/art/xfwm4-themes/4.10/${name}.tar.bz2"; - sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; - }; - - buildInputs = [ pkgconfig intltool gtk ]; - - meta = { - homepage = http://www.xfce.org/; - description = "Themes for Xfce"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/xfce-4.8/default.nix b/pkgs/desktops/xfce-4.8/default.nix index 0788b00a2a0..c20e42d2019 100644 --- a/pkgs/desktops/xfce-4.8/default.nix +++ b/pkgs/desktops/xfce-4.8/default.nix @@ -83,8 +83,6 @@ rec { #### ART xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; - xfce4themes = callPackage ./art/xfce4-themes.nix {}; - #### PANEL PLUGINS -- GitLab From b1169e550985976bd22d7d9ac999fb43a8d847e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 12 Oct 2012 15:22:48 +0200 Subject: [PATCH 1025/5607] ghc-*-binary: remove redundant assertion Any attempt to instantiate these expressions on an unsupported platform is going to 'throw' an error. The call to 'assert' doesn't add any value to that (and generates less readable error messages, too). Further details are available at . --- pkgs/development/compilers/ghc/6.10.1-binary.nix | 8 +------- pkgs/development/compilers/ghc/6.10.2-binary.nix | 8 +------- pkgs/development/compilers/ghc/6.12.1-binary.nix | 8 +------- pkgs/development/compilers/ghc/6.4.2-binary.nix | 8 +------- pkgs/development/compilers/ghc/7.0.4-binary.nix | 8 +------- pkgs/development/compilers/ghc/7.4.2-binary.nix | 8 +------- 6 files changed, 6 insertions(+), 42 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix index 5a15cc0dff7..353a4176ea4 100644 --- a/pkgs/development/compilers/ghc/6.10.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, libedit, ncurses, gmp}: -let - supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "6.10.1"; @@ -104,5 +98,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 616c9de7ede..02f1db354a1 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, libedit, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "6.10.2"; @@ -103,5 +97,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix index a84b75d705b..23486b5f4fa 100644 --- a/pkgs/development/compilers/ghc/6.12.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "6.12.1"; @@ -105,5 +99,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix index 2ed6f2be4fe..1a5bf059e9f 100644 --- a/pkgs/development/compilers/ghc/6.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, readline, ncurses, gmp}: -let - supportedPlatforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation { name = if stdenv.system == "i686-darwin" then "ghc-6.6.1-binary" else "ghc-6.4.2-binary"; @@ -68,5 +62,5 @@ stdenv.mkDerivation { '' else ""; - meta.platforms = supportedPlatforms; + meta.platforms = ["i686-darwin" "x86_64-linux" "i686-linux"]; } diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 0baf9718f85..0bfc81a17a4 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "7.0.4"; @@ -93,5 +87,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 85e10d7090c..e0a8fee4b66 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -1,11 +1,5 @@ {stdenv, fetchurl, perl, ncurses, gmp}: -let - supportedPlatforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; -in - -assert stdenv.lib.elem stdenv.system supportedPlatforms; - stdenv.mkDerivation rec { version = "7.4.2"; @@ -93,5 +87,5 @@ stdenv.mkDerivation rec { [ $(./main) == "yes" ] ''; - meta.platforms = supportedPlatforms; + meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; } -- GitLab From 84c18a97e475dd5b658653675660b9cb4c2b5f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 12 Oct 2012 15:40:04 +0200 Subject: [PATCH 1026/5607] testdisk: updating to 6.13 I fixed the licence field to GPLv2+ too --- pkgs/tools/misc/testdisk/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index fd9f4578294..6ccfea50482 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl}: +{stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid}: stdenv.mkDerivation { - name = "testdisk-6.8"; + name = "testdisk-6.13"; src = fetchurl { - url = http://www.cgsecurity.org/testdisk-6.8.tar.bz2; - sha256 = "0cyqikcyi6zj671kkr8vydqskh2r7f3n1v3xks1vh1biaffqq2ir"; + url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2; + sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8"; }; - buildInputs = [ncurses libjpeg e2fsprogs zlib openssl]; + buildInputs = [ncurses libjpeg e2fsprogs zlib openssl libuuid]; meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; - license = "GPL"; + license = "GPLv2+"; longDescription = '' TestDisk is a program for data recovery, primarily designed to help recover lost partitions and/or make non-booting disks -- GitLab From cfebdffd585edcab65c4d0f3ca7447581b210023 Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 12 Oct 2012 10:59:33 -0700 Subject: [PATCH 1027/5607] firefox 16: Use the published sha1, and pass the ftp url to fetchurl as a fallback. --- .../networking/browsers/firefox/16.0.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/16.0.nix index 5b3c0723b45..48ecebd8e19 100644 --- a/pkgs/applications/networking/browsers/firefox/16.0.nix +++ b/pkgs/applications/networking/browsers/firefox/16.0.nix @@ -21,11 +21,13 @@ rec { src = fetchurl { - # Use this url for official releases. - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - # Use this url only for versions not available at releases.mozilla.org, to take load off Mozilla's ftp server. - #url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha256 = "1rrg2rmhczcwx5p5gilavqp4cvlig40ipw9avbgczahqjw89ivap"; + urls = [ + # It is better to use this url for official releases, to take load off Mozilla's ftp server. + "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + # Fall back to this url for versions not available at releases.mozilla.org. + "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + ]; + sha1 = "ad5723fcf4ec6c6734e2022cecad174290fa425e"; }; commonConfigureFlags = -- GitLab From 06eff3c86003461f0a75c284421385e93b6dce8f Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 12 Oct 2012 20:07:20 +0200 Subject: [PATCH 1028/5607] weechat: update to 0.3.9 --- 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 a891c145b76..eb1a9c4474f 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.8"; + version = "0.3.9"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/${name}.tar.gz"; - sha256 = "4293eb9d29f11b8ee8c301049d57e535acbea677bc1dc41ab12fe1bb8af0f10e"; + sha256 = "8666c788cbb212036197365df3ba3cf964a23e4f644d76ea51d66dbe3be593bb"; }; buildInputs = -- GitLab From 1f857877ad7fae8250568f3663e862be71cd12f4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 13 Oct 2012 09:54:37 +0200 Subject: [PATCH 1029/5607] python-publicsuffix: New package, version 1.0.2. This is for determining the public suffix of a particular domain name from http://publicsuffix.org/. 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 387e8964705..9ef6887d2be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1718,6 +1718,23 @@ let pythonPackages = python.modules // rec { }; + publicsuffix = buildPythonPackage rec { + name = "publicsuffix-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/p/publicsuffix/${name}.tar.gz"; + md5 = "f86babf56f6e58b564d3853adebcf37a"; + }; + + meta = { + description = "Allows to get the public suffix of a domain name"; + homepage = "http://pypi.python.org/pypi/publicsuffix/"; + license = pkgs.lib.licenses.mit; + }; + }; + + pyasn1 = buildPythonPackage ({ name = "pyasn1-0.0.11a"; -- GitLab From 900ffd2d000d55ab5b1ecde8a429e791bbad2684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 13 Oct 2012 12:19:58 +0200 Subject: [PATCH 1030/5607] release: making hydra build firefox16. --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0f8ea5574e3..727aff16f01 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -360,6 +360,7 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; firefox15Pkgs.firefox = linux; + firefox16Pkgs.firefox = linux; gnome = { gnome_panel = linux; -- GitLab From 6b8e468e2dbf3e22f1ed2c305360c32f9bbc7372 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 12 Oct 2012 12:55:25 +0200 Subject: [PATCH 1031/5607] iptables: upgrade to 1.4.16.2 --- pkgs/os-specific/linux/iptables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index a1dace598fe..78d8ee52fb1 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iptables-1.4.10"; + name = "iptables-1.4.16.2"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; - md5 = "f382fe693f0b59d87bd47bea65eca198"; + md5 = "57220bb26866a713073e5614f88071fc"; }; # Install header files required by miniupnpd. -- GitLab From 8ea81050717e22847b8045a8017f654c11250fd1 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 12 Oct 2012 12:56:15 +0200 Subject: [PATCH 1032/5607] linux kernels: mark kernels with rpfilter support --- pkgs/os-specific/linux/kernel/linux-3.3.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.4.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.5.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.6.nix | 1 + 4 files changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.3.nix b/pkgs/os-specific/linux/kernel/linux-3.3.nix index 395b93e9f3f..0db9a5c375d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.3.nix @@ -253,6 +253,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; + features.netfilterRPFilter = true; } // removeAttrs args ["extraConfig"] diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index e79bb111a3d..8ab68997e7f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -257,6 +257,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; + features.netfilterRPFilter = 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 a5d375a68a7..42456a8bdd9 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -258,6 +258,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; + features.netfilterRPFilter = true; } // removeAttrs args ["extraConfig"] diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 8afcffba87f..66ca30a839c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -262,6 +262,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; + features.netfilterRPFilter = true; } // removeAttrs args ["extraConfig"] -- GitLab From 5711282fd8b9f536b261018529e9d7d17ff63329 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Fri, 12 Oct 2012 12:56:46 +0200 Subject: [PATCH 1033/5607] linux kernels: mark kernels that can disable the conntrack-helper --- pkgs/os-specific/linux/kernel/linux-3.5.nix | 1 + pkgs/os-specific/linux/kernel/linux-3.6.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/linux-3.5.nix b/pkgs/os-specific/linux/kernel/linux-3.5.nix index 42456a8bdd9..afcf73e0e35 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.5.nix @@ -258,6 +258,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; } diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 66ca30a839c..463833df358 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -262,6 +262,7 @@ import ./generic.nix ( features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; features.netfilterRPFilter = true; } -- GitLab From 12ad270d2a0df32a8622c4c7f5e899da96cf6462 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 09:41:28 +0200 Subject: [PATCH 1034/5607] linux-3.6: upgrade to 3.6.2 --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 463833df358..fdd01bc97e7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6.1"; + version = "3.6.2"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0jpjhnp0pnly2nvfhb5z2wqaw66yzr9pd477rsdmx1wi9gsp07mz"; + sha256 = "1clxrmxq09bjcxcxi2z2fmbfij0zah5jxy29b0b59hgpg24cfyb0"; }; config = configWithPlatform stdenv.platform; -- GitLab From 86693f1c5c73da29d9afdafe2b145430a71a5f13 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 09:41:41 +0200 Subject: [PATCH 1035/5607] linux-3.5: upgrade to 3.5.7 --- 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 afcf73e0e35..78f60c9906a 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.6"; + version = "3.5.7"; 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 = "0z6hklmpm33d1cjwzsny5s03kajp9zmdgxhfrd0aky98x36202gf"; + sha256 = "0k3r0qrlfgn7yk35wf4c49yvyy79kzn42qcrf5kms5iir838kini"; }; config = configWithPlatform stdenv.platform; -- GitLab From 444b136eeeeb04f883273b45b19b37e0336b76b0 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 09:41:53 +0200 Subject: [PATCH 1036/5607] linux-3.4: upgrade to 3.4.14 --- 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 8ab68997e7f..fe80e38eade 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.13"; + version = "3.4.14"; 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 = "16wpnqnjxcrm2aszjdkrn4vlcdm9j35ixnq7myvc432w7pkdqk11"; + sha256 = "0kr7yjhw5di2srryd1aypyi8mlxjh9gvmsz1684mj1fdpxi5adq4"; }; config = configWithPlatform stdenv.platform; -- GitLab From fb62b5fb9185202c4200dae0f43b41586a8164e2 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 09:42:09 +0200 Subject: [PATCH 1037/5607] linux-3.0: upgrade to 3.0.46 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index cc6fd89e46e..b5d54befc09 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.45"; + version = "3.0.46"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0mgv6iqnfam16v2s8hdxpf2imx49sjhndjc80646lk9053l5rh0d"; + sha256 = "1m5zxbnclv1b72pn7zwrmik45pxzsapcj94m39aqq5akq8i149ig"; }; config = configWithPlatform stdenv.platform; -- GitLab From d5e4b92f22e2be41e63e02c07d26980e979b24e2 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 18:53:17 +0200 Subject: [PATCH 1038/5607] add libnfnetlink-1.0.1 --- .../libraries/libnfnetlink/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libnfnetlink/default.nix diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix new file mode 100644 index 00000000000..07a182dff10 --- /dev/null +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libnfnetlink-1.0.1"; + + src = fetchurl { + url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; + md5 = "98927583d2016a9fb1936fed992e2c5e"; + }; + + meta = { + description = "low-level library for netfilter related kernel/userspace communication."; + longDescription = '' + libnfnetlink is the low-level library for netfilter related kernel/userspace communication. + It provides a generic messaging infrastructure for in-kernel netfilter subsystems + (such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users + and/or management tools in userspace. + + This library is not meant as a public API for application developers. + It is only used by other netfilter.org projects, like the aforementioned ones. + ''; + homepage = http://www.netfilter.org/projects/libnfnetlink/index.html; + license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa88d4b5bc3..fc351f94e94 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4275,6 +4275,8 @@ let libmusicbrainz = libmusicbrainz3; + libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; + libnih = callPackage ../development/libraries/libnih { }; libnova = callPackage ../development/libraries/libnova { }; -- GitLab From e9a1c82bac70a24c1b7332b44d2b38d8bae91a64 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 19:27:18 +0200 Subject: [PATCH 1039/5607] add libmnl-1.0.3 --- pkgs/development/libraries/libmnl/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libmnl/default.nix diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix new file mode 100644 index 00000000000..fb6eacc366b --- /dev/null +++ b/pkgs/development/libraries/libmnl/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libmnl-1.0.3"; + + src = fetchurl { + url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; + sha1 = "c27e25f67c6422ebf893fc3a844af8085a1c5b63"; + }; + + meta = { + description = "minimalistic user-space library oriented to Netlink developers"; + longDescription = '' + libmnl is a minimalistic user-space library oriented to Netlink developers. + There are a lot of common tasks in parsing, validating, constructing of both the Netlink + header and TLVs that are repetitive and easy to get wrong. + This library aims to provide simple helpers that allows you to re-use code and to avoid + re-inventing the wheel. + ''; + homepage = http://netfilter.org/projects/libmnl/index.html; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc351f94e94..d4d781a7f95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4257,6 +4257,8 @@ let libmng = callPackage ../development/libraries/libmng { }; + libmnl = callPackage ../development/libraries/libmnl { }; + libmodplug = callPackage ../development/libraries/libmodplug {}; libmpcdec = callPackage ../development/libraries/libmpcdec { }; -- GitLab From c39805d81cd73848d6508d5abb5739b03bffc122 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 19:18:16 +0200 Subject: [PATCH 1040/5607] add libnetfilter_conntrack-1.0.2 --- .../libnetfilter_conntrack/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/libnetfilter_conntrack/default.nix diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix new file mode 100644 index 00000000000..99624911077 --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }: + +stdenv.mkDerivation rec { + name = "libnetfilter_conntrack-1.0.2"; + + src = fetchurl { + url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2"; + md5 = "447114b5d61bb9a9617ead3217c3d3ff"; + }; + + buildInputs = [ pkgconfig libnfnetlink libmnl ]; + + meta = { + description = "userspace library providing an API to the in-kernel connection tracking state table."; + longDescription = '' + libnetfilter_conntrack is a userspace library providing a programming interface (API) to the + in-kernel connection tracking state table. The library libnetfilter_conntrack has been + previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used + by conntrack-tools among many other applications + ''; + homepage = http://netfilter.org/projects/libnetfilter_conntrack/; + license = "GPLv2+"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4d781a7f95..8bbe6bc588d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4277,6 +4277,8 @@ let libmusicbrainz = libmusicbrainz3; + libnetfilter_conntrack = callPackage ../development/libraries/libnetfilter_conntrack { }; + libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; libnih = callPackage ../development/libraries/libnih { }; -- GitLab From e9f0cae00f48a253d1975752b6811ee8ba97f226 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Sat, 13 Oct 2012 18:34:31 +0200 Subject: [PATCH 1041/5607] miniupnpd: upgrade to 1.7.20121005 --- pkgs/tools/networking/miniupnpd/default.nix | 23 +++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 6db47f8e079..b5002d22990 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,33 +1,34 @@ -{ stdenv, fetchurl, iptables }: +{ stdenv, fetchurl, iptables, libnfnetlink, libnetfilter_conntrack }: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.4"; + name = "miniupnpd-1.7.20121005"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "06q5agkzv2snjxcsszpm27h8bqv41jijahs8jqnarxdrik97rfl5"; + sha256 = "03kaxj808hgj1zf2528pzilgywgh70mh0qivjb5nm3spziiq32sv"; }; - buildInputs = [ iptables ]; + buildInputs = [ iptables libnfnetlink libnetfilter_conntrack ]; + + patchPhase = '' + sed -i -e 's/upnputils\.o -lnfnetlink/upnputils.o/' Makefile.linux + ''; NIX_CFLAGS_COMPILE = "-DIPTABLES_143"; - NIX_CFLAGS_LINK = "-liptc"; - + NIX_CFLAGS_LINK = "-liptc -lnfnetlink"; + makefile = "Makefile.linux"; makeFlags = "LIBS="; - postBuild = "cat config.h"; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; - postInstall = + preInstall = '' - mkdir -p $out/share/man/man1 - cp miniupnpd.1 $out/share/man/man1/ + mkdir -p $out/share/man/man8 ''; meta = { -- GitLab From 70334f04ee62efeec44e043ea4548fbf594890db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Oct 2012 20:28:00 +0200 Subject: [PATCH 1042/5607] pkgs/servers/x11/xorg/overrides.nix: xinput needs libXrender to build --- pkgs/servers/x11/xorg/overrides.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 636104b005a..6fde1786a13 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -273,4 +273,7 @@ in buildInputs = attrs.buildInputs ++ [xorg.libXrender]; }; + xinput = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.libXrender]; + }; } -- GitLab From 29980e0d547ad814fa252ffec7fd8ce8ab79596d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 14 Oct 2012 22:28:49 +0400 Subject: [PATCH 1043/5607] Add threads support to CLisp --- pkgs/development/interpreters/clisp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index c985da9a5a2..23b4e4e9e54 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc --with-module=pcre --with-module=rawsock --with-module=readline --with-module=syscalls --with-module=wildcard --with-module=zlib + --with-threads=POSIX_THREADS ''; preBuild = '' -- GitLab From 5ded1fb645ff6acd687707e1eb404ff6082f9321 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 14 Oct 2012 23:48:46 -0700 Subject: [PATCH 1044/5607] - icecast-2.3.3, libshout-2.3.1 --- .../libraries/libshout/default.nix | 30 +++++++++++++++++ pkgs/servers/icecast/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/libshout/default.nix create mode 100644 pkgs/servers/icecast/default.nix diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix new file mode 100644 index 00000000000..45528829cc3 --- /dev/null +++ b/pkgs/development/libraries/libshout/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, pkgconfig +, libvorbis, libtheora, speex}: + +# need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc + +stdenv.mkDerivation { + name = "libshout-2.3.1"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; + sha256 = "cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e"; + }; + + buildInputs = [ libvorbis libtheora speex pkgconfig ]; + + meta = { + description = "icecast 'c' language bindings"; + + longDescription = '' + Libshout is a library for communicating with and sending data to an icecast + server. It handles the socket connection, the timing of the data, and prevents + bad data from getting to the icecast server. + ''; + + homepage = http://www.icecast.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + + }; +} diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix new file mode 100644 index 00000000000..24ae245a8a0 --- /dev/null +++ b/pkgs/servers/icecast/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl +, libxml2, libxslt, curl +, libvorbis, libtheora, speex, libkate }: + +stdenv.mkDerivation rec { + name = "icecast-2.3.3"; + + src = fetchurl { + url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; + sha256 = "0vf38mk13z1czpbj0g8va4rzjf201slqmiwcs8y9i6iwz3shc78v"; + }; + + buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ]; + + meta = { + description = "icecast is free server software for streaming multimedia."; + + longDescription = '' + Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 + audio streams. It can be used to create an Internet radio station or a + privately running jukebox and many things in between. It is very versatile in + that new formats can be added relatively easily and supports open standards for + commuincation and interaction. + ''; + + + homepage = http://www.icecast.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe6bc588d..11dd996f927 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -907,6 +907,8 @@ let iasl = callPackage ../development/compilers/iasl { }; + icecast = callPackage ../servers/icecast { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; @@ -1000,6 +1002,8 @@ let libtirpc = callPackage ../development/libraries/ti-rpc { }; + libshout = callPackage ../development/libraries/libshout { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; logcheck = callPackage ../tools/system/logcheck { -- GitLab From e32db14a594711fe3c1a536925d4a1456bed221a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:01 +0200 Subject: [PATCH 1045/5607] haskell-haddock: add version 2.13.1 --- .../tools/documentation/haddock/2.13.1.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/documentation/haddock/2.13.1.nix diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.1.nix new file mode 100644 index 00000000000..1eed852f537 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.13.1.nix @@ -0,0 +1,18 @@ +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.13.1"; + sha256 = "0zsflbc3ayjsn542sa58zl62dd78ykr489f18sh467hrrnaj4pkf"; + 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 44bb7aef8c7..3794aa970a2 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_4_0; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok alex = self.alex_3_0_1; # 7.6 ok - haddock = self.haddock_2_12_0; # 7.6 ok + haddock = self.haddock_2_13_1; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok }; @@ -1816,7 +1816,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; 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; + haddock_2_13_1 = callPackage ../development/tools/documentation/haddock/2.13.1.nix {}; + haddock = self.haddock_2_13_1; 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 {}; -- GitLab From 6049431dac657bcf239282842838ed3880f95531 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:32 +0200 Subject: [PATCH 1046/5607] haskell-DSH: update to version 0.8.1.0 --- pkgs/development/libraries/haskell/DSH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index bb3e335eafa..c34a5c91458 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "DSH"; - version = "0.8.0.1"; - sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s"; + version = "0.8.1.0"; + sha256 = "13mkpcm34jg7hqc272phiak7rg590hxb6ma3s9lwvp6izcv7vccq"; buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ]; meta = { description = "Database Supported Haskell"; -- GitLab From b7a540e882406124620afbc57a215d1cbc1ad4d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:32 +0200 Subject: [PATCH 1047/5607] haskell-deepseq-th: update to version 0.1.0.4 --- pkgs/development/libraries/haskell/deepseq-th/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index 1072bcb9ca7..2af4bb9f3f1 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "deepseq-th"; - version = "0.1.0.3"; - sha256 = "1xx88i55iskyxrpxbdg0srb64y5siqs1b8qj7bh3i1893qs9sha2"; + version = "0.1.0.4"; + sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965"; buildDepends = [ deepseq ]; meta = { description = "Template Haskell based deriver for optimised NFData instances"; -- GitLab From c1a5a23e44d8abb801b0097ace97201873cfa9a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:32 +0200 Subject: [PATCH 1048/5607] haskell-exception-mtl: update to version 0.3.0.3 --- pkgs/development/libraries/haskell/exception-mtl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index 9b378751ebf..2c64598d1d0 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "exception-mtl"; - version = "0.3.0.2"; - sha256 = "1mhk1z7hz50h8ssr4s7dzdxzn02rr0njxijdddfjjw71fln3nl5h"; + version = "0.3.0.3"; + sha256 = "1mmkp16c5ixknhm69a2zjrs9q0dd5ragmljnjjd6lxpakdlw64ww"; buildDepends = [ exceptionTransformers mtl transformers ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; -- GitLab From 891aec62ae64487c8a458e8c6839b15c01b4b87b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:32 +0200 Subject: [PATCH 1049/5607] haskell-exception-transformers: update to version 0.3.0.3 --- .../libraries/haskell/exception-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index b1e0fcec5e0..5c4a9402020 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "exception-transformers"; - version = "0.3.0.2"; - sha256 = "1ah3dimnc980vkr2lycpl4nsb615gxqws6mv9j90mz6g165h9khf"; + version = "0.3.0.3"; + sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz"; buildDepends = [ stm transformers ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; -- GitLab From ed1cea8a12bee1a260b5f7669d02289ae0d2bf62 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:32 +0200 Subject: [PATCH 1050/5607] haskell-gloss: update to version 1.7.6.5 --- 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 4911b743d42..8fe5080b1ac 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.6.4"; - sha256 = "0nyz9iicc6d96yn6yxzwz08g106qb2aadrxlw120wl01aqfw4xis"; + version = "1.7.6.5"; + sha256 = "0s02vbcyfqzlmjw68kp3arn3vvmldh04460gm050vbc6rqpc8dkv"; buildDepends = [ bmp GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; -- GitLab From fac44cdc2f339890cfd7e2e65ac45a3ccc5a16cc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:32 +0200 Subject: [PATCH 1051/5607] haskell-highlighting-kate: update to version 0.5.3.3 --- .../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 21497f3252a..99726ab0389 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.3.2"; - sha256 = "09yvqxvjzahz0y6yhsfgkx5xm39a74arv294w14sgmhay1wnlwvj"; + version = "0.5.3.3"; + sha256 = "08jxl2ba0kb4vj1qbdf4sas8bwbxzayzwsxnjvq358x57i5l302n"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ]; -- GitLab From ff5969a39f8e42cde6b177aeca364a3c776e0b40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:32 +0200 Subject: [PATCH 1052/5607] haskell-hjsmin: update to version 0.1.3 --- pkgs/development/libraries/haskell/hjsmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 6d749feea3a..35eed1de3f0 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.2"; - sha256 = "04yk383504blg8x10x5j1fd5mzyybqkhz7jfsyimvz2wz2v86qsb"; + version = "0.1.3"; + sha256 = "0lz7qsm74hbs8qa5d3khw43ipiimjbvxsrqqmxvp44605ib22y4d"; buildDepends = [ blazeBuilder languageJavascript text ]; meta = { homepage = "http://github.com/alanz/hjsmin"; -- GitLab From e4f8ccf5b3398ec1a69b7f09303d5501c9cfd03a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1053/5607] haskell-language-c-quote: update to version 0.4.2 --- .../libraries/haskell/language-c-quote/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 3f835383831..9ccd9ccb13e 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -4,14 +4,13 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.4.1"; - sha256 = "1graq6nfmzd2lj6fh1rwyaikfrlzn05pgd347dzrfq5ch35fgg10"; + version = "0.4.2"; + sha256 = "0l69kn8flx36z3cl9ckdls8w2sq8361w6abmi3gsa80l8yg3cpl4"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol ]; buildTools = [ alex happy ]; - jailbreak = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "C/CUDA/OpenCL quasiquoting library"; -- GitLab From 909c17342c12d6acdd44a537c0c77553dc7a2c2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1054/5607] haskell-language-javascript: update to version 0.5.5 --- .../libraries/haskell/language-javascript/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 3f04b3a9289..ccf9d4fd238 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,11 +1,11 @@ -{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }: +{ cabal, alex, blazeBuilder, happy, mtl, utf8Light, utf8String }: cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.4"; - sha256 = "0hjx12n3pkxcdkppqalv6sl68vjlib37gby89ksay807ndslvb9q"; + version = "0.5.5"; + sha256 = "1p02n6rh98nvkh7g5kj18ggcnyvds8lqbgjwgzm83bnd5ayizrw7"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; - buildTools = [ happy ]; + buildTools = [ alex happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; description = "Parser for JavaScript"; -- GitLab From 367eae2bb803bba44f3eb670ed6d4254ad769efd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1055/5607] haskell-mainland-pretty: update to version 0.2.4 --- .../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 e22e0b053e6..5da3e47a333 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.2.2"; - sha256 = "0kvn67g2ic46ybgyxpgpzjapwiww9848m9dv8y3xkkl7jd8anpb2"; + version = "0.2.4"; + sha256 = "0x481k36rz4zvj1nwvrfw1d10vbmmx8gb5f2nc8alnxcbc2y7xwq"; buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; -- GitLab From c701ed4e832d23545706485a2d4eb2b4e8538a1a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1056/5607] haskell-numbers: update to version 3000.1.0.1 --- pkgs/development/libraries/haskell/numbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index b37ab7e5d4c..d1485b7cf1f 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "numbers"; - version = "3000.1.0.0"; - sha256 = "0iqpch8j2i2pnjq8waqb5y95jpmvbzx2r6zsvkja7sl4d578fgpn"; + version = "3000.1.0.1"; + sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4"; meta = { homepage = "https://github.com/DanBurton/numbers"; description = "Various number types"; -- GitLab From e07de73dbe23e872db13ee0441dc6cc37d298884 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1057/5607] haskell-repa: update to version 3.2.2.2 --- pkgs/development/libraries/haskell/repa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index e0a8e591a5b..1ddf05ce5f8 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "repa"; - version = "3.2.2.1"; - sha256 = "0k8i4gm74gc19kfmg2790x1i6im58nqfblq2fq2bilh6rsj8hxh0"; + version = "3.2.2.2"; + sha256 = "1a7rgpy2qc42zc9si7p1zgi1m9b06dz533d2mvhizzac9k3fb5vq"; buildDepends = [ QuickCheck vector ]; meta = { homepage = "http://repa.ouroborus.net"; -- GitLab From b55333241e4e87faa5e162b8274fb2089bd8dbd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1058/5607] haskell-srcloc: update to version 0.3.0 --- 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 2ca9e373101..aa2331cfac3 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.2.1"; - sha256 = "03b0ra5g7mqcjjfnhm84mv4ph454j08pb9dwxrv9zfwk1kiqb2ss"; + version = "0.3.0"; + sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz"; buildDepends = [ syb ]; noHaddock = true; meta = { -- GitLab From 9e617aaf961bdfd782da08bf49b3ee14f8316b6e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1059/5607] haskell-symbol: update to version 0.1.4 --- pkgs/development/libraries/haskell/symbol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index b8dd2aa69a2..d82a1968878 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "symbol"; - version = "0.1.3"; - sha256 = "1kz4kzbv6bara31pv4vc75r6wvjln6md8gjlsxx8hf50ab8vb68j"; + version = "0.1.4"; + sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn"; buildDepends = [ deepseq syb ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; -- GitLab From b82db1ce31373b345aacedcbcaedeb2fb068c73c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:33 +0200 Subject: [PATCH 1060/5607] haskell-warp: update to version 1.3.4.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 0f4764c3e0e..2d9fa98d5ce 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.3.2"; - sha256 = "1w2i5nf3qh7p0xfrrp6x34rw3sxa48v703w1vlsikhyjdqs2crq8"; + version = "1.3.4.1"; + sha256 = "09slbxbk88sjdgs3mibsvp17c85mn2r2sp67fchkmqkhf40lhcxw"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile -- GitLab From 0fdc576cc0f6fab208f02da22e1dbfa1e4180343 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:34 +0200 Subject: [PATCH 1061/5607] haskell-yesod-core: update to version 1.1.3.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 061e3261d2a..0d7346ed589 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.2.2"; - sha256 = "13852r6s7p9b4zvg4pi9qfmgv8g21m0gqlw7bky05jy5a9c8v3a7"; + version = "1.1.3.1"; + sha256 = "16fb0f9si5r65mw7d8j6221qjw61xgi2v60j7dm9j02ljp68i2bq"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes -- GitLab From 35c7887d87cfe891fccb1f625238358664ddd280 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:34 +0200 Subject: [PATCH 1062/5607] haskell-yesod-routes: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/yesod-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index 20374285337..12076d94f26 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.1.0.1"; - sha256 = "1b248ry96p1nyp21c3r9rd3awpdhpqrwj3s6d66pmjf8p0gl5vda"; + version = "1.1.0.2"; + sha256 = "07nrxqkpc5z32c8lk5wz9m6ql703hdhyd86pfk704frvbic02xly"; buildDepends = [ pathPieces text vector ]; meta = { homepage = "http://www.yesodweb.com/"; -- GitLab From e87df1fd830dfbaee801fc7a513b48f01283a483 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:34 +0200 Subject: [PATCH 1063/5607] haskell-yesod: update to version 1.1.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 11bbc9bb6d7..6115601f530 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.1.2"; - sha256 = "0gq4ijfjlkiqw4bp9hxs8r41vlhz33v5l9k1maqjy62d446lrgvw"; + version = "1.1.2"; + sha256 = "02d40crvsnhasa6jhl0k7hzxnwr9lxmbm7caf2mrvpr4sldzy1ss"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From cbc3cb7bd8a75950b3c02a546444bca2f5586737 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:34 +0200 Subject: [PATCH 1064/5607] haskell-BNFC-meta: update to version 0.4 --- pkgs/development/tools/haskell/BNFC-meta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index d4a6090fb1e..198fb89f33c 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "BNFC-meta"; - version = "0.3.0.5"; - sha256 = "0blssa72r2ff4avbibw9a4p8gxy228f3lb1vc9aqr881v79b2cpp"; + version = "0.4"; + sha256 = "0qmkc2h4fqryvq763k6skx6c24h9njh4bsdspfbyq1nzxxb9mvy0"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; noHaddock = true; meta = { - description = "Deriving Quasi-Quoters from BNF Grammars"; + description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; -- GitLab From b1701fc609e658cb3c8c7f83cf489dd0442d3cb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:52:34 +0200 Subject: [PATCH 1065/5607] haskell-alex-meta: update to version 0.3.0.5 --- pkgs/development/tools/haskell/alex-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 1b971f3b3df..e28b37aafc6 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "alex-meta"; - version = "0.3.0.4"; - sha256 = "0d0ii1djigydj2papcilkr8mazp70vg6hy179h28j9i1bshp3anp"; + version = "0.3.0.5"; + sha256 = "0f41q5l6z1dcpfx8rxacv4f544zcw7pgvq935mnzzha9fvsxqzk4"; buildDepends = [ haskellSrcMeta QuickCheck ]; noHaddock = true; meta = { -- GitLab From 5c9b7e3f154df7c5a49b001a9e0586774b0657da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 11:59:29 +0200 Subject: [PATCH 1066/5607] haskell-packages: update haskellPlatformArgs_future --- pkgs/top-level/haskell-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3794aa970a2..54665669400 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -120,6 +120,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; + async = self.async_2_0_1_3; # 7.6 ok cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok GLUT = self.GLUT_2_3_0_0; # 7.6 ok @@ -137,16 +138,19 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); regexBase = self.regexBase_0_93_2; # 7.6 ok regexCompat = self.regexCompat_0_95_1; # 7.6 ok regexPosix = self.regexPosix_0_95_2; # 7.6 ok + split = self.split_0_2_1_1; # 7.6 ok 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 + vector = self.vector_0_10; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_0; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok - alex = self.alex_3_0_1; # 7.6 ok + alex = self.alex_3_0_2; # 7.6 ok haddock = self.haddock_2_13_1; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok + primitive = self.primitive_0_5_0_1; # semi-official, but specified }; haskellPlatformArgs_2012_4_0_0 = self : { -- GitLab From 94471a459ffd79a1cd0e32e017844bd9b5e0b086 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Mon, 15 Oct 2012 14:26:44 +0200 Subject: [PATCH 1067/5607] Updated synergy to 1.4.10-foss --- pkgs/applications/misc/synergy/default.nix | 41 +++++++++++----------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index cb79bf592fe..9708119ecf8 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,31 +1,30 @@ -{ stdenv, fetchurl, x11, xextproto, libXtst, inputproto, libXi -, automake, autoconf, sourceFromHead }: +{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst }: -stdenv.mkDerivation { - name = "synergy-cvs"; +stdenv.mkDerivation rec { + name = "synergy-1.4.10"; - # note: There is a fork: - # http://code.google.com/p/synergy-plus - - # REGION AUTO UPDATE: { name="synergy"; type = "cvs"; cvsRoot = ":pserver:anonymous@synergy2.cvs.sourceforge.net:/cvsroot/synergy2"; module="syngery"; } - src= sourceFromHead "synergy-F_23-55-02.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; }); - # END - - buildInputs = [ x11 xextproto libXtst inputproto libXi automake autoconf ]; + src = fetchurl { + url = "http://synergy.googlecode.com/files/${name}-Source.tar.gz"; + sha256 = "1ghgf96gbk4sdw8sqlc3pjschkmmqybihi12mg6hi26gnk7a5m86"; + }; - preConfigure = "autoreconf"; + buildInputs = [ cmake x11 libX11 libXi libXtst ]; + + # At this moment make install doesn't work for synergy + # http://synergy-foss.org/spit/issues/details/3317/ - patches = - [ (fetchurl { - url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz; - sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7"; - }) - ]; + + installPhase = '' + ensureDir $out/bin + pwd + cp ../bin/synergyc $out/bin + cp ../bin/synergys $out/bin + cp ../bin/synergyd $out/bin + ''; meta = { description = "Tool to share the mouse keyboard and the clipboard between computers"; - homepage = http://synergy2.sourceforge.net; + homepage = http://synergy-foss.org; license = "GPL"; }; } -- GitLab From b377586b7a5efd07de49ec2cf3bff73a960c0994 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 10:21:13 -0400 Subject: [PATCH 1068/5607] Fix psi build hydra.nixos.org/build/3154247 --- .../instant-messengers/psi/default.nix | 22 ++++++++++--------- .../instant-messengers/psi/psimedia.nix | 8 ++++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 2c6ba36c44f..7f9d61f9c44 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, - libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: +{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM +, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: stdenv.mkDerivation rec { name = "psi-0.14"; - + src = fetchurl { url = "mirror://sourceforge/psi/${name}.tar.bz2"; sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; }; - buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig which glib]; + buildInputs = + [ aspell qt4 zlib sox libX11 xproto libSM libICE + qca2 qca2_ossl pkgconfig which glib + ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - + NIX_LDFLAGS="-lqca"; configureFlags = @@ -23,6 +25,8 @@ stdenv.mkDerivation rec { psiMedia = callPackage ./psimedia.nix { }; + enableParallelBuilding = true; + postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" mkdir -p "$PSI_PLUGINS" @@ -34,9 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Psi, an XMPP (Jabber) client"; - maintainers = with stdenv.lib.maintainers; - [raskin]; - platforms = with stdenv.lib.platforms; - linux; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index df821da42f2..993a018625e 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which -, glib, pkgconfig}: +{ stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which +, glib, pkgconfig }: stdenv.mkDerivation rec { name = "psimedia"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781"; }; - buildInputs = [qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig]; + patches = [ ./glib-2.32.patch ]; + + buildInputs = [ qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig ]; configurePhase = ''./configure''; -- GitLab From 789adef3a42b98da77c6beb975ef700669f3789d Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Mon, 1 Oct 2012 19:45:11 +0000 Subject: [PATCH 1069/5607] fixes the build error for 4.7 and 4.8 with both don't work with boost 1.50 --- 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 e2e8fc4b28c..98bfa5b3e9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8362,9 +8362,9 @@ let kde4 = recurseIntoAttrs pkgs.kde47; - kde47 = kdePackagesFor pkgs.kde47 "4.7"; + kde47 = kdePackagesFor (pkgs.kde47 // {boost = boost149;}) "4.7"; - kde48 = kdePackagesFor pkgs.kde48 "4.8"; + kde48 = kdePackagesFor (pkgs.kde48 // {boost = boost149;}) "4.8"; kdePackagesFor = self: version: let callPackageOrig = callPackage; in -- GitLab From 9663c37534842272537ef8d930959a489d3a0782 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 10:50:38 -0400 Subject: [PATCH 1070/5607] Cleanup --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98bfa5b3e9e..a2a5a3691e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8362,15 +8362,15 @@ let kde4 = recurseIntoAttrs pkgs.kde47; - kde47 = kdePackagesFor (pkgs.kde47 // {boost = boost149;}) "4.7"; + kde47 = kdePackagesFor (pkgs.kde47 // {boost = boost149;}) ../desktops/kde-4.7; - kde48 = kdePackagesFor (pkgs.kde48 // {boost = boost149;}) "4.8"; + kde48 = kdePackagesFor (pkgs.kde48 // {boost = boost149;}) ../desktops/kde-4.8; - kdePackagesFor = self: version: + kdePackagesFor = self: dir: let callPackageOrig = callPackage; in let callPackage = newScope self; - kde4 = callPackageOrig (../desktops/kde- + version) { + kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; }; in kde4 // { -- GitLab From 873595ee6d7f1a890ca834cea7012ef50fc083dd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 11:14:26 -0400 Subject: [PATCH 1071/5607] php: Update to 5.3.17 Also remove unsupported PHP 5.2 (which doesn't build anymore). http://hydra.nixos.org/build/3131326 --- pkgs/development/interpreters/php/5.2.nix | 172 ---------------------- pkgs/development/interpreters/php/5.3.nix | 42 +++--- pkgs/top-level/all-packages.nix | 16 +- 3 files changed, 21 insertions(+), 209 deletions(-) delete mode 100644 pkgs/development/interpreters/php/5.2.nix diff --git a/pkgs/development/interpreters/php/5.2.nix b/pkgs/development/interpreters/php/5.2.nix deleted file mode 100644 index 4395c0f498c..00000000000 --- a/pkgs/development/interpreters/php/5.2.nix +++ /dev/null @@ -1,172 +0,0 @@ -args: with args; - -let - - inherit (args.composableDerivation) composableDerivation edf wwf; - -in - -composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - - version = "5.2.17"; - - name = "php-${version}"; - - buildInputs = ["flex" "bison" "pkgconfig"]; - - flags = { - -# much left to do here... - - # SAPI modules: - - apxs2 = { - configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; - buildInputs = [apacheHttpd]; - }; - - # Extensions - - curl = { - configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"]; - buildInputs = [curl openssl]; - }; - - zlib = { - configureFlags = ["--with-zlib=${args.zlib}"]; - buildInputs = [zlib]; - }; - - libxml2 = { - configureFlags = [ - "--with-libxml-dir=${libxml2}" - "--with-iconv-dir=${libiconv}" - ]; - buildInputs = [ libxml2 ]; - }; - - readline = { - configureFlags = ["--with-readline=${readline}"]; - buildInputs = [ readline ]; - }; - - sqlite = { - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; - buildInputs = [ sqlite ]; - }; - - postgresql = { - configureFlags = ["--with-pgsql=${postgresql}"]; - buildInputs = [ postgresql ]; - }; - - mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; - }; - - mysqli_embedded = { - configureFlags = ["--enable-embedded-mysqli"]; - depends = "mysqli"; - assertion = fixed.mysqliSupport; - }; - - pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - bcmath = { - configureFlags = ["--enable-bcmath"]; - }; - - gd = { - configureFlags = ["--with-gd=${args.gd}"]; - buildInputs = [gd libpng libjpeg ]; - }; - - soap = { - configureFlags = ["--enable-soap"]; - }; - - sockets = { - configureFlags = ["--enable-sockets"]; - }; - - openssl = { - configureFlags = ["--with-openssl=${args.openssl}"]; - buildInputs = ["openssl"]; - }; - - mbstring = { - configureFlags = ["--enable-mbstring"]; - }; - - /* - php is build within this derivation in order to add the xdebug lines to the php.ini. - So both Apache and command line php both use xdebug without having to configure anything. - Xdebug could be put in its own derivation. - * / - meta = { - description = "debugging support for PHP"; - homepage = http://xdebug.org; - license = "based on the PHP license - as is"; - }; - */ - }; - - cfg = { - mysqlSupport = config.php.mysql or true; - mysqliSupport = config.php.mysqli or true; - pdo_mysqlSupport = config.php.pdo_mysql or true; - libxml2Support = config.php.libxml2 or true; - apxs2Support = config.php.apxs2 or true; - bcmathSupport = config.php.bcmath or true; - socketsSupport = config.php.sockets or true; - curlSupport = config.php.curl or true; - gettextSupport = config.php.gettext or true; - postgresqlSupport = config.php.postgresql or true; - readlineSupport = config.php.readline or true; - sqliteSupport = config.php.sqlite or true; - soapSupport = config.php.soap or true; - zlibSupport = config.php.zlib or true; - opensslSupport = config.php.openssl or true; - mbstringSupport = config.php.mbstring or true; - gdSupport = config.php.gd or true; - }; - - configurePhase = '' - iniFile=$out/etc/php-recommended.ini - [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags - echo configurePhase end - ''; - - 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 - ''; - - src = args.fetchurl { - url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "0v0i7zjp1a2c60imn58xjqcczmiglnfnwdkgwl0bfai4xh9yn6z8"; - name = "php-${version}.tar.bz2"; - }; - - meta = { - description = "The PHP language runtime engine"; - homepage = http://www.php.net/; - license = "PHP-3"; - }; - - patches = [./fix.patch]; - -}) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index d4aebc77637..b811e7349c8 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -1,25 +1,23 @@ -args: with args; +{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison +, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql +, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng }: -let +composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - inherit (args.composableDerivation) composableDerivation edf wwf; - -in - -composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - - version = "5.3.15"; + version = "5.3.17"; name = "php-${version}"; + enableParallelBuilding = true; + buildInputs = ["flex" "bison" "pkgconfig"]; flags = { -# much left to do here... + # much left to do here... # SAPI modules: - + apxs2 = { configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; buildInputs = [apacheHttpd]; @@ -28,12 +26,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { # Extensions curl = { - configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"]; + configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; buildInputs = [curl openssl]; }; - + zlib = { - configureFlags = ["--with-zlib=${args.zlib}"]; + configureFlags = ["--with-zlib=${zlib}"]; buildInputs = [zlib]; }; @@ -44,7 +42,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { ]; buildInputs = [ libxml2 ]; }; - + readline = { configureFlags = ["--with-readline=${readline}"]; buildInputs = [ readline ]; @@ -54,12 +52,12 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { configureFlags = ["--with-pdo-sqlite=${sqlite}"]; buildInputs = [ sqlite ]; }; - + postgresql = { configureFlags = ["--with-pgsql=${postgresql}"]; buildInputs = [ postgresql ]; }; - + mysql = { configureFlags = ["--with-mysql=${mysql}"]; buildInputs = [ mysql ]; @@ -80,13 +78,13 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { configureFlags = ["--with-pdo-mysql=${mysql}"]; buildInputs = [ mysql ]; }; - + bcmath = { configureFlags = ["--enable-bcmath"]; }; gd = { - configureFlags = ["--with-gd=${args.gd}"]; + configureFlags = ["--with-gd=${gd}"]; buildInputs = [gd libpng libjpeg ]; }; @@ -99,7 +97,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { }; openssl = { - configureFlags = ["--with-openssl=${args.openssl}"]; + configureFlags = ["--with-openssl=${openssl}"]; buildInputs = ["openssl"]; }; @@ -152,9 +150,9 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { cp php.ini-production $iniFile ''; - src = args.fetchurl { + src = fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "1vzij845n2akh2lkpacgdc5r0f7nw6pk9l9vi1h8l8k4krjjbdzr"; + sha256 = "02bmjlznnfhxhyd4wvk8ky9vpqwl9rbyng803r7ygf84sibyi1dd"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a5a3691e7..d73257ef966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2750,21 +2750,7 @@ let perl = if system != "i686-cygwin" then perl514 else sysPerl; - php = php5_3; - - php5_2 = makeOverridable (import ../development/interpreters/php/5.2.nix) { - inherit - stdenv fetchurl lib composableDerivation autoconf automake - flex bison apacheHttpd mysql libxml2 readline - zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng; - }; - - php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) { - inherit - stdenv fetchurl lib composableDerivation autoconf automake - flex bison apacheHttpd mysql libxml2 readline - zlib curl gd postgresql openssl pkgconfig sqlite config libiconv libjpeg libpng; - }; + php = callPackage ../development/interpreters/php/5.3.nix { }; php_apc = callPackage ../development/libraries/php-apc { }; -- GitLab From 55aa7f0d6fc9ce37b818b185b3ce08185bbef68b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 11:27:37 -0400 Subject: [PATCH 1072/5607] sylpheed: Update to 3.2 http://hydra.nixos.org/build/3156892 --- .../mailreaders/sylpheed/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index de046562274..bf9e19642b8 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -5,25 +5,31 @@ , gpgme ? null }: +with stdenv.lib; + assert sslSupport -> openssl != null; assert gpgSupport -> gpgme != null; stdenv.mkDerivation { - name = "sylpheed-2.7.1"; + name = "sylpheed-3.2"; src = fetchurl { - url = http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-2.7.1.tar.bz2; - sha256 = "08sfz159y8hi3lky98m6p4nkfiima749lza8gf3s3vp2niylbdlb"; + url = http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2; + sha256 = "1cdjwn1f8rgcxzfxj7j7qvacmaw4zfhnip81q4n5lj5d6rj7rssa"; }; - buildInputs = [ - pkgconfig gtk - (if sslSupport then openssl else null) - (if gpgSupport then gpgme else null) - ]; + buildInputs = + [ pkgconfig gtk ] + ++ optional sslSupport openssl + ++ optional gpgSupport gpgme; - configureFlags = [ - (if sslSupport then "--enable-ssl" else null) - ]; + configureFlags = optionalString sslSupport "--enable-ssl"; + meta = { + homepage = http://sylpheed.sraoss.jp/en/; + description = "A lightweight and user-friendly e-mail client"; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; + license = "GPL"; + }; } -- GitLab From 3b968053d4f2345ad7da83068d04e02b92371867 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 11:52:11 -0400 Subject: [PATCH 1073/5607] Fix font-schumacher-misc build http://hydra.nixos.org/build/3157818 --- pkgs/servers/x11/xorg/default.nix | 40 +++++++++---------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 +- pkgs/servers/x11/xorg/overrides.nix | 26 ------------ 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 28eb2a1b8e4..c8638fd7459 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -104,8 +104,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) { name = "font-adobe-75dpi-1.0.3"; @@ -114,8 +114,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-75dpi-1.0.3.tar.bz2; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) { name = "font-adobe-utopia-100dpi-1.0.4"; @@ -124,8 +124,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-100dpi-1.0.4.tar.bz2; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) { name = "font-adobe-utopia-75dpi-1.0.4"; @@ -134,8 +134,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-adobe-utopia-75dpi-1.0.4.tar.bz2; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) { name = "font-adobe-utopia-type1-1.0.4"; @@ -174,8 +174,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-100dpi-1.0.3.tar.bz2; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) { name = "font-bh-75dpi-1.0.3"; @@ -184,8 +184,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-75dpi-1.0.3.tar.bz2; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; @@ -194,8 +194,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; @@ -204,8 +204,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) { name = "font-bh-ttf-1.0.3"; @@ -374,8 +374,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-misc-misc-1.1.2.tar.bz2; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) { name = "font-mutt-misc-1.0.3"; @@ -394,8 +394,8 @@ let url = mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; - buildInputs = [pkgconfig bdftopcf fontutil mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; - })) // {inherit bdftopcf fontutil mkfontdir ;}; + buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; + })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;}; fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) { name = "font-screen-cyrillic-1.0.4"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 89edb571e0f..7b00e5e9043 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -169,7 +169,7 @@ while (<>) { } if ($file =~ /XORG_FONT_UCS2ANY/) { - push @requires, "fontutil"; + push @requires, "fontutil", "mkfontscale"; $isFont = 1; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 6fde1786a13..dbdc270fbe1 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -8,33 +8,7 @@ let in { - fontadobe75dpi = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - }; - - fontadobe100dpi = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - }; - - fontbh100dpi = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - }; - - fontbhlucidatypewriter75dpi = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - }; - - fontbhlucidatypewriter100dpi = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - }; - - fontcursormisc = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - }; - fontmiscmisc = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; - postInstall = '' ALIASFILE=${xorg.fontalias}/share/fonts/X11/misc/fonts.alias -- GitLab From 80fa05f1f550859bbbaed81ad05fb7709efc61e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 12:09:28 -0400 Subject: [PATCH 1074/5607] xf86-video-intel: Update to 2.20.10 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c8638fd7459..e92d5e4a666 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1518,11 +1518,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.20.8"; + name = "xf86-video-intel-2.20.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.20.8.tar.bz2; - sha256 = "1rw3rb3zjvx3qyppynj3mi8zs4rpx2b193znxssrv39vp4mnn4ia"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2; + sha256 = "1kfd6qiqxyqhjp8g1xcipkldsf7xa47q8zfdhxg3qzw77n6a4hfz"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; })) // {inherit dri2proto fontsproto libdrm udev libpciaccess pixman randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 81fab682bfc..5511f3f043f 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -132,7 +132,7 @@ mirror://xorg/X11R7.7/src/everything/xf86-video-geode-2.11.13.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-glide-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-glint-1.2.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-i128-1.3.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.20.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.20.10.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-6.9.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-mga-1.5.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-neomagic-1.2.6.tar.bz2 -- GitLab From 1d8e80f1b9590c57089f4595d9a3a4c38dc37906 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 12:13:39 -0400 Subject: [PATCH 1075/5607] Fix gvfs build http://hydra.nixos.org/build/3156351 --- pkgs/desktops/gnome-2/desktop/gvfs/default.nix | 14 ++++++++------ pkgs/desktops/xfce-4.8/support/gvfs.nix | 16 ++++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix index 5455e95ef3f..bae6c19c6ea 100644 --- a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, pkgconfig, dbus_libs, samba, libarchive, fuse, libgphoto2 , libcdio, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup -, udev, avahi}: +, udev, avahi, libxslt, docbook_xsl }: -stdenv.mkDerivation { - name = "gvfs-1.10.1"; +stdenv.mkDerivation rec { + name = "gvfs-1.14.1"; src = fetchurl { - url = mirror://gnome/sources/gvfs/1.10/gvfs-1.10.1.tar.xz; - sha256 = "124jrkph3cqr2pijmzzr6qwzy2vaq3vvndskzkxd0v5dwp7glc6d"; + url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; + sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a"; }; buildInputs = [ glib dbus_libs udev samba libarchive fuse libgphoto2 libcdio libxml2 GConf - libgnome_keyring libsoup avahi libtool + libgnome_keyring libsoup avahi libtool libxslt docbook_xsl ]; buildNativeInputs = [ pkgconfig intltool ]; + + enableParallelBuilding = true; } diff --git a/pkgs/desktops/xfce-4.8/support/gvfs.nix b/pkgs/desktops/xfce-4.8/support/gvfs.nix index 33f7315a9d9..f922b194f87 100644 --- a/pkgs/desktops/xfce-4.8/support/gvfs.nix +++ b/pkgs/desktops/xfce-4.8/support/gvfs.nix @@ -1,14 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, intltool, udev, libgdu, fuse +, libxml2, libxslt, docbook_xsl, libgphoto2, libtool }: stdenv.mkDerivation rec { - name = "gvfs-1.8.2"; - + name = "gvfs-1.14.1"; + src = fetchurl { - url = "mirror://gnome/sources/gvfs/1.8/${name}.tar.bz2"; - sha256 = "0895ac8f6d416e1b15433b6b6b68eb119c6e8b04fdb66db665d684355ef89345"; + url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; + sha256 = "0af86cd7ee7b6daca144776bdf12f2f30d3e18fdd70b4da58e1a68cea4f6716a"; }; - buildInputs = [ pkgconfig glib dbus.libs intltool udev libgdu fuse ]; + buildInputs = + [ pkgconfig glib dbus.libs intltool udev libgdu fuse libxml2 libxslt + docbook_xsl libgphoto2 libtool + ]; meta = { description = "Virtual Filesystem support library (for Xfce)"; -- GitLab From 3c2f28c67e8f5c580810b56001165b551cf0fc0c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 12:16:01 -0400 Subject: [PATCH 1076/5607] firefox: Disable profiling since it adds 12 MB to the build --- pkgs/applications/networking/browsers/firefox/16.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/16.0.nix index 48ecebd8e19..063d36ccfcf 100644 --- a/pkgs/applications/networking/browsers/firefox/16.0.nix +++ b/pkgs/applications/networking/browsers/firefox/16.0.nix @@ -32,7 +32,7 @@ rec { commonConfigureFlags = [ "--enable-optimize" - "--enable-profiling" + #"--enable-profiling" "--disable-debug" "--enable-strip" "--with-system-jpeg" -- GitLab From 87c5696996eb4396b2891d90d67c0dd075836883 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 19:06:59 +0200 Subject: [PATCH 1077/5607] pkgs/servers/x11/xorg/overrides.nix: correctly patch path to mkfontscale into mkfontdir wrapper script --- pkgs/servers/x11/xorg/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index dbdc270fbe1..a35de21d389 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -24,7 +24,7 @@ in }; mkfontdir = attrs: attrs // { - preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${xorg.mkfontscale}/bin"; + preBuild = "substituteInPlace mkfontdir.in --replace @bindir@ ${xorg.mkfontscale}/bin"; }; libxcb = attrs : attrs // { -- GitLab From 31212a0a95cae01735025e1607133254975bee20 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 12:28:09 -0400 Subject: [PATCH 1078/5607] Fix font-cursor-misc build --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a35de21d389..de32722ed7c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -8,6 +8,10 @@ let in { + fontcursormisc = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ xorg.mkfontscale ]; + }; + fontmiscmisc = attrs: attrs // { postInstall = '' -- GitLab From ba2911fe1e88582b625ec4c95fb791fcea1ecb56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 12:42:01 -0400 Subject: [PATCH 1079/5607] lvm2: Update to 2.02.98 --- pkgs/os-specific/linux/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 1ebebfd634b..05098c64194 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, utillinux, coreutils }: let - v = "2.02.97"; + v = "2.02.98"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/old/LVM2.${v}.tgz"; - sha256 = "0azwa555dgvixbdw055yj8cj1q6kd0a36nms005iz7la5q0q5npd"; + sha256 = "0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi"; }; configureFlags = -- GitLab From 1bf9b9bc7be39752392a504a3cce6d600caab463 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Mon, 15 Oct 2012 20:00:20 +0200 Subject: [PATCH 1080/5607] fix align --- pkgs/applications/misc/synergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 9708119ecf8..528b5763429 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ensureDir $out/bin pwd cp ../bin/synergyc $out/bin - cp ../bin/synergys $out/bin - cp ../bin/synergyd $out/bin + cp ../bin/synergys $out/bin + cp ../bin/synergyd $out/bin ''; meta = { -- GitLab From 99620556271332fc0e9c1c877de1f2a698920ad9 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Mon, 15 Oct 2012 20:01:45 +0200 Subject: [PATCH 1081/5607] Remove pwd to know where I am --- pkgs/applications/misc/synergy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 528b5763429..a267a29c7e2 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { installPhase = '' ensureDir $out/bin - pwd cp ../bin/synergyc $out/bin cp ../bin/synergys $out/bin cp ../bin/synergyd $out/bin -- GitLab From 87399d57d62f6eef186f24ae83c3aa6dfa813653 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 14:02:15 -0400 Subject: [PATCH 1082/5607] Doh! Forgot to add file --- .../instant-messengers/psi/glib-2.32.patch | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch diff --git a/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch b/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch new file mode 100644 index 00000000000..49988c253bd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch @@ -0,0 +1,54 @@ +http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch?view=log + +Index: psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h ++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h +@@ -21,7 +21,7 @@ + #ifndef GSTCUSTOMELEMENTS_H + #define GSTCUSTOMELEMENTS_H + +-#include ++#include + #include + #include + #include +Index: psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h ++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h +@@ -21,7 +21,7 @@ + #ifndef PSI_GSTELEMENTS_H + #define PSI_GSTELEMENTS_H + +-#include ++#include + + G_BEGIN_DECLS + +Index: psimedia-1.0.3/gstprovider/gstthread.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/gstthread.h ++++ psimedia-1.0.3/gstprovider/gstthread.h +@@ -22,7 +22,7 @@ + #define PSI_GSTTHREAD_H + + #include +-#include ++#include + + namespace PsiMedia { + +Index: psimedia-1.0.3/gstprovider/rwcontrol.h +=================================================================== +--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h ++++ psimedia-1.0.3/gstprovider/rwcontrol.h +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include "psimediaprovider.h" + #include "rtpworker.h" + -- GitLab From 34380b91a61b3459b896d73d54a2962db6ab975a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:07:42 +0200 Subject: [PATCH 1083/5607] haskell-network-info: add version 0.2.0.2 --- .../libraries/haskell/network-info/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/network-info/default.nix diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix new file mode 100644 index 00000000000..d218af97362 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "network-info"; + version = "0.2.0.2"; + sha256 = "132cna6dc8azpll3rm2y4wv6sdcavwjq3x9f8m4p2952vr53bw3m"; + meta = { + homepage = "http://github.com/jystic/network-info"; + description = "Access the local computer's basic network configuration"; + 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 54665669400..ca82c29fa2d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1189,6 +1189,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; + networkInfo = callPackage ../development/libraries/haskell/network-info {}; + networkMulticast = callPackage ../development/libraries/haskell/network-multicast {}; networkTransport = callPackage ../development/libraries/haskell/network-transport {}; -- GitLab From e7121b6f27ebc50035a540c5f0f0e023ea9792d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:07:54 +0200 Subject: [PATCH 1084/5607] haskell-libxml-sax: add version 0.7.3 --- .../libraries/haskell/libxml-sax/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/libxml-sax/default.nix diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix new file mode 100644 index 00000000000..b41ca8dfa54 --- /dev/null +++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix @@ -0,0 +1,16 @@ +{ cabal, libxml2, text, xmlTypes }: + +cabal.mkDerivation (self: { + pname = "libxml-sax"; + version = "0.7.3"; + sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r"; + buildDepends = [ text xmlTypes ]; + extraLibraries = [ libxml2 ]; + pkgconfigDepends = [ libxml2 ]; + meta = { + homepage = "https://john-millikin.com/software/haskell-libxml/"; + description = "Bindings for the libXML2 SAX interface"; + 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 ca82c29fa2d..5bb1b88527a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1089,6 +1089,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; + libxmlSax = callPackage ../development/libraries/haskell/libxml-sax {}; + liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; ListLike = callPackage ../development/libraries/haskell/ListLike {}; -- GitLab From c8851cefbc7521af4191d9e93806dc05473d9984 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:08:01 +0200 Subject: [PATCH 1085/5607] haskell-dbus: add version 0.10.1 --- .../libraries/haskell/dbus/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/dbus/default.nix diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix new file mode 100644 index 00000000000..c32edff3044 --- /dev/null +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -0,0 +1,19 @@ +{ cabal, cereal, libxmlSax, network, parsec, random, text +, transformers, vector, xmlTypes +}: + +cabal.mkDerivation (self: { + pname = "dbus"; + version = "0.10.1"; + sha256 = "180923lp09pwcvxffxyq753mq7zp7dyxgaj3h13wfsrhfia0awz8"; + buildDepends = [ + cereal libxmlSax network parsec random text transformers vector + xmlTypes + ]; + meta = { + homepage = "https://john-millikin.com/software/haskell-dbus/"; + description = "A client library for the D-Bus IPC system"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5bb1b88527a..4acc9ab0186 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -660,6 +660,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); datetime = callPackage ../development/libraries/haskell/datetime {}; + dbus = callPackage ../development/libraries/haskell/dbus {}; + 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 {}; -- GitLab From c90a15a604aa1c605883dd5d5eeac099244fe210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:17:23 +0200 Subject: [PATCH 1086/5607] git-annex: update to version 3.20121010 --- .../git-and-tools/default.nix | 11 +++--- .../git-and-tools/git-annex/default.nix | 34 ++++++++++++------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 6ee19832750..e12d4157ec2 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -43,10 +43,13 @@ rec { }); gitAnnex = lib.makeOverridable (import ./git-annex) { - inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh; - inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc - HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse - QuickCheck bloomfilter editDistance stm hinotify; + inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; + inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl + network pcreLight QuickCheck SHA stm utf8String networkInfo dbus + clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet + httpTypes networkMulticast text time transformers transformersBase wai + waiLogger warp yesod yesodDefault yesodStatic testpack; }; qgit = import ./qgit { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 86c8e9717b1..13b3d263ad4 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 @@ -1,27 +1,35 @@ -{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt -, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl -, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils -, IfElse, bloomfilter, editDistance, openssh, stm, hinotify +{ stdenv, ghc, fetchurl, perl, coreutils, git, libuuid, rsync +, findutils, curl, ikiwiki, which, openssh +, blazeBuilder, blazeHtml, bloomfilter, caseInsensitive +, clientsession, cryptoApi, dataDefault, dataenc, dbus +, editDistance, extensibleExceptions, filepath, hamlet, hinotify +, hS3, hslogger, HTTP, httpTypes, IfElse, json, liftedBase +, MissingH, monadControl, mtl, network, networkInfo +, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time +, transformers, transformersBase, utf8String, wai, waiLogger, warp +, yesod, yesodDefault, yesodStatic, testpack }: let - version = "3.20120825"; + version = "3.20121010"; 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 = "edffe6a99d07599f62d4d5f6823de8a830abe8977c7671fd6eb21aeaebc0b8d0"; + sha256 = "4db543af6cbcb2d92c808c01969425d1fd1a916b37386dcdfe1a3101876ccde2"; name = "git-annex-${version}.tar.gz"; }; - buildInputs = [ - curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json - libuuid MissingH monadControl mtl network pcreLight perl QuickCheck - rsync SHA testpack utf8String which liftedBase IfElse bloomfilter - editDistance openssh stm hinotify - ]; + buildInputs = [ ghc git libuuid rsync findutils curl ikiwiki which + openssh blazeBuilder blazeHtml bloomfilter caseInsensitive + clientsession cryptoApi dataDefault dataenc dbus editDistance + extensibleExceptions filepath hamlet hinotify hS3 hslogger HTTP + httpTypes IfElse json liftedBase MissingH monadControl mtl network + networkInfo networkMulticast pcreLight QuickCheck SHA stm text time + transformers transformersBase utf8String wai waiLogger warp yesod + yesodDefault yesodStatic testpack ]; checkTarget = "test"; doCheck = true; @@ -29,7 +37,7 @@ stdenv.mkDerivation { # The 'add_url' test fails because it attempts to use the network. preConfigure = '' makeFlagsArray=( PREFIX=$out ) - sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man + sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/mdwn2man sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs ''; -- GitLab From a13346961f34acb7c2604599b2603028d4fe1a46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 15 Oct 2012 20:23:43 +0200 Subject: [PATCH 1087/5607] haskell-cabal2nix: update to version 1.40 --- 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 72c032342d9..6eac3153009 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.39"; - sha256 = "0q2kgzjbcrqxml12hncsrkjdwjiq52dp00v6i3qdgiyj460iy60d"; + version = "1.40"; + sha256 = "0finmky9lyzg5gs0y95fb0gmzraszljv7l5271185jmhky4wppim"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; -- GitLab From 3aae32372a5c86ae8953873a573ccb9775200217 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 14:46:15 -0400 Subject: [PATCH 1088/5607] Work around some crazy race condition in devicemapper device creation --- .../linux/lvm2/assume-uevent-generated.patch | 39 +++++++++++++++++++ pkgs/os-specific/linux/lvm2/default.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch diff --git a/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch b/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch new file mode 100644 index 00000000000..4098d042fd5 --- /dev/null +++ b/pkgs/os-specific/linux/lvm2/assume-uevent-generated.patch @@ -0,0 +1,39 @@ +Work around LVM/cryptsetup errors like: + + semid 32768: semop failed for cookie 0xd4d41f4: incorrect semaphore state + Failed to set a proper state for notification semaphore identified by cookie value 223166964 (0xd4d41f4) to initialize waiting for incoming notifications. + +and (when running "cryptsetup --debug"): + + Uevent not generated! Calling udev_complete internally to avoid process lock-up. + +Here for some reason libdm *thinks* that the uevent hasn't been +emitted, so it calls udev_complete. But the uevent actually *has* +been emitted, so udev calls ‘dmsetup udevcomplete’ as well, leading to +a race. + +This is probably a reoccurence of the problem described here: + + http://www.redhat.com/archives/dm-devel/2011-August/msg00075.html + http://www.redhat.com/archives/linux-lvm/2011-September/msg00023.html + +which was fixed in the kernel, so it's not clear why it's surfacing +again. Maybe netlink_broadcast_filtered() has started returning some +other bogus error code. + +diff -ru -x '*~' LVM2.2.02.98/libdm/ioctl/libdm-iface.c LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c +--- LVM2.2.02.98/libdm/ioctl/libdm-iface.c 2012-10-15 10:24:58.000000000 -0400 ++++ LVM2.2.02.98-new/libdm/ioctl/libdm-iface.c 2012-10-15 14:19:06.774363736 -0400 +@@ -1754,9 +1754,12 @@ + + if (ioctl_with_uevent && dm_udev_get_sync_support() && + !_check_uevent_generated(dmi)) { ++ log_debug("warning: Uevent might not be generated!"); ++#if 0 + log_debug("Uevent not generated! Calling udev_complete " + "internally to avoid process lock-up."); + _udev_complete(dmt); ++#endif + } + + if (!_dm_ioctl_unmangle_names(dmt->type, dmi)) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 05098c64194..ec68304c935 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { sha256 = "0r6q6z8ip6q5qgkzng0saljassp4912k6i21ra10vq7pzrc0l0vi"; }; + patches = [ ./assume-uevent-generated.patch ]; + configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; -- GitLab From dee64b4c2cbd0a598cb79afbf54d99bc9aba9ed8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Oct 2012 15:36:52 -0400 Subject: [PATCH 1089/5607] Work around timeouts after creating a LUKS device --- .../systemd/crypt-devices-are-ready.patch | 22 +++++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 7 +++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch diff --git a/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch b/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch new file mode 100644 index 00000000000..4646ed0e44c --- /dev/null +++ b/pkgs/os-specific/linux/systemd/crypt-devices-are-ready.patch @@ -0,0 +1,22 @@ +Do start device units for uninitialised encrypted devices, because the +service that initialises the filesystem depends on the appearance of +the device unit. Also, this makes more sense to me: the device is +ready; it's the filesystem that's not, but taking care of that is the +responsibility of the mount unit. (However, this ignores the fsck +unit, so it's not perfect...) + +diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +index d17bdd9..040b10e 100644 +--- a/rules/99-systemd.rules.in ++++ b/rules/99-systemd.rules.in +@@ -14,10 +14,6 @@ KERNEL=="vport*", TAG+="systemd" + SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd" + SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" + +-# Ignore encrypted devices with no identified superblock on it, since +-# we are probably still calling mke2fs or mkswap on it. +-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" +- + # Ignore raid devices that are not yet assembled and started + SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" + SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2219d82138f..cd9cc2dae2c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -13,7 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; }; - patches = [ ./reexec.patch ./ignore-duplicates.patch ./fix-device-aliases.patch ]; + patches = + [ ./reexec.patch + ./ignore-duplicates.patch + ./fix-device-aliases.patch + ./crypt-devices-are-ready.patch + ]; buildInputs = [ pkgconfig intltool gperf libcap dbus kmod xz pam acl -- GitLab From eb89801acff8cf455b65cd8ca78d05014104cb02 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:32 +0200 Subject: [PATCH 1090/5607] haskell-digestive-functors-snap: update to version 0.5.0.1 --- .../libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index 3d5725e603f..a6490953341 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.5.0.0"; - sha256 = "01lbd42rsryzqzra8ax22iw6c9fyv5az8q7dkdi6yyfxdq976l0x"; + version = "0.5.0.1"; + sha256 = "149c01vxzlwskqsncc5l26mk67icmsq2zbav2asjxpp6z8b53i3b"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; -- GitLab From 41d4bf099c6bb0a6b66176dd63cc15fbc9de29e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:32 +0200 Subject: [PATCH 1091/5607] haskell-digestive-functors: update to version 0.5.0.3 --- .../libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index d6d4710f306..31a81778f45 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.5.0.2"; - sha256 = "1phakcljl6ri2p9lfzjnn001jw0inyxa5zd7lp2k9lhq1yq0byb0"; + version = "0.5.0.3"; + sha256 = "176wpnwg4zpfwphl0ifb3zdm0dhw5xyd3vr81rc98s4db5y9csl0"; buildDepends = [ mtl text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; -- GitLab From 4fd9c94e0a7019ce0ba6e4c66418e9a7f798c11c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:33 +0200 Subject: [PATCH 1092/5607] haskell-hxt: update to version 9.3.1.1 --- pkgs/development/libraries/haskell/hxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index ee79d374d42..35783c7762e 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.3.1.0"; - sha256 = "0nv7d7ffwq81671c7gyzaqx7xgrgs42svbq5xraij4jbq5406719"; + version = "9.3.1.1"; + sha256 = "1x0z85vx49s2b9bgjm14c2152cwr0vzf02rlxrla5dj5g565985y"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec -- GitLab From 5984182d0308296c789a90817ad0107187b28834 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:33 +0200 Subject: [PATCH 1093/5607] haskell-language-c-quote: update to version 0.4.3 --- .../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 9ccd9ccb13e..77396e3cf55 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.2"; - sha256 = "0l69kn8flx36z3cl9ckdls8w2sq8361w6abmi3gsa80l8yg3cpl4"; + version = "0.4.3"; + sha256 = "13xpmj3jrqkcgilkh4p8ycxhlk5yvfsisx4c1ax7n7aafg1n7phf"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol -- GitLab From 5679ad6964de1db649cc02ac7ba762d99bbb4d35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 12:18:33 +0200 Subject: [PATCH 1094/5607] haskell-language-javascript: update to version 0.5.6 --- .../libraries/haskell/language-javascript/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index ccf9d4fd238..1d649ba27a9 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,11 +1,11 @@ -{ cabal, alex, blazeBuilder, happy, mtl, utf8Light, utf8String }: +{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }: cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.5"; - sha256 = "1p02n6rh98nvkh7g5kj18ggcnyvds8lqbgjwgzm83bnd5ayizrw7"; + version = "0.5.6"; + sha256 = "1a1nki2z7x0rna5jg6g0gqnipvd115k4xgagg6prrvj284ml44wd"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; - buildTools = [ alex happy ]; + buildTools = [ happy ]; meta = { homepage = "http://github.com/alanz/language-javascript"; description = "Parser for JavaScript"; -- GitLab From 36b4ab4163c45f0eadab260e5902e10598eed030 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 11:50:35 -0400 Subject: [PATCH 1095/5607] Fix building libxml2 on non-Linux platforms --- .../development/libraries/libxml2/default.nix | 4 +++ .../libraries/libxml2/pthread-once-init.patch | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/libxml2/pthread-once-init.patch diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 323d6a5aca5..8fc32babd3b 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd"; }; + patches = [ ./pthread-once-init.patch ]; + configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}"; buildInputs = stdenv.lib.optional pythonSupport [ python ]; @@ -20,6 +22,8 @@ stdenv.mkDerivation rec { passthru = { inherit pythonSupport; }; + enableParallelBuilding = true; + meta = { homepage = http://xmlsoft.org/; description = "A XML parsing library for C"; diff --git a/pkgs/development/libraries/libxml2/pthread-once-init.patch b/pkgs/development/libraries/libxml2/pthread-once-init.patch new file mode 100644 index 00000000000..fadfc27a911 --- /dev/null +++ b/pkgs/development/libraries/libxml2/pthread-once-init.patch @@ -0,0 +1,35 @@ +http://git.gnome.org/browse/libxml2/commit/?id=3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e + +From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001 +From: Friedrich Haubensak +Date: Wed, 12 Sep 2012 15:34:53 +0000 +Subject: Fix a thread portability problem + +cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10 + +I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in +a structure assignment anyway +--- +diff --git a/threads.c b/threads.c +index f206149..7e85a26 100644 +--- a/threads.c ++++ b/threads.c +@@ -146,6 +146,7 @@ struct _xmlRMutex { + static pthread_key_t globalkey; + static pthread_t mainthread; + static pthread_once_t once_control = PTHREAD_ONCE_INIT; ++static pthread_once_t once_control_init = PTHREAD_ONCE_INIT; + static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER; + #elif defined HAVE_WIN32_THREADS + #if defined(HAVE_COMPILER_TLS) +@@ -915,7 +916,7 @@ xmlCleanupThreads(void) + #ifdef HAVE_PTHREAD_H + if ((libxml_is_threaded) && (pthread_key_delete != NULL)) + pthread_key_delete(globalkey); +- once_control = PTHREAD_ONCE_INIT; ++ once_control = once_control_init; + #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) + if (globalkey != TLS_OUT_OF_INDEXES) { + xmlGlobalStateCleanupHelperParams *p; +-- +cgit v0.9.0.2 -- GitLab From fae22cb3e974b5c1c316da0068dea166d6f5df2d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 11:56:31 -0400 Subject: [PATCH 1096/5607] libpng: Update to 1.5.13 --- pkgs/development/libraries/libpng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index a211d3deb05..ce23cf48587 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.5.12"; + name = "libpng-1.5.13"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.xz"; - sha256 = "03fl91yirm59s1ppdflvqqbhsmwhxwf9mchambwvvd18yp56ip5s"; + sha256 = "1vks4mqv4140b10kp53qrywsx9m4xan5ibwsrlmf42ni075zjhxq"; }; propagatedBuildInputs = [ zlib ]; -- GitLab From dbfcc9336cb9df71267a27dc40bdf19d7c059a5c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 12:00:41 -0400 Subject: [PATCH 1097/5607] cairo: Update to 1.12.4 --- pkgs/development/libraries/cairo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index d3b51811a95..2dd1a81f4fb 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -13,11 +13,11 @@ assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; stdenv.mkDerivation rec { - name = "cairo-1.12.2"; - + name = "cairo-1.12.4"; + src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha1 = "bc2ee50690575f16dab33af42a2e6cdc6451e3f9"; + sha1 = "f4158981ed01e73c94fb8072074b17feee61a68b"; }; buildInputs = @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional gobjectSupport glib ++ stdenv.lib.optional postscriptSupport zlib ++ stdenv.lib.optional pngSupport libpng; - + configureFlags = [ "--enable-tee" ] ++ stdenv.lib.optional xcbSupport "--enable-xcb" -- GitLab From e45d4e27227c63bb71244c5399f9cd3274c45291 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:32:22 +0200 Subject: [PATCH 1098/5607] Add bbenoist as maintainer Signed-off-by: Baptist BENOIST --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 18671255fce..4de3ff4237b 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -10,6 +10,7 @@ andres = "Andres Loeh "; antono = "Antono Vasiljev "; astsmtl = "Alexander Tsamutali "; + bbenoist = "Baptist BENOIST "; bjg = "Brian Gough "; bluescreen303 = "Mathijs Kwik "; chaoflow = "Florian Friesdorf "; -- GitLab From 51fe78841797c3d59ed7289df28ed19715c9acb7 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:08 +0200 Subject: [PATCH 1099/5607] Add geany-1.22 Geany is a small and lightweight Integrated Development Environment. It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME. Geany only requires the GTK2 runtime libraries. Some basic features of Geany: - Syntax highlighting - Code folding - Symbol name auto-completion - Construct completion/snippets - Auto-closing of XML and HTML tags - Call tips - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list) - Symbol lists - Code navigation - Build system to compile and execute your code - Simple project management - Plugin interface Signed-off-by: Baptist BENOIST --- pkgs/applications/editors/geany/default.nix | 47 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/editors/geany/default.nix diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix new file mode 100644 index 00000000000..1c08dc6db8d --- /dev/null +++ b/pkgs/applications/editors/geany/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool }: + +let + version = "1.22"; +in + +stdenv.mkDerivation rec { + name = "geany-${version}"; + + src = fetchurl { + url = "http://download.geany.org/${name}.tar.gz"; + md5 = "1cb7f6cea8e301c416211786cec474fa"; + }; + + buildInputs = [ gtk2 which pkgconfig intltool ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "A GTK2 small and ligthweight IDE."; + longDescription = '' + Geany is a small and lightweight Integrated Development Environment. + It was developed to provide a small and fast IDE, which has only a few dependencies from other packages. + Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME. + Geany only requires the GTK2 runtime libraries. + Some basic features of Geany: + - Syntax highlighting + - Code folding + - Symbol name auto-completion + - Construct completion/snippets + - Auto-closing of XML and HTML tags + - Call tips + - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list) + - Symbol lists + - Code navigation + - Build system to compile and execute your code + - Simple project management + - Plugin interface + ''; + homepage = "http://www.geany.org/"; + license = "GPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe6bc588d..13f188cf545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6925,6 +6925,8 @@ let fossil = callPackage ../applications/version-management/fossil { }; + geany = callPackage ../applications/editors/geany { }; + goldendict = callPackage ../applications/misc/goldendict { }; grass = import ../applications/misc/grass { -- GitLab From 946dcba80bdd67402db091cbebd0259b3218684e Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:26 +0200 Subject: [PATCH 1100/5607] Add fox-1.7.9 Signed-off-by: Baptist BENOIST --- pkgs/development/libraries/fox/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/fox/default.nix diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix new file mode 100644 index 00000000000..76cc1d5c3d2 --- /dev/null +++ b/pkgs/development/libraries/fox/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, x11 }: + +let + version = "1.7.9"; +in + +stdenv.mkDerivation rec { + name = "fox-${version}"; + + src = fetchurl { + url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + md5 = "b5897e9c664967f5042e57070037ff18"; + }; + + buildInputs = [ x11 ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "FOX is a C++ based class library for building Graphical User Interfaces"; + longDescription = '' + FOX stands for Free Objects for X. + It is a C++ based class library for building Graphical User Interfaces. + Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. + Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. + ''; + homepage = "http://fox-toolkit.org"; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13f188cf545..21dce48c780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -728,6 +728,8 @@ let fortune = callPackage ../tools/misc/fortune { }; + fox = callPackage ../development/libraries/fox/default.nix { }; + fprot = callPackage ../tools/security/fprot { }; freeipmi = callPackage ../tools/system/freeipmi {}; -- GitLab From 829ad425d31311408547fc00c6b721080ea8f3cc Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:44 +0200 Subject: [PATCH 1101/5607] Add xfe-1.33 and fox-1.6.9 This specific version of fox is required by xfe Signed-off-by: Baptist BENOIST --- pkgs/applications/misc/xfe/default.nix | 33 +++++++++++++++++++++ pkgs/development/libraries/fox/fox-1.6.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/applications/misc/xfe/default.nix create mode 100644 pkgs/development/libraries/fox/fox-1.6.nix diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix new file mode 100644 index 00000000000..67ff2ec5541 --- /dev/null +++ b/pkgs/applications/misc/xfe/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, fox_1_6, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: + +let + version = "1.33"; +in + +stdenv.mkDerivation rec { + name = "xfe-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/xfe/xfe/${version}/${name}.tar.gz"; + md5 = "fb089ba73add411b08a6560eeb51742d"; + }; + + buildInputs = [ fox_1_6 pkgconfig gettext x11 gcc intltool file libpng ]; + + doCheck = false; + + enableParallelBuilding = true; + + meta = { + description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X."; + longDescription = '' + X File Explorer (Xfe) is an MS-Explorer like file manager for X. + It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. + Xfe aims to be the filemanager of choice for all the Unix addicts! + ''; + homepage = "http://sourceforge.net/projects/xfe/"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix new file mode 100644 index 00000000000..e8961621cab --- /dev/null +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, x11 }: + +let + version = "1.6.9"; +in + +stdenv.mkDerivation rec { + name = "fox-${version}"; + + src = fetchurl { + url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; + md5 = "8ab8274237431865f57b2f5596374a65"; + }; + + buildInputs = [ x11 ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = { + description = "FOX is a C++ based class library for building Graphical User Interfaces"; + longDescription = '' + FOX stands for Free Objects for X. + It is a C++ based class library for building Graphical User Interfaces. + Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. + Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms. + ''; + homepage = "http://fox-toolkit.org"; + license = "LGPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21dce48c780..4cb5417a581 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -729,6 +729,7 @@ let fortune = callPackage ../tools/misc/fortune { }; fox = callPackage ../development/libraries/fox/default.nix { }; + fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; fprot = callPackage ../tools/security/fprot { }; @@ -7983,6 +7984,8 @@ let xen = callPackage ../applications/virtualization/xen { }; + xfe = callPackage ../applications/misc/xfe { }; + xfig = callPackage ../applications/graphics/xfig { stdenv = overrideGCC stdenv gcc34; }; -- GitLab From 440656dbd018472e0d81e9c8cc820598c40661c2 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:30:56 +0200 Subject: [PATCH 1102/5607] Add qtcreator-2.5.2 Signed-off-by: Baptist BENOIST --- pkgs/development/qtcreator/default.nix | 36 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/qtcreator/default.nix diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix new file mode 100644 index 00000000000..b57b9884e61 --- /dev/null +++ b/pkgs/development/qtcreator/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, qt4 }: + +let + version = "2.5.2"; +in + +stdenv.mkDerivation rec { + name = "qtcreator-${version}"; + + src = fetchurl { + url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz"; + md5 = "4a9c09cdf4609753283c31451c84ceb8"; + }; + + buildInputs = [ qt4 ]; + + doCheck = false; + + enableParallelBuilding = true; + + preConfigure = "qmake"; + installFlags = "INSTALL_ROOT=$(out)"; + + meta = { + description = "Qt Creator is a cross-platform IDE tailored to the needs of Qt developers."; + longDescription = '' + Qt Creator is a cross-platform IDE (integrated development environment) tailored to the needs of Qt developers. + It includes features such as an advanced code editor, a visual debugger and a GUI designer. + ''; + homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator"; + license = "LGPL"; + + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cb5417a581..4fddd5aaef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7608,6 +7608,8 @@ let qsynth = callPackage ../applications/audio/qsynth { }; + qtcreator = callPackage ../development/qtcreator { }; + qtpfsgui = callPackage ../applications/graphics/qtpfsgui { }; qtractor = callPackage ../applications/audio/qtractor { }; -- GitLab From ca264f8da0e5a289b20bc20d16a4ec8f0756ade7 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 17:31:06 +0200 Subject: [PATCH 1103/5607] Add gmrun-0.9.2 Signed-off-by: Baptist BENOIST --- pkgs/applications/misc/gmrun/default.nix | 39 +++++++++++++ pkgs/applications/misc/gmrun/gcc43.patch | 51 ++++++++++++++++ .../misc/gmrun/gmrun-0.9.2-xdg.patch | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 150 insertions(+) create mode 100644 pkgs/applications/misc/gmrun/default.nix create mode 100644 pkgs/applications/misc/gmrun/gcc43.patch create mode 100644 pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix new file mode 100644 index 00000000000..930df87214a --- /dev/null +++ b/pkgs/applications/misc/gmrun/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, glib, gtk2, pkgconfig, popt }: + +let + version = "0.9.2"; +in + +stdenv.mkDerivation rec { + name = "gmrun-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/gmrun/gmrun/${version}/${name}.tar.gz"; + md5 = "6cef37a968006d9496fc56a7099c603c"; + }; + + buildInputs = [ glib gtk2 pkgconfig popt ]; + + doCheck = true; + + enableParallelBuilding = true; + + patches = [ + ./gcc43.patch + ./gmrun-0.9.2-xdg.patch + ]; + + meta = { + description = "Gnome Completion-Run Utility."; + longDescription = '' + A simple program which provides a "run program" window, featuring a bash-like TAB completion. + It uses GTK+ interface. + Also, supports CTRL-R / CTRL-S / "!" for searching through history. + Running commands in a terminal with CTRL-Enter. URL handlers. + ''; + homepage = "http://sourceforge.net/projects/gmrun/"; + license = "GPL"; + maintainers = [ stdenv.lib.maintainers.bbenoist ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/misc/gmrun/gcc43.patch b/pkgs/applications/misc/gmrun/gcc43.patch new file mode 100644 index 00000000000..60e4338e893 --- /dev/null +++ b/pkgs/applications/misc/gmrun/gcc43.patch @@ -0,0 +1,51 @@ +--- a/src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100 ++++ a/src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + using namespace std; + +--- a/src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200 ++++ a/src/ci_string.h 2008-05-08 08:51:33.000000000 +0200 +@@ -7,6 +7,7 @@ + #define __CI_STRING_H__ + + #include ++#include + #include + + struct ci_char_traits : public std::char_traits +--- a/src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200 ++++ a/src/prefs.cc 2008-05-08 08:51:54.000000000 +0200 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + +--- a/src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100 ++++ a/src/main.cc 2008-05-08 09:03:11.000000000 +0200 +@@ -14,6 +14,7 @@ + #include + + #include ++#include + #include + #include + #include + +--- a/src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400 ++++ a/src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400 +@@ -376,7 +377,7 @@ + return 0; + } + +-int my_alphasort(const void* va, const void* vb) { ++int my_alphasort(const dirent** va, const dirent** vb) { + const struct dirent** a = (const struct dirent**)va; + const struct dirent** b = (const struct dirent**)vb; diff --git a/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch b/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch new file mode 100644 index 00000000000..b5cd41a3c5b --- /dev/null +++ b/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch @@ -0,0 +1,58 @@ +diff -ur a/src/history.cc src/history.cc +--- a/src/history.cc 2002-08-17 15:19:31.000000000 +0200 ++++ a/src/history.cc 2012-06-04 23:42:35.314653414 +0200 +@@ -24,8 +24,15 @@ + HistoryFile::HistoryFile() + { + m_file_entries = 0; +- m_filename = g_get_home_dir(); +- m_filename += "/.gmrun_history"; ++ const char* filename = getenv("XDG_CACHE_HOME"); ++ if (filename != 0 && *filename != '\0') { ++ m_filename = filename; ++ m_filename += "/gmrun_history"; ++ } ++ else { ++ m_filename = g_get_home_dir(); ++ m_filename += "/.gmrun_history"; ++ } + m_current = 0; + m_default_set = false; + read_the_file(); +diff -ur a/src/prefs.cc src/prefs.cc +--- a/src/prefs.cc 2012-06-04 22:35:00.671949439 +0200 ++++ a/src/prefs.cc 2012-06-04 23:24:24.184445962 +0200 +@@ -35,12 +35,29 @@ + file_name += GMRUNRC; + init(file_name); + +- file_name = getenv("HOME"); +- if (!file_name.empty()) { ++ file_name.clear(); ++ const char* filename = getenv("XDG_CONFIG_HOME"); ++ if (filename != 0 && *filename != '\0') { ++ file_name = filename; + string::iterator i = file_name.end() - 1; +- if (*i == '/') file_name.erase(i); +- file_name += "/."; ++ if (*i != '/') { ++ file_name += '/'; ++ } + file_name += GMRUNRC; ++ } ++ else { ++ filename = getenv("HOME"); ++ if (filename != 0 && *filename != '\0') { ++ file_name = filename; ++ string::iterator i = file_name.end() - 1; ++ if (*i != '/') { ++ file_name += '/'; ++ } ++ file_name += '.'; ++ file_name += GMRUNRC; ++ } ++ } ++ if (!file_name.empty()) { + init(file_name); + } + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fddd5aaef1..d54970c57c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7051,6 +7051,8 @@ let pcre = pcre.override { unicodeSupport = true; }; }; + gmrun = callPackage ../applications/misc/gmrun {}; + gnucash = callPackage ../applications/office/gnucash { inherit (gnome) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint; gconf = gnome.GConf; -- GitLab From 31b7510e222a7dd2d94cb3681b98d82067c2782e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 18:25:56 +0200 Subject: [PATCH 1104/5607] bash-completion: remove NixOS-specific patch The new bash-completion support in NixOS doesn't require this patch anymore. Besides, the patch was insufficient for most purposes anyway: Bash completion modules are spread out over all user profiles listed in $NIX_PROFILES (plus the current-system profile), so getting full support for all installed modules requires support for more than one "bash_completion.d" directory anyway. --- pkgs/shells/bash-completion/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index d79c9774569..7e4c0f23015 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -11,11 +11,6 @@ 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 = { -- GitLab From d22e3a02fdd9a58c8df485228c0df250ac9e43d0 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Tue, 16 Oct 2012 18:38:53 +0200 Subject: [PATCH 1105/5607] Put eclipse icon into share/pixmaps --- pkgs/applications/editors/eclipse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index af71e89a416..628618cfd94 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -49,6 +49,8 @@ let # Create desktop item. mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + cp $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm ''; # */ meta = { -- GitLab From 06bdd77d3db484b755dfec605a6bba80a87e4da1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 19:09:02 +0200 Subject: [PATCH 1106/5607] grub-2.0: fix bash completion script --- pkgs/tools/misc/grub/2.0x.nix | 2 ++ .../tools/misc/grub/fix-bash-completion.patch | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/grub/fix-bash-completion.patch diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 4186a440535..5006d8f4f4a 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; + patches = [ ./fix-bash-completion.patch ]; + configureFlags = let arch = if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" diff --git a/pkgs/tools/misc/grub/fix-bash-completion.patch b/pkgs/tools/misc/grub/fix-bash-completion.patch new file mode 100644 index 00000000000..97cecdce373 --- /dev/null +++ b/pkgs/tools/misc/grub/fix-bash-completion.patch @@ -0,0 +1,24 @@ +diff -ubr grub-2.00-orig/util/bash-completion.d/grub-completion.bash.in grub-2.00/util/bash-completion.d/grub-completion.bash.in +--- grub-2.00-orig/util/bash-completion.d/grub-completion.bash.in 2012-10-16 19:02:36.342733957 +0200 ++++ grub-2.00/util/bash-completion.d/grub-completion.bash.in 2012-10-16 19:04:48.262733941 +0200 +@@ -17,6 +17,12 @@ + # along with GRUB. If not, see . + # bash completion for grub + ++have() ++{ ++ unset -v have ++ _have $1 && have=yes ++} ++ + __grub_dir() { + local i c=1 boot_dir + +@@ -479,6 +485,7 @@ + have ${__grub_script_check_program} && \ + complete -F _grub_script_check -o filenames ${__grub_script_check_program} + ++unset -f have + + # Local variables: + # mode: shell-script -- GitLab From 347b5800b201b214349b50de3e1610b96fe29ea0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Oct 2012 19:09:14 +0200 Subject: [PATCH 1107/5607] grub-2.0: strip trailing whitespace --- pkgs/tools/misc/grub/2.0x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 5006d8f4f4a..d37ce9f5aac 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -4,14 +4,14 @@ let 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 { -- GitLab From 28181c15e8a752fbac17ff6b3a688ab1a91a4e48 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Tue, 16 Oct 2012 19:35:59 +0200 Subject: [PATCH 1108/5607] Make virtualbox icons available --- pkgs/applications/virtualization/virtualbox/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3af9796136f..1c5063fc034 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -110,6 +110,12 @@ in stdenv.mkDerivation { 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 + # Icons + mkdir -p $out/share/icons/hicolor + for size in `ls -1 $libexec/icons`; do + mkdir -p $out/share/icons/hicolor/$size/apps + cp $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps + done ''; meta = { -- GitLab From 49c8c2bc72430922eb1427d31d4d22d64e6e0c94 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 13:53:43 -0400 Subject: [PATCH 1109/5607] Update stdenv.is64bit --- pkgs/stdenv/generic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 9197ff8314b..ecb5ebbc698 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -117,7 +117,9 @@ let || result.system == "x86_64-freebsd" || result.system == "x86_64-openbsd"; is64bit = result.system == "x86_64-linux" - || result.system == "x86_64-darwin"; + || result.system == "x86_64-darwin" + || result.system == "x86_64-freebsd" + || result.system == "x86_64-openbsd"; isMips = result.system == "mips-linux" || result.system == "mips64el-linux"; isArm = result.system == "armv5tel-linux" -- GitLab From 6c75d07e65ff2b3d11326c98d9c9482d0f1de8ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 14:09:57 -0400 Subject: [PATCH 1110/5607] automake: Update to 1.12.4 Also disable tests, they're really way too slow. http://hydra.nixos.org/build/3082076 --- .../tools/misc/automake/automake-1.11.x.nix | 4 +--- .../tools/misc/automake/automake-1.12.x.nix | 6 +++--- pkgs/top-level/all-packages.nix | 15 ++------------- 3 files changed, 6 insertions(+), 19 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 7c9d06baa54..91c27deb8b8 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? true}: +{ stdenv, fetchurl, perl, autoconf, makeWrapper }: stdenv.mkDerivation rec { name = "automake-1.11.6"; @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [perl autoconf makeWrapper]; - inherit doCheck; - # Disable indented log output from Make, otherwise "make.test" will # fail. preCheck = "unset NIX_INDENT_MAKE"; 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 e2db84d2fc3..bd609c4a40d 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, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.12.2"; + name = "automake-1.12.4"; # 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 = "5fb56e918189b377a22368e19baaf70252bd85a9969ed5f8a8373f49e8faf07f"; + sha256 = "0wppdm0wfizs6nmiwlkigcmh2pn33dywdkl7b407j3pvwn622vsi"; }; buildInputs = [perl autoconf makeWrapper]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 648adad6216..b6037799ac0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2912,20 +2912,9 @@ 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 && !stdenv.isMips - # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. - && stdenv.system != "i686-solaris" + automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; - # One test fails to terminate on FreeBSD: . - && !stdenv.isFreeBSD; - }; - - automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { - doCheck = !stdenv.isArm && !stdenv.isCygwin && !stdenv.isMips - # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'. - && stdenv.system != "i686-solaris"; - }; + automake112x = callPackage ../development/tools/misc/automake/automake-1.12.x.nix { }; automoc4 = callPackage ../development/tools/misc/automoc4 { }; -- GitLab From ca298b5fe68ebee7f4a419e9278ffe6cf5931b69 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 14:29:31 -0400 Subject: [PATCH 1111/5607] net-tools: Update to 1.60_p20120127084908 Apparently token ring support is gone in the kernel. http://hydra.nixos.org/build/3081969 --- pkgs/os-specific/linux/net-tools/config.h | 9 ++++- pkgs/os-specific/linux/net-tools/default.nix | 12 +++--- .../linux/net-tools/net-tools-labels.patch | 38 ------------------- 3 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 pkgs/os-specific/linux/net-tools/net-tools-labels.patch diff --git a/pkgs/os-specific/linux/net-tools/config.h b/pkgs/os-specific/linux/net-tools/config.h index b060bea12c2..860233ae684 100644 --- a/pkgs/os-specific/linux/net-tools/config.h +++ b/pkgs/os-specific/linux/net-tools/config.h @@ -38,6 +38,7 @@ #define HAVE_AFECONET 0 #define HAVE_AFDECnet 0 #define HAVE_AFASH 0 +#define HAVE_AFBLUETOOTH 0 /* * @@ -50,19 +51,22 @@ #define HAVE_HWPPP 1 #define HAVE_HWTUNNEL 1 #define HAVE_HWSTRIP 1 -#define HAVE_HWTR 1 +#define HAVE_HWTR 0 #define HAVE_HWAX25 0 #define HAVE_HWROSE 0 #define HAVE_HWNETROM 1 #define HAVE_HWX25 0 #define HAVE_HWFR 1 -#define HAVE_HWSIT 0 +#define HAVE_HWSIT 1 #define HAVE_HWFDDI 0 #define HAVE_HWHIPPI 0 #define HAVE_HWASH 0 #define HAVE_HWHDLCLAPB 0 #define HAVE_HWIRDA 1 #define HAVE_HWEC 0 +#define HAVE_HWEC 0 +#define HAVE_HWEUI64 1 +#define HAVE_HWIB 1 /* * @@ -72,3 +76,4 @@ #define HAVE_FW_MASQUERADE 0 #define HAVE_IP_TOOLS 0 #define HAVE_MII 0 +#define HAVE_SELINUX 0 diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 59af976a71b..9386b50969f 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "net-tools-1.60"; - +stdenv.mkDerivation rec { + name = "net-tools-1.60_p20120127084908"; + src = fetchurl { - url = http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-1.60.tar.bz2; - md5 = "888774accab40217dde927e21979c165"; + url = "mirror://gentoo/distfiles/${name}.tar.xz"; + sha256 = "408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94"; }; - patches = [ ./net-tools-labels.patch ]; - preBuild = '' cp ${./config.h} config.h diff --git a/pkgs/os-specific/linux/net-tools/net-tools-labels.patch b/pkgs/os-specific/linux/net-tools/net-tools-labels.patch deleted file mode 100644 index 82c3a27d9c6..00000000000 --- a/pkgs/os-specific/linux/net-tools/net-tools-labels.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN net-tools-1.60/hostname.c net-tools-1.60-new/hostname.c ---- net-tools-1.60/hostname.c 2001-04-08 19:04:23.000000000 +0200 -+++ net-tools-1.60-new/hostname.c 2004-12-17 14:48:15.624174382 +0100 -@@ -98,6 +98,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ break; - } - exit(1); - }; -@@ -117,6 +118,7 @@ - fprintf(stderr, _("%s: name too long\n"), program_name); - break; - default: -+ break; - } - exit(1); - }; -@@ -174,6 +176,7 @@ - printf("%s\n", hp->h_name); - break; - default: -+ break; - } - } - -diff -ruN net-tools-1.60/lib/inet_sr.c net-tools-1.60-new/lib/inet_sr.c ---- net-tools-1.60/lib/inet_sr.c 2000-02-20 22:46:45.000000000 +0100 -+++ net-tools-1.60-new/lib/inet_sr.c 2004-12-17 14:37:15.416349441 +0100 -@@ -105,6 +105,7 @@ - case 2: - isnet = 0; break; - default: -+ break; - } - - /* Fill in the other fields. */ -- GitLab From 877838870e02d20633485ca9fbfb1deff23f3b31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 14:33:08 -0400 Subject: [PATCH 1112/5607] w3m: Fix build http://hydra.nixos.org/build/3081853 --- .../networking/browsers/w3m/default.nix | 9 ++- .../networking/browsers/w3m/glibc214.patch | 60 +++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/browsers/w3m/glibc214.patch diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 38ef20ec969..3f31cd0a030 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -19,9 +19,10 @@ stdenv.mkDerivation rec { sha256 = "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"; }; - # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that - # alpha. At the time of writing this, boehm-gc-7.1 is the last stable. - patches = stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]; + patches = [ ./glibc214.patch ] + # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that + # alpha. At the time of writing this, boehm-gc-7.1 is the last stable. + ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]; buildInputs = [ncurses boehmgc gettext zlib] ++ stdenv.lib.optional sslSupport openssl @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace /usr /no-such-path ''; + enableParallelBuilding = true; + meta = { homepage = http://w3m.sourceforge.net/; description = "A text-mode web browser"; diff --git a/pkgs/applications/networking/browsers/w3m/glibc214.patch b/pkgs/applications/networking/browsers/w3m/glibc214.patch new file mode 100644 index 00000000000..37e466e2106 --- /dev/null +++ b/pkgs/applications/networking/browsers/w3m/glibc214.patch @@ -0,0 +1,60 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.3-glibc214.patch?revision=1.1 + +--- a/istream.c.~1.27.~ 2011-01-04 18:22:22.000000000 +0900 ++++ b/istream.c 2011-06-24 08:15:23.522990618 +0900 +@@ -22,8 +22,8 @@ + static void basic_close(int *handle); + static int basic_read(int *handle, char *buf, int len); + +-static void file_close(struct file_handle *handle); +-static int file_read(struct file_handle *handle, char *buf, int len); ++static void file_close(struct afile_handle *handle); ++static int file_read(struct afile_handle *handle, char *buf, int len); + + static int str_read(Str handle, char *buf, int len); + +@@ -114,7 +114,7 @@ + stream = New(union input_stream); + init_base_stream(&stream->base, STREAM_BUF_SIZE); + stream->file.type = IST_FILE; +- stream->file.handle = New(struct file_handle); ++ stream->file.handle = New(struct afile_handle); + stream->file.handle->f = f; + if (closep) + stream->file.handle->close = closep; +@@ -658,13 +658,13 @@ + } + + static void +-file_close(struct file_handle *handle) ++file_close(struct afile_handle *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct afile_handle *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } +--- a/istream.h.~1.12.~ 2003-10-21 01:41:56.000000000 +0900 ++++ b/istream.h 2011-06-24 08:15:54.392991144 +0900 +@@ -20,7 +20,7 @@ + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct afile_handle { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct afile_handle *handle; + char type; + char iseos; + int (*read) (); -- GitLab From e4a11b4d92424c42f61ee55cf505ac1217944f4a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 14:34:27 -0400 Subject: [PATCH 1113/5607] gcc: Get rid of lib64 --- pkgs/development/compilers/gcc/4.6/builder.sh | 9 +++++++++ pkgs/development/compilers/gcc/4.6/default.nix | 2 ++ 2 files changed, 11 insertions(+) diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index 6cd64bc58f2..2f655ece170 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -196,6 +196,15 @@ postConfigure() { } +preInstall() { + # Make ‘lib64’ a symlink to ‘lib’. + if [ -n "$is64bit" ]; then + mkdir -p $out/lib + ln -s lib $out/lib64 + fi +} + + postInstall() { # Remove precompiled headers for now. They are very big and # probably not very useful yet. diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ec229a46a54..e27f1a47f9c 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -406,6 +406,8 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + inherit (stdenv) is64bit; + meta = { homepage = http://gcc.gnu.org/; license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ -- GitLab From 00081382011911d7adbd897dba7c665619291baf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 15:00:51 -0400 Subject: [PATCH 1114/5607] checkPhase: Pass VERBOSE=y so that failing tests show something useful --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5cc82b08321..0e31c7a0f1e 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -627,7 +627,7 @@ checkPhase() { make ${makefile:+-f $makefile} \ ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \ $makeFlags "${makeFlagsArray[@]}" \ - $checkFlags "${checkFlagsArray[@]}" ${checkTarget:-check} + ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check} runHook postCheck } -- GitLab From c0ae221bb0bd8a10907aa8104cf91d0871da2b05 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 15:05:39 -0400 Subject: [PATCH 1115/5607] patch: Update to 2.7.1 Also disable the tests on FreeBSD. http://hydra.nixos.org/build/3070072 --- pkgs/tools/text/gnupatch/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 502f0e07ccb..c8c336ad202 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ed }: stdenv.mkDerivation rec { - name = "patch-2.7"; + name = "patch-2.7.1"; src = fetchurl { url = "mirror://gnu/patch/${name}.tar.gz"; - sha256 = "0j10lq37ywcc4qiakan6wpm00abfrnnccq3ags129ad0z9b9zhjr"; + sha256 = "1m9r83b5c154xnxbvgjg4lfff58xjapanj6dmmivqx1liik2hpy0"; }; buildInputs = stdenv.lib.optional doCheck ed; @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { configureFlags = [ "ac_cv_func_strnlen_working=yes" ]; }; - doCheck = true; + # Tests fail on FreeBSD due to a Bashism in the tests. + doCheck = !stdenv.isFreeBSD; meta = { description = "GNU Patch, a program to apply differences to files"; -- GitLab From ae7044a0010fa3fe0f88d937226a7463a0a7750f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Oct 2012 17:11:54 -0400 Subject: [PATCH 1116/5607] nix: Update to 1.2pre2950_ac238d6 --- 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 dfe6e491c37..72af812efc9 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.2pre2910_b674665"; + name = "nix-1.2pre2950_ac238d6"; src = fetchurl { - url = "http://hydra.nixos.org/build/3031673/download/4/${name}.tar.bz2"; - sha256 = "fa9849f69a262547856190fe1a24e6d6bd15344fe2ef0a0e54c35ab172074a22"; + url = "http://hydra.nixos.org/build/3185460/download/4/${name}.tar.bz2"; + sha256 = "a8aacdf4d459142843848d35a4d51304aaa1e41ca0a6dfdfc287748aa3ca7231"; }; buildNativeInputs = [ perl pkgconfig ]; -- GitLab From 28c909af867461a19882fc5add902b23c233305c Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 16 Oct 2012 23:19:59 +0200 Subject: [PATCH 1117/5607] vtk: latest version + useQt4 option - Updated vtk to v5.10.0 (latest tagged release) - Introduced a useQt4 option which allows to set the VTK_USE_QT option to true - Added a package named vtkWithQt4 in the all-packages list Signed-off-by: Baptist BENOIST --- pkgs/development/libraries/vtk/default.nix | 26 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index db7d0d77f69..9e4816cab0a 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,18 +1,32 @@ -{stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt }: +{ stdenv, fetchurl, cmake, mesa, libX11, xproto, libXt +, useQt4 ? false, qt4 }: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "5.10"; + minorVersion = "0"; + version = "${majorVersion}.${minorVersion}"; +in stdenv.mkDerivation rec { - name = "vtk-5.4.2"; + name = "vtk-${os useQt4 "qvtk-"}${version}"; src = fetchurl { - url = "http://www.vtk.org/files/release/5.4/${name}.tar.gz"; - sha256 = "0gd7xlxiqww6xxcs2kicz0g6k147y3200np4jnsf10vlxs10az03"; + url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz"; + md5 = "a0363f78910f466ba8f1bd5ab5437cb9"; }; - buildInputs = [ cmake mesa libX11 xproto libXt ]; + buildInputs = [ cmake mesa libX11 xproto libXt ] + ++ optional useQt4 qt4; + + cmakeFlags = optional useQt4 + [ "-DVTK_USE_QT:BOOL=ON" ]; meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8bbe6bc588d..e5254b622ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4967,6 +4967,8 @@ let vtk = callPackage ../development/libraries/vtk { }; + vtkWithQt4 = vtk.override { useQt4 = true; }; + vxl = callPackage ../development/libraries/vxl { libpng = libpng12; }; -- GitLab From 3f0c47091c53526a8c25e1fed7f67180aa25f542 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 11:09:44 +0400 Subject: [PATCH 1118/5607] Update Clozure Common Lisp to version 1.8 --- pkgs/development/compilers/ccl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 54628fa509d..7678c066df2 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -5,13 +5,13 @@ let ]; in rec { - version = "1.4"; + version = "1.8"; name = "ccl-${version}"; /* There are also MacOS and FreeBSD and Windows versions */ src = a.fetchurl { url = "ftp://ftp.clozure.com/pub/release/${version}/${name}-linuxx86.tar.gz"; - sha256 = "1z4x4kxjj2ligb2vfrx5mjww20gdkxbvgw1ax5l9c8ha802bfyg8"; + sha256 = "1dgg6a8i2csa6xidsq66hbw7zx62gm2178hpkp88yyzgxylszp01"; }; inherit buildInputs; -- GitLab From df2975f928f9d3664dcd199990ebe7f8677792ca Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 15:22:43 +0400 Subject: [PATCH 1119/5607] Update ECL to 12.7.1 --- pkgs/development/compilers/ecl/default.nix | 13 ++++++++++--- pkgs/development/compilers/ecl/src-for-default.nix | 7 ------- .../compilers/ecl/src-info-for-default.nix | 6 ------ 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 pkgs/development/compilers/ecl/src-for-default.nix delete mode 100644 pkgs/development/compilers/ecl/src-info-for-default.nix diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index c08fc3ee585..fb801b6b844 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -3,16 +3,23 @@ , ...} @ x: builderDefsPackage (a : let - s = import ./src-for-default.nix; propagatedBuildInputs = with a; [ gmp mpfr ]; buildInputs = [ gmp libffi mpfr ]; in rec { - src = a.fetchUrlFromSrcInfo s; + mainVersion = "12.7"; + revision = "1"; + version = "${mainVersion}.${revision}"; + + name = "ecl-${version}"; + + src = a.fetchurl { + url = "mirror://sourceforge/project/ecls/ecls/${mainVersion}/${name}.tar.gz"; + sha256 = "0k8ww142g3bybvvnlijqsbidl8clbs1pb4ympk2ds07z5swvy2ap"; + }; - inherit (s) name; inherit buildInputs propagatedBuildInputs; configureFlags = [ "--enable-threads" diff --git a/pkgs/development/compilers/ecl/src-for-default.nix b/pkgs/development/compilers/ecl/src-for-default.nix deleted file mode 100644 index 1baaf4bbec4..00000000000 --- a/pkgs/development/compilers/ecl/src-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -rec { - version="12.2.1"; - name="ecl-12.2.1"; - hash="dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091"; - url="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-${version}.tgz"; - advertisedUrl="http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-12.2.1.tgz"; -} diff --git a/pkgs/development/compilers/ecl/src-info-for-default.nix b/pkgs/development/compilers/ecl/src-info-for-default.nix deleted file mode 100644 index 1f5f3270f53..00000000000 --- a/pkgs/development/compilers/ecl/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - downloadPage = "http://sourceforge.net/projects/ecls/files/"; - baseName = "ecl"; - choiceCommand = "head -1 | sed -e 's@/download@@;'\"$skipRedirectSF\""; - sourceRegexp = ".*[.](tar.gz|tgz|tbz2|tar.bz2)"; -} -- GitLab From febe086bba7f7f1ad718b57adc3c966eb2567935 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Wed, 17 Oct 2012 14:11:08 +0200 Subject: [PATCH 1120/5607] Changing copy files to symbolic links to them --- 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 1c5063fc034..ba01d8c4d41 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -114,7 +114,7 @@ in stdenv.mkDerivation { mkdir -p $out/share/icons/hicolor for size in `ls -1 $libexec/icons`; do mkdir -p $out/share/icons/hicolor/$size/apps - cp $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps + ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps done ''; -- GitLab From 9acffb949d4cdd26bdf719cd84f8838691ad7266 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Wed, 17 Oct 2012 14:16:23 +0200 Subject: [PATCH 1121/5607] Change copy file to symbolic link --- pkgs/applications/editors/eclipse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 628618cfd94..944dad21470 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -50,7 +50,7 @@ let mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications mkdir -p $out/share/pixmaps - cp $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm + ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm ''; # */ meta = { -- GitLab From 8eec7bf2f6d451694af1f100f2e4df1bb35cdb80 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 16:27:38 +0400 Subject: [PATCH 1122/5607] Updating BIND to freshest version 9.9.2 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 2e1af8a2cbc..54fa398a8e9 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.7.6-P3"; in +let version = "9.9.2"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0xx23dcy9rbky8ar89pg3s07njqy7667sfrnbqc334pvd2qxanjx"; + sha256 = "0j4v01ch4xkgnsnngmh6bpapzi53n4k79gbbhmxf44nmk2qk0rby"; }; patchPhase = '' -- GitLab From cdd51e27306b3d2282e161f84a66f63a9ab34ac9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 16:44:26 +0400 Subject: [PATCH 1123/5607] Update Squid 3.2 to the latest 3.2.2 version --- pkgs/servers/squid/squids.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix index 3e5e4ebbe6f..b349ab617ac 100644 --- a/pkgs/servers/squid/squids.nix +++ b/pkgs/servers/squid/squids.nix @@ -30,16 +30,16 @@ rec { configureFlags = ["--enable-ipv6"]; }; - squid32Beta = squid30.merge rec { - name = "squid-3.2.0.16"; + squid32 = squid30.merge rec { + name = "squid-3.2.2"; src = args.fetchurl { url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2"; - sha256 = "2431f4f9372e4e1a9c5fca5a4fa0c4bb0761ce3e044642ea9362bb1580a36d25"; + sha256 = "13jlx3d6rqq7ajxs8bgn8a0mh932jhq6aa8032q205nxnhqs0l4l"; }; configureFlags = ["--enable-ipv6"]; buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2 libtool openssl]; }; - latest = squid32Beta; + latest = squid32; } -- GitLab From 07f44ad945055c1cb72aab33ffda80905bca2022 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 17:22:32 +0400 Subject: [PATCH 1124/5607] Update Wine --- 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 b35660daf5e..a59bce94ab5 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.10"; + name = "wine-1.5.15"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "04wydwc8q49bw8brlklx2nbgr453lx7bbfass5zn88xbz997lppk"; + sha256 = "0m4lnqq4aniczp6m67m2n2ijz9h8z83ka3y30kyxkidv0j16jhi6"; }; gecko = fetchurl { -- GitLab From 2f3dcb9dd225dd6f7b6e59c8763d80624dfcad9e Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 17 Oct 2012 15:38:09 +0200 Subject: [PATCH 1125/5607] apache-httpd/2.4: Fix libxml2 support. The reason because the configure script is unnable to find libxml2 is because it is searching for a header file in `libxml/*.h`. Obviously this cases an error, because it's actually in `${libxml2}/include/libxml2/libxml/*.h`, so let's add the parent directory to --with-libxml2 and remove the comment from buildInputs. Signed-off-by: aszlig --- pkgs/servers/http/apache-httpd/2.4.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 44fa145b605..ed0c3ec6ea9 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -24,7 +24,7 @@ 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 libxml2Support libxml2; # Required for ‘pthread_cancel’. NIX_LDFLAGS = "-lgcc_s"; @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} + ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"} ''; postInstall = '' -- GitLab From 0b592ce6772c44bf4a1a4f700e9054834782d9d2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 17 Oct 2012 15:42:08 +0200 Subject: [PATCH 1126/5607] apache-httpd/2.4: Add modules for NixOS service. The NixOS service module loads those modules by default. So we need to build them here as well. I'm not really sure why these modules are included by default, because (except from maybe CGI) they obviously are only usable in very rare cases. Am I wrong? Signed-off-by: aszlig --- 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 ed0c3ec6ea9..507ced85998 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { --disable-debugger-mode --enable-mods-shared=all --enable-mpms-shared=all + --enable-cern-meta + --enable-imagemap + --enable-cgi ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} -- GitLab From cdb8f0dfe446857b76c9f79eaa3c20c27b3ab140 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 22:24:39 +0400 Subject: [PATCH 1127/5607] Update Lazarus --- pkgs/development/compilers/fpc/lazarus.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 4278f2c664f..e2a9fd128e9 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,9 +1,10 @@ args : with args; rec { - version = "0.9.30.4"; + version = "1.0.2"; + versionSuffix = "-0"; src = fetchurl { - url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}-src.tar.bz2"; - sha256 = "0kndg4xf32r6w5hb58d9qvzkyiphhysgnhs2rd9bmlc8sy8c7zmv"; + url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; + sha256 = "17a94wig8b4yrkq42wng4qbal7n77axkynwh78wday5whsp7div8"; }; buildInputs = [fpc gtk glib libXi inputproto -- GitLab From 3b01ff459151f94fb09d3d180ba60a5034fc226d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 22:45:54 +0400 Subject: [PATCH 1128/5607] Update Wireshark --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index aca0203ca6c..a5f0ddea28f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -4,14 +4,14 @@ }: let - version = "1.6.2"; + version = "1.8.3"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "0zqy8ws05xz36y49azf5lrwzgfz26h7f8d27xjc89hlqrqagahsk"; + sha256 = "1crg59kkxb7lw1wpfg52hd4l00hq56pyg7f40c7sgqmm0vsmza43"; }; buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt -- GitLab From 640a13c04c7b656bd9153c08c8aeba41c11b477b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 22:59:41 +0400 Subject: [PATCH 1129/5607] Update Psi --- .../instant-messengers/psi/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 7f9d61f9c44..5750476cc5c 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,32 +1,33 @@ { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM -, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: +, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib +, libXScrnSaver, scrnsaverproto +}: stdenv.mkDerivation rec { - name = "psi-0.14"; + name = "psi-0.15"; src = fetchurl { url = "mirror://sourceforge/psi/${name}.tar.bz2"; - sha256 = "1h54a1qryfva187sw9qnb4lv1d3h3lysqgw55v727swvslh4l0da"; + sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6"; }; buildInputs = [ aspell qt4 zlib sox libX11 xproto libSM libICE - qca2 qca2_ossl pkgconfig which glib + qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver ]; NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; NIX_LDFLAGS="-lqca"; - configureFlags = - [ " --with-zlib-inc=${zlib}/include " - " --disable-bundled-qca" - ]; - psiMedia = callPackage ./psimedia.nix { }; enableParallelBuilding = true; + configureFlags = [ + "--with-aspell-inc=${aspell}/include" + ]; + postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" mkdir -p "$PSI_PLUGINS" -- GitLab From 28675634965024d5d1afef4c4435b6b0697d6318 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Oct 2012 23:16:42 +0400 Subject: [PATCH 1130/5607] Adding a RC version of LinuX Containers --- pkgs/applications/virtualization/lxc/0.8.nix | 49 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/virtualization/lxc/0.8.nix diff --git a/pkgs/applications/virtualization/lxc/0.8.nix b/pkgs/applications/virtualization/lxc/0.8.nix new file mode 100644 index 00000000000..1ae47e0c8f6 --- /dev/null +++ b/pkgs/applications/virtualization/lxc/0.8.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: + +let + name = "lxc-0.8.0-rc2"; +in +stdenv.mkDerivation{ + inherit name; + + src = fetchurl { + url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; + sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef"; + }; + + buildInputs = [ libcap perl docbook2x ]; + + patches = [ + ./dont-run-ldconfig.patch + ./fix-documentation-build.patch + ./fix-sgml-documentation.patch + ]; + + preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + + configureFlags = "--localstatedir=/var --disable-doc"; + + postInstall = '' + cd "$out/lib" + lib=liblxc.so.?.* + ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/') + ''; + + meta = { + homepage = "http://lxc.sourceforge.net"; + description = "lightweight virtual system mechanism"; + license = stdenv.lib.licenses.lgpl21Plus; + + longDescription = '' + LXC is the userspace control package for Linux Containers, a + lightweight virtual system mechanism sometimes described as + "chroot on steroids". LXC builds up from chroot to implement + complete virtual systems, adding resource management and isolation + mechanisms to Linux’s existing process management infrastructure. + ''; + + + 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 ebff9fe70df..091af044457 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1025,6 +1025,7 @@ let lshw = callPackage ../tools/system/lshw { }; lxc = callPackage ../applications/virtualization/lxc { }; + lxc_0_8 = callPackage ../applications/virtualization/lxc/0.8.nix { }; lzma = xz; -- GitLab From 57dcac2d2a34afa021e62d98680d9b513f7a1151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 17 Oct 2012 22:07:37 +0200 Subject: [PATCH 1131/5607] nvidia-legacy-173: updating to build with linux 3.6 --- pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 0112270f3bf..90ff989b759 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -2,7 +2,7 @@ let - versionNumber = "173.14.35"; + versionNumber = "173.14.36"; 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 = "16kjxj2bn78cgyb4xq39zajjv1hx1z5dw50n9r17w14ifq7i09id"; + sha256 = "19wnikms9wradf1kmaywnp7hykrdm4xqz2ka7az66s3ma096y95c"; } 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 = "0mk7pj7in090dx2v5yzkd7qkaf0qvz3jv4cmpiflpmzmg9p15x8n"; + sha256 = "1xf1w6qvqw0a3vd807hp3cgqmzm1wkpz2by52p0qgpjqld421k2s"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; -- GitLab From 3d2e43df37707669d1b48efbcac548c74a83849f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Oct 2012 00:21:42 +0400 Subject: [PATCH 1132/5607] Update sgt-puzzles --- pkgs/games/sgt-puzzles/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 83d012d35f1..b8043525719 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -10,8 +10,8 @@ in rec { src = fetchsvn { url = svn://svn.tartarus.org/sgt/puzzles; - rev = "9437"; - sha256 = "4820ce1e54e017a64dd9cb8991c020d0628329605a37af2a99b78bffbde43e85"; + rev = "9689"; + sha256 = "33285a971fee67324f8867de22582931135d8b8ee4cc2c41c46c3ba81eb99cb7"; } + "/"; inherit buildInputs; @@ -27,6 +27,7 @@ rec { setVars = a.noDepEntry '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=variadic-macros" ''; /* doConfigure should be removed if not needed */ -- GitLab From 070f38d48d131afe1f395d961009a7cdb3492f76 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Oct 2012 00:34:09 +0400 Subject: [PATCH 1133/5607] Update pqiv --- pkgs/applications/graphics/pqiv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index e13ea97cab8..3fd9d47374a 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, getopt, which, pkgconfig, gtk } : stdenv.mkDerivation (rec { - name = "pqiv-0.8"; + name = "pqiv-0.12"; src = fetchurl { - url = "http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/${name}.tbz"; - sha256 = "365332bab4b13ca56da6935e7155af20658e67d323808942dce23e880466f66d"; + url = "https://github.com/downloads/phillipberndt/pqiv/${name}.tbz"; + sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e"; }; buildInputs = [ getopt which pkgconfig gtk ]; -- GitLab From b18be4e5e5dc01dd2631e6428f026edaf5764eab Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 18 Oct 2012 03:13:21 +0200 Subject: [PATCH 1134/5607] adding csound --- pkgs/applications/audio/csound/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/audio/csound/default.nix diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix new file mode 100644 index 00000000000..9e4ee01810c --- /dev/null +++ b/pkgs/applications/audio/csound/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, cmake, libsndfile, flex, bison +, alsaLib ? null +, pulseaudio ? null +, tcltk ? null + +# maybe csound can be compiled with support for those, see configure output +# , ladspa ? null +# , fluidsynth ? null +# , jack ? null +# , gmm ? null +# , wiiuse ? null +}: + +stdenv.mkDerivation { + name = "csound5.18.02"; + + enableParallelBuilding = true; + + src = fetchurl { + url = http://netcologne.dl.sourceforge.net/project/csound/csound5/csound5.18/Csound5.18.02.tar.gz; + sha256 = "4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8"; + }; + + buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; + + meta = { + description = "sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; + homepage = http://www.csounds.com/; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 091af044457..e937c2dbafb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6635,6 +6635,8 @@ let inherit (gnome) libgnomeui GConf; }; + csound = callPackage ../applications/audio/csound { }; + libcompizconfig = callPackage ../applications/window-managers/compiz/libcompizconfig.nix { }; compiz_bcop = callPackage ../applications/window-managers/compiz/bcop.nix { }; -- GitLab From dc3fafe06d17da9f239f0a6639a0472b6284d76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Oct 2012 10:14:06 +0200 Subject: [PATCH 1135/5607] blas: `install -d' on FreeBSD --- .../libraries/science/math/blas/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 55654586edd..2f8cf1be03f 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -32,10 +32,12 @@ stdenv.mkDerivation { echo >>make.inc "RANLIB = ranlib" make ''; - - installPhase = '' - install -D -m755 libblas.a "$out/lib/libblas.a" - install -D -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3" + + installPhase = + # FreeBSD's stdenv doesn't use Coreutils. + let dashD = if stdenv.isFreeBSD then "-d" else "-D"; in '' + install ${dashD} -m755 libblas.a "$out/lib/libblas.a" + install ${dashD} -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3" ln -s libblas.so.3.0.3 "$out/lib/libblas.so.3" ln -s libblas.so.3.0.3 "$out/lib/libblas.so" ''; -- GitLab From b9982a7d11c347c6b93cb610eb542156d812c0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Oct 2012 10:53:05 +0200 Subject: [PATCH 1136/5607] cairo: fix FreeBSD builds --- pkgs/development/libraries/cairo/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 2dd1a81f4fb..4753a39ed76 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -43,7 +43,13 @@ stdenv.mkDerivation rec { # `-I' flags to be propagated. sed -i "src/cairo.pc.in" \ -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' - ''; + '' + + # On FreeBSD, `-ldl' doesn't exist. + + (stdenv.lib.optionalString stdenv.isFreeBSD + '' cat util/cairo-fdr/Makefile.in | sed -es/-ldl//g > t + mv t util/cairo-fdr/Makefile.in + ''); enableParallelBuilding = true; -- GitLab From 39690a9904a5851c9d52cfe5376e01dad403bce4 Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Thu, 18 Oct 2012 11:09:10 +0200 Subject: [PATCH 1137/5607] qt: update to version 4.8.3 Signed-off-by: Baptist BENOIST --- .../libraries/qt-4.x/4.8/default.nix | 8 +- .../qt-4.x/4.8/dlopen-absolute-paths.diff | 76 +++++++++++-------- .../libraries/qt-4.x/4.8/dlopen-gtkstyle.diff | 14 ++-- 3 files changed, 55 insertions(+), 43 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index f56886259a6..e58ac9afdc6 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -12,7 +12,7 @@ }: let - v = "4.8.2"; + v = "4.8.3"; in # TODO: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "0y93vkkn44md37gyg4y8sc9ylk27xkniaimfcpdcwd090qnjl6wj"; + md5 = "a663b6c875f8d7caa8ac9c30e4a4ec3b"; }; patches = [ ( substituteAll { @@ -142,10 +142,10 @@ stdenv.mkDerivation rec { } else {}); meta = with stdenv.lib; { - homepage = http://qt.nokia.com/products; + homepage = http://qt-project.org/; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = with maintainers; [ urkud sander ]; + maintainers = with maintainers; [ urkud sander bbenoist ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff index 9823d649365..9a77f708c34 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff @@ -1,6 +1,30 @@ ---- a/src/gui/painting/qcups.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/painting/qcups.cpp 2011-12-18 12:17:07.000000000 +0400 -@@ -87,7 +87,7 @@ +diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp +index e8c3fb8..e554e53 100644 +--- a/src/corelib/tools/qlocale_icu.cpp ++++ b/src/corelib/tools/qlocale_icu.cpp +@@ -81,7 +81,7 @@ bool qt_initIcu(const QString &localeString) + if (status == NotLoaded) { + + // resolve libicui18n +- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); + lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); + if (!lib.load()) { + qWarning() << "Unable to load library icui18n" << lib.errorString(); +@@ -111,7 +111,7 @@ bool qt_initIcu(const QString &localeString) + } + + // resolve libicuuc +- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); ++ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); + ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics); + if (!ucLib.load()) { + qWarning() << "Unable to load library icuuc" << ucLib.errorString(); +diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp +index 2d45175..31158b3 100644 +--- a/src/gui/painting/qcups.cpp ++++ b/src/gui/painting/qcups.cpp +@@ -87,7 +87,7 @@ static CupsPrintFile _cupsPrintFile = 0; static void resolveCups() { @@ -9,9 +33,11 @@ if(cupsLib.load()) { _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); ---- a/src/gui/painting/qprinterinfo_unix.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/painting/qprinterinfo_unix.cpp 2011-12-23 16:22:15.000000000 +0400 -@@ -454,7 +454,7 @@ +diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp +index 48a3d8b..8220ee5 100644 +--- a/src/gui/painting/qprinterinfo_unix.cpp ++++ b/src/gui/painting/qprinterinfo_unix.cpp +@@ -454,7 +454,7 @@ int qt_retrieveNisPrinters(QList *printers) char *domain; int err; @@ -20,40 +46,24 @@ typedef int (*ypGetDefaultDomain)(char **); ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); ---- a/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:26:07.000000000 +0400 -+++ b/src/network/kernel/qhostinfo_unix.cpp 2011-12-23 16:25:55.000000000 +0400 -@@ -95,7 +95,7 @@ +diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp +index d36d98b..24b41bb 100644 +--- a/src/network/kernel/qhostinfo_unix.cpp ++++ b/src/network/kernel/qhostinfo_unix.cpp +@@ -95,7 +95,7 @@ static res_state_ptr local_res = 0; static void resolveLibrary() { #ifndef QT_NO_LIBRARY - QLibrary lib(QLatin1String("resolv")); + QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); + lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); if (!lib.load()) return; - ---- a/src/corelib/tools/qlocale_icu.cpp 2011-12-08 09:06:03.000000000 +0400 -+++ b/src/corelib/tools/qlocale_icu.cpp 2011-12-23 16:29:15.000000000 +0400 -@@ -81,7 +81,7 @@ - if (status == NotLoaded) { - - // resolve libicui18n -- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!lib.load()) { - qWarning() << "Unable to load library icui18n" << lib.errorString(); - status = ErrorLoading; -@@ -110,7 +110,7 @@ - } - - // resolve libicuuc -- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); - if (!ucLib.load()) { - qWarning() << "Unable to load library icuuc" << ucLib.errorString(); - status = ErrorLoading; ---- a/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp 2011-12-23 20:38:49.000000000 +0400 -@@ -242,7 +242,7 @@ +diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp +index 784f56b..ead9732 100644 +--- a/src/plugins/platforms/xlib/qxlibstatic.cpp ++++ b/src/plugins/platforms/xlib/qxlibstatic.cpp +@@ -242,7 +242,7 @@ static void* qt_load_library_runtime(const char *library, int vernum, } # define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \ diff --git a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff index 522676a2b31..a1c9238be1a 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff +++ b/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff @@ -1,15 +1,17 @@ ---- a/src/gui/styles/qgtkstyle_p.cpp 2011-12-08 09:06:02.000000000 +0400 -+++ b/src/gui/styles/qgtkstyle_p.cpp 2011-12-24 17:56:46.000000000 +0400 -@@ -312,7 +312,7 @@ +diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp +index 3b128e6..39434db 100644 +--- a/src/gui/styles/qgtkstyle_p.cpp ++++ b/src/gui/styles/qgtkstyle_p.cpp +@@ -312,7 +312,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLatin1Literal &path) void QGtkStylePrivate::resolveGtk() const { // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 - QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); + QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics); gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); - gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -434,8 +434,8 @@ +@@ -435,8 +435,8 @@ void QGtkStylePrivate::resolveGtk() const pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); @@ -20,7 +22,7 @@ } /* \internal -@@ -607,9 +607,9 @@ +@@ -608,9 +608,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() static bool resolveGConf() { if (!QGtkStylePrivate::gconf_client_get_default) { -- GitLab From fa7f30bf5e0a9f9518cb5db699fae4cda921b4da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Oct 2012 11:12:35 +0200 Subject: [PATCH 1138/5607] glib: disable the NeXTstep on Darwin --- pkgs/development/libraries/glib/2.34.x.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/2.34.x.nix index 904647721dd..7fb61ac20e2 100644 --- a/pkgs/development/libraries/glib/2.34.x.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -11,7 +11,7 @@ # Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i # $out/bin/gtester-report' to postInstall if this is solved -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "glib-2.34.0"; src = fetchurl { @@ -52,3 +52,13 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } + +// + +(stdenv.lib.optionalAttrs stdenv.isDarwin { + # XXX: Disable the NeXTstep back-end because stdenv.gcc doesn't support + # Objective-C. + postConfigure = + '' sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g' + ''; +})) -- GitLab From 223b285776bb0dd1bcaa6199aead775029dbb35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Oct 2012 12:13:07 +0200 Subject: [PATCH 1139/5607] cairo: clear all occurrences of `-ldl' on FreeBSD --- pkgs/development/libraries/cairo/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 4753a39ed76..b24cc668bf1 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -47,8 +47,11 @@ stdenv.mkDerivation rec { # On FreeBSD, `-ldl' doesn't exist. + (stdenv.lib.optionalString stdenv.isFreeBSD - '' cat util/cairo-fdr/Makefile.in | sed -es/-ldl//g > t - mv t util/cairo-fdr/Makefile.in + '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in + do + cat "$i" | sed -es/-ldl//g > t + mv t "$i" + done ''); enableParallelBuilding = true; -- GitLab From 609b1b01c31e516c32f27b9f27e3b7983d516d79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Oct 2012 14:16:36 +0200 Subject: [PATCH 1140/5607] haskell-DSH: update to version 0.8.2.1 --- pkgs/development/libraries/haskell/DSH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index c34a5c91458..79573279e2b 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "DSH"; - version = "0.8.1.0"; - sha256 = "13mkpcm34jg7hqc272phiak7rg590hxb6ma3s9lwvp6izcv7vccq"; + version = "0.8.2.1"; + sha256 = "0rm5r5fmf1qxn4q5d6l8aid5d7i9i4hzdgimwpcw6d3mzg0sbl1c"; buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ]; meta = { description = "Database Supported Haskell"; -- GitLab From 94827f5b5ddf2c5eaa176f5b1b68086b30668c20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Oct 2012 14:16:36 +0200 Subject: [PATCH 1141/5607] haskell-conduit: update to version 0.5.2.7 --- 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 d5b45960cb9..6da1b8db34d 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.6"; - sha256 = "0zmls6gl02mdwapdggw340s7pn5fjsvaky40m31ph3n28qr71kww"; + version = "0.5.2.7"; + sha256 = "14bn755f25cin0wv775na85ngfx8ack31s15982zkqfva88xg48i"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void -- GitLab From 49229ee47efb0d03efe2a652c013cfa5256f3444 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Oct 2012 14:16:36 +0200 Subject: [PATCH 1142/5607] haskell-dbus: update to version 0.10.2 --- pkgs/development/libraries/haskell/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index c32edff3044..b9c436f4a56 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.1"; - sha256 = "180923lp09pwcvxffxyq753mq7zp7dyxgaj3h13wfsrhfia0awz8"; + version = "0.10.2"; + sha256 = "11nzpc2x2khln6xm2fbz54fy3ry1s08c83jndrcn1a4ymv3j1xh1"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes -- GitLab From d51ef5ab357fb3511b4f8d1c93ad932b0f1f47da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Oct 2012 14:16:36 +0200 Subject: [PATCH 1143/5607] haskell-monadcryptorandom: update to version 0.5 --- .../libraries/haskell/monadcryptorandom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index c1901f470fd..b702f10354c 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -1,12 +1,12 @@ -{ cabal, cryptoApi, mtl, transformers }: +{ cabal, cryptoApi, mtl, tagged, transformers }: cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.4.1"; - sha256 = "01x3zfr4m93bgx062rhxqk1d8qhn6s7rkfkm4yf00p89fclyjsg1"; - buildDepends = [ cryptoApi mtl transformers ]; + version = "0.5"; + sha256 = "19sb9mgfvmmmx1sn0aiq6dn5nl0201xwgs6xqakn7pz5vsqcww2b"; + buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { - homepage = "http://trac.haskell.org/crypto-api/wiki"; + homepage = "https://github.com/TomMD/monadcryptorandom"; description = "A monad for using CryptoRandomGen"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From b15bc6df90368ef909514fafcba303e4c5e8ddb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Oct 2012 14:16:36 +0200 Subject: [PATCH 1144/5607] haskell-network-info: update to version 0.2.0.3 --- pkgs/development/libraries/haskell/network-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix index d218af97362..c1bfea43bde 100644 --- a/pkgs/development/libraries/haskell/network-info/default.nix +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-info"; - version = "0.2.0.2"; - sha256 = "132cna6dc8azpll3rm2y4wv6sdcavwjq3x9f8m4p2952vr53bw3m"; + version = "0.2.0.3"; + sha256 = "04nwl5akrsppxkqqq7a7qi5sixvrzvj4njl8rbz7sglbh9393rs2"; meta = { homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; -- GitLab From fcc014e13e98b382b1bc6c9c52778879b5d29a48 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Oct 2012 14:16:36 +0200 Subject: [PATCH 1145/5607] haskell-shelly: update to version 0.14.2 --- 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 838e6c30faf..c266b6bd085 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.14.1"; - sha256 = "1cvfak5siysnpms1znra6dk762zp0gv1sam3xfdp67a7ir0hpcpp"; + version = "0.14.2"; + sha256 = "1vx7yq5fj4dnba94ypf8ldd236kivxisrzhkxcfhhar5zvw2jqng"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; -- GitLab From a8b903c849a80960fb308eeda55ba7741f225c32 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 18 Oct 2012 14:16:37 +0200 Subject: [PATCH 1146/5607] haskell-zip-archive: update to version 0.1.2.1 --- .../development/libraries/haskell/zip-archive/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index 050d48280d2..5ee2377147e 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,12 +1,12 @@ -{ cabal, binary, digest, filepath, mtl, utf8String, zlib }: +{ cabal, binary, digest, filepath, mtl, time, utf8String, zlib }: cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.1.8"; - sha256 = "0rq4jk1sxi6lrc7d7sh500lh83v2fxxrfh2gknqiyzxd3wh364y1"; + version = "0.1.2.1"; + sha256 = "1c0pjbrkfv44nbpz60b1c4xdbkdk8qaxlkfxl51rb2183gj1gkph"; isLibrary = true; isExecutable = true; - buildDepends = [ binary digest filepath mtl utf8String zlib ]; + buildDepends = [ binary digest filepath mtl time utf8String zlib ]; meta = { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; -- GitLab From a25a84ff864257931829e12a267286856518d846 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 18 Oct 2012 14:16:34 +0200 Subject: [PATCH 1147/5607] jackaudio: Add extra download URL. Main site seems down. --- pkgs/misc/jackaudio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 363d2308d0b..77d3c2f35ab 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { version = "1.9.8"; src = fetchurl { - url = "http://www.grame.fr/~letz/jack-1.9.8.tgz"; + urls = [ + "http://pkgs.fedoraproject.org/lookaside/pkgs/jack-audio-connection-kit/jack-1.9.8.tgz/1dd2ff054cab79dfc11d134756f27165/jack-1.9.8.tgz" + "http://www.grame.fr/~letz/jack-1.9.8.tgz" + ]; sha256 = "0788092zxrivcfnfg15brpjkf14x8ma8cwjz4k0b9xdxajn2wwac"; }; -- GitLab From e0e00a86cb68e8a07a2d565c84621140844591ae Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 16 Oct 2012 10:44:14 +0200 Subject: [PATCH 1148/5607] node-packages - add async-0.1.22 - add wu-0.1.8 - upgrade mongodb-1.1.11 - upgrade bson-0.1.5 - upgrade underscore-1.4.2 --- pkgs/top-level/node-packages.nix | 55 +++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index bde4b9b5f27..1f7d5cb7d3a 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -53,6 +53,19 @@ let self = { ]; }; + "async" = self."async-0.1.22"; + + "async-0.1.22" = self.buildNodePackage rec { + name = "async-0.1.22"; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/${name}.tgz"; + sha256 = "6fd2750cd519a754b0e32ef3423e64768055129e00a95d9297005bda29fdef18"; + }; + deps = [ + + ]; + }; + "backbone" = self."backbone-0.9.2"; "backbone-0.9.2" = self.buildNodePackage rec { @@ -109,15 +122,14 @@ let self = { ]; }; - "bson" = self."bson-0.1.4"; + "bson" = self."bson-0.1.5"; - "bson-0.1.4" = self.buildNodePackage rec { - name = "bson-0.1.4"; + "bson-0.1.5" = self.buildNodePackage rec { + name = "bson-0.1.5"; src = fetchurl { url = "http://registry.npmjs.org/bson/-/${name}.tgz"; - sha256 = "deb8d960c849d1cadbb692ce93a6f4678f5431f98965869806f8f26f3db81919"; + sha256 = "3fad2209466740ea81d0bc285b92d940efe5104a6314946ea40180c431a19692"; }; - flags = [ "mongodb:native" ]; deps = [ ]; @@ -536,16 +548,16 @@ let self = { ]; }; - "mongodb" = self."mongodb-1.1.8"; + "mongodb" = self."mongodb-1.1.11"; - "mongodb-1.1.8" = self.buildNodePackage rec { - name = "mongodb-1.1.8"; + "mongodb-1.1.11" = self.buildNodePackage rec { + name = "mongodb-1.1.11"; src = fetchurl { url = "http://registry.npmjs.org/mongodb/-/${name}.tgz"; - sha256 = "af99f0e13d5286b4335378c958cfc9773ada0732ef7242b25cb01aac288cbec1"; + sha256 = "fedd14b097a58ae5c2c83e5cb0af85a191ad00c2ce8d6db46520ee6cc1650277"; }; deps = [ - self."bson-0.1.4" + self."bson-0.1.5" ]; }; @@ -1028,14 +1040,14 @@ let self = { ]; }; - "underscore" = self."underscore-1.3.3"; - "underscore->=1.3.1" = self."underscore-1.3.3"; + "underscore" = self."underscore-1.4.2"; + "underscore->=1.3.1" = self."underscore-1.4.2"; - "underscore-1.3.3" = self.buildNodePackage rec { - name = "underscore-1.3.3"; + "underscore-1.4.2" = self.buildNodePackage rec { + name = "underscore-1.4.2"; src = fetchurl { url = "http://registry.npmjs.org/underscore/-/${name}.tgz"; - sha256 = "e710644e53f5a6d75a41a3e19d8c35eedbce0db1e886e470daf9f909c9d1ea8a"; + sha256 = "329ab22ba9b37be4a0c694ca21b9ed85b99256a45c2e0cf3624c4719443366d6"; }; deps = [ @@ -1098,6 +1110,19 @@ let self = { ]; }; + "wu" = self."wu-0.1.8"; + + "wu-0.1.8" = self.buildNodePackage rec { + name = "wu-0.1.8"; + src = fetchurl { + url = "http://registry.npmjs.org/wu/-/${name}.tgz"; + sha256 = "2400d0ca7da862a9063a6a8d914bb4e585f81a5121b0fda8e40b1f6e782c72c6"; + }; + deps = [ + + ]; + }; + "xmlhttprequest" = self."xmlhttprequest-1.2.2"; "xmlhttprequest-1.2.2" = self.buildNodePackage rec { -- GitLab From 2947f91371f6e1e894de213e29296c2a097e6f6e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 17 Oct 2012 14:54:50 -0400 Subject: [PATCH 1149/5607] nvidia-x11: Update to 304.51 --- 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 94a48e0f179..dce5eec27a1 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.43"; in +let versionNumber = "304.51"; 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 = "0k1csg547n6h3vb7phfhfcxnvqgqad55l7zgp0lai9d008rlhzvw"; + sha256 = "08hc4w5ic1zbanfn5cpj3nqjk5s3brs6b4bcllzqd5nrfxizdzbq"; } 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 = "0m6dxlhpg6705qrg6czk98gn14zic3xgbxr02czwmhyppgsi3f9i"; + sha256 = "0fix999d1fzryjs635krh1ff9ha3agbwzscicrj0apwsfrbvqf5w"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; -- GitLab From 18c4b2180f5d30e8b7fcc27c7f334f5c3241b396 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Oct 2012 10:10:36 -0400 Subject: [PATCH 1150/5607] Fix link --- doc/quick-start.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/quick-start.xml b/doc/quick-start.xml index dddbbb4a19e..a14de4077db 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -173,7 +173,7 @@ $ git add pkgs/development/libraries/libfoo/default.nix The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the chapter + xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter on writing Nix expressions. -- GitLab From bf08f68ccba4ef01657c950bdf68cbe8754b0466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 18 Oct 2012 17:34:49 +0200 Subject: [PATCH 1151/5607] blas: really fix installation on FreeBSD --- pkgs/development/libraries/science/math/blas/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 2f8cf1be03f..7066ebad87c 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -35,7 +35,9 @@ stdenv.mkDerivation { installPhase = # FreeBSD's stdenv doesn't use Coreutils. - let dashD = if stdenv.isFreeBSD then "-d" else "-D"; in '' + let dashD = if stdenv.isFreeBSD then "" else "-D"; in + (stdenv.lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") + + '' install ${dashD} -m755 libblas.a "$out/lib/libblas.a" install ${dashD} -m755 libblas.so.3.0.3 "$out/lib/libblas.so.3.0.3" ln -s libblas.so.3.0.3 "$out/lib/libblas.so.3" -- GitLab From 76c010b928952e042dcdbdef16d2bbf101e133f8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 18 Oct 2012 12:21:55 -0400 Subject: [PATCH 1152/5607] linux: Update to 3.2.32 --- 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 47048509905..607e9deff0a 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.31"; + version = "3.2.32"; 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 = "0b2yklmgxv1sk847701f1wgh2kg2jxqqp7bg1279p7fj8vnmbmrq"; + sha256 = "0kp52fz5xkaypgn19qa47bbrawj04g0vv0lfmx5vc51cvxljipa0"; }; config = configWithPlatform stdenv.platform; -- GitLab From 0e930058aeeb1b70caa870c762724ca87036abec Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 18 Oct 2012 20:49:22 +0400 Subject: [PATCH 1153/5607] Update TigerVNC to SVN checkout that at least builds.. --- pkgs/servers/x11/xorg/default.nix | 10 +++++++ pkgs/servers/x11/xorg/extra.list | 3 +- pkgs/servers/x11/xorg/overrides.nix | 23 ++++++++++++++ pkgs/tools/admin/tigervnc/default.nix | 43 +++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 60 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index e92d5e4a666..8508f87e043 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1936,6 +1936,16 @@ let }; buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; + + xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) { + name = "xorg-server-1.13.0"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2; + sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl"; + }; + buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ]; + })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 3af867171ef..f7f139b19c1 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,7 @@ -mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901 -mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0 mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2 mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2 mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2 mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index de32722ed7c..fdb68b237f0 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -230,6 +230,29 @@ in ''; }; + xorgserver_1_13_0 = attrs: attrs // { + configureFlags = "--enable-xcsecurity"; # enable SECURITY extension + patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; + buildInputs = attrs.buildInputs ++ + [ args.zlib args.udev args.mesa args.dbus.libs + xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto + xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto + xorg.xineramaproto xorg.xf86dgaproto + xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto + xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont + xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto + ]; + propagatedBuildInputs = + [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto + xorg.dri2proto xorg.kbproto + ]; + postInstall = + '' + rm -fr $out/share/X11/xkb/compiled + ln -s /var/tmp $out/share/X11/xkb/compiled + ''; + }; + libSM = attrs: attrs // { propagatedBuildInputs = [ xorg.libICE ]; } // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") { diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index de61d1e556b..f74463b1063 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -3,21 +3,25 @@ , fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison , fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto , fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto -, libxkbfile, libXfont, libpciaccess +, libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama +, xineramaproto, libXcursor, fetchsvn, libxcrypt }: with stdenv.lib; stdenv.mkDerivation rec { - name = "tigervnc-1.1.0"; + # Release version = "1.2.0"; + revision = 5005; + version = "r${toString revision}"; + name = "tigervnc-${version}"; - src = fetchurl { - url = "mirror://sourceforge/tigervnc/${name}.tar.gz"; - sha256 = "1x30s12fwv9rk0fnwwn631qq0d8rpjjx53bvzlx8c91cba170jsr"; + src = fetchsvn { + # Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz"; + url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk"; + rev = revision; + sha256 = "2401e0ede9a2d50a37caeb094e5e832d24878749239578f44ae2acd42de01b43"; }; - configureFlags = "--enable-nls"; - inherit fontDirectories; patchPhase = '' @@ -39,7 +43,11 @@ stdenv.mkDerivation rec { # this: ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)} xorgPatches = xorgserver.patches; + dontUseCmakeBuildDir = "yes"; + postBuild = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -Wno-error=int-to-pointer-cast" + # Build Xvnc tar xf ${xorgserver.src} cp -R xorg*/* unix/xserver @@ -48,19 +56,13 @@ stdenv.mkDerivation rec { do patch -p1 < $a done - patch -p1 < ../xserver18.patch + patch -p1 < ../xserver113.patch autoreconf -vfi - ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx + ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" make TIGERVNC_SRCDIR=`pwd`/../.. popd ''; - # I don't know why I need this; it may have to do with this problem: - # http://bugs.gentoo.org/show_bug.cgi?id=142852 - preInstall = '' - sed -i -e s,@MKINSTALLDIRS@,`pwd`/mkinstalldirs, po/Makefile - ''; - postInstall = '' pushd unix/xserver make TIGERVNC_SRCDIR=`pwd`/../.. install @@ -70,17 +72,20 @@ stdenv.mkDerivation rec { buildInputs = (map (x : x.hostDrv) (buildInputs ++ [ fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto fontsproto videoproto compositeproto scrnsaverproto resourceproto - libxkbfile libXfont libpciaccess + libxkbfile libXfont libpciaccess xineramaproto ])); }; buildInputs = - [ libX11 libXext gettext libICE libXtst libXi libSM - nasm libgcrypt gnutls pam pixman + [ libX11 libXext gettext libICE libXtst libXi libSM libXft + nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xineramaproto + libXinerama libXcursor libxcrypt ]; buildNativeInputs = - [ autoconf automake cvs utilmacros fontutil libtool flex bison ] + [ autoconf automake cvs utilmacros fontutil libtool flex bison + cmake + ] ++ xorgserver.buildNativeInputs; propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e937c2dbafb..80f796b892d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1616,6 +1616,8 @@ let tigervnc = callPackage ../tools/admin/tigervnc { fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc xorg.fontbhlucidatypewriter75dpi ]; + xorgserver = xorg.xorgserver_1_13_0; + fltk = fltk13; }; tightvnc = callPackage ../tools/admin/tightvnc { -- GitLab From ae573d8501ead5fed059d75da0c43d62c5d8e3d5 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 19 Oct 2012 09:53:06 +0200 Subject: [PATCH 1154/5607] skype: Fix syntax error in .desktop-file --- .../networking/instant-messengers/skype/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index ddbba59e145..51e9a623444 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -54,13 +54,11 @@ stdenv.mkDerivation rec { chmod +x $out/bin/skype - # Desktop icon for Skype - patch skype.desktop << EOF - 5c5 - < Icon=skype.png - --- - > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png - EOF + # Fixup desktop file + substituteInPlace skype.desktop --replace \ + "Icon=skype.png" "Icon=$out/opt/skype/icons/SkypeBlue_48x48.png" + substituteInPlace skype.desktop --replace \ + "Terminal=0" "Terminal=false" mkdir -p $out/share/applications mv skype.desktop $out/share/applications ''; -- GitLab From 58f3e4716633436d1124838403219a4719e210a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Oct 2012 10:08:07 +0200 Subject: [PATCH 1155/5607] git: update to version 1.7.12.4 --- .../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 4481a1f8321..dcfaaa74fae 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.12.2"; + version = "1.7.12.4"; svn = subversionClient.override { perlBindings = true; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha1 = "277b759139ddb62c6935da37de8a483e2c234a97"; + sha256 = "1nk3igf7mgcj9yvpyrnp3i9725fljxi96icmzalfzd8nkj94br8p"; }; patches = [ ./docbook2texi.patch ]; -- GitLab From 5c59edb8f4cd43c77476102103aa305f8bbd56be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Oct 2012 10:10:42 +0200 Subject: [PATCH 1156/5607] maxima: update to version 5.28.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 41c21f94b01..18d145b6dde 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.27.0"; + version = "5.28.0"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "9006803714f1385221c4395697fad53f125a13d29b50b188d045d08e25f8dca7"; + sha256 = "d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda"; }; buildInputs = [sbcl texinfo perl makeWrapper]; -- GitLab From 24ec84073681c6144f36d9e0da1a37b54d348b09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Oct 2012 10:11:18 +0200 Subject: [PATCH 1157/5607] wxmaxima: update to version 12.09.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 52048dc9d19..559c4448c31 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.04.0"; + version = "12.09.0"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "60110507e0a63738a1f420b22697eaac9bea3866122e072dcd697077e8744824"; + sha256 = "5803ab62fc791bcb87f0d0f38357dba6fccc4efa61cb9f709e142c2954b1305d"; }; buildInputs = [wxGTK maxima makeWrapper]; -- GitLab From a29717f41f353c1a3e3d94a6e1ed3459ae0d09c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Oct 2012 10:19:41 +0200 Subject: [PATCH 1158/5607] stellarium: update to version 0.11.4 --- .../science/astronomy/stellarium/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index b651370db21..e890ee58307 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,28 +1,24 @@ {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}: let - name = "stellarium-0.11.3"; + name = "stellarium-0.11.4"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "f7c7eeaefcdc54c0fb8766f09e0c838acb742719adcdf12a6c1e12d55ecd6ac3"; + sha256 = "8ad5e9878eb36c2c27f4754dcfc69279123e0eae02cc388074e3cf9b23746535"; }; buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; - preConfigure = '' - sed -i -e '/typedef void (\*__GLXextFuncPtr)(void);/d' src/core/external/GLee.h - ''; - enableParallelBuilding = true; meta = { - description = "an free open source planetarium"; - homepage = http://stellarium.org/; - license = "GPL2"; + description = "Free open-source planetarium"; + homepage = "http://stellarium.org/"; + license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin maintainers = [ stdenv.lib.maintainers.simons ]; -- GitLab From 57412945015babd243ef002b4e22508cabef5688 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Oct 2012 10:38:46 +0200 Subject: [PATCH 1159/5607] haskell-DSH: update to version 0.8.2.2 --- pkgs/development/libraries/haskell/DSH/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/DSH/default.nix b/pkgs/development/libraries/haskell/DSH/default.nix index 79573279e2b..32cf21242de 100644 --- a/pkgs/development/libraries/haskell/DSH/default.nix +++ b/pkgs/development/libraries/haskell/DSH/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "DSH"; - version = "0.8.2.1"; - sha256 = "0rm5r5fmf1qxn4q5d6l8aid5d7i9i4hzdgimwpcw6d3mzg0sbl1c"; + version = "0.8.2.2"; + sha256 = "0hjy8c97avi4wwv3p9gyml66n34mbrfrhb19j5y6vcy0y8ysgf0c"; buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ]; meta = { description = "Database Supported Haskell"; -- GitLab From 118a5cf540c2f6ae58385b68ba89929105a37841 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 19 Oct 2012 10:38:46 +0200 Subject: [PATCH 1160/5607] haskell-silently: update to version 1.2.3 --- pkgs/development/libraries/haskell/silently/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix index 4fb4323bd17..1153a25cda5 100644 --- a/pkgs/development/libraries/haskell/silently/default.nix +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "silently"; - version = "1.2.0.2"; - sha256 = "0qcprbjnh351hc9v12gww478qd4pw7wgpyjj1gmkx4mr80w0qmm1"; + version = "1.2.3"; + sha256 = "1fvkj5qngdi2zxsrfk6dnaynm0wbxpmqr0jzvzayxifhzh04mqld"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/trystan/silently"; -- GitLab From 47d3d58ec6adea62402a85ca0c08bfa2ce75e975 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 19 Oct 2012 13:50:02 +0400 Subject: [PATCH 1161/5607] Fix xwd build --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fdb68b237f0..d34ccce7fe9 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -277,4 +277,8 @@ in xinput = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXrender]; }; + + xwd = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.libXt]; + }; } -- GitLab From 1189d3fb2a53a051d96faee2d152cf8fe929e901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Oct 2012 13:48:09 +0200 Subject: [PATCH 1162/5607] nettle: update to 2.5. --- pkgs/development/libraries/nettle/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 6c7383435a8..2a4d89bb4f0 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,12 +1,11 @@ { fetchurl, stdenv, gmp, gnum4 }: stdenv.mkDerivation (rec { - name = "nettle-2.4"; + name = "nettle-2.5"; src = fetchurl { - # Eventually use `mirror://gnu/'. - url = "ftp://ftp.lysator.liu.se/pub/security/lsh/${name}.tar.gz"; - sha256 = "0gwwcipmjxkv7p2p01m19n4c3jiczg682w58l5dgg0b8vw494056"; + url = "mirror://gnu/nettle/${name}.tar.gz"; + sha256 = "0wicr7amx01l03rm0pzgr1qvw3f9blaw17vjsy1301dh13ll58aa"; }; buildInputs = [ gnum4 ]; @@ -14,6 +13,8 @@ stdenv.mkDerivation (rec { doCheck = (stdenv.system != "i686-cygwin"); + enableParallelBuilding = true; + patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") ./cygwin.patch; -- GitLab From 6f21c88ffcd38a34a61aec9226d720343218ba35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Oct 2012 14:00:30 +0200 Subject: [PATCH 1163/5607] gnutls: update to 3.1.3 --- pkgs/development/libraries/gnutls/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 93f5dab537e..ee566d46b65 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,29 +5,29 @@ assert guileBindings -> guile != null; stdenv.mkDerivation (rec { - name = "gnutls-3.0.22"; + name = "gnutls-3.1.3"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "1pp90fm27qi5cd0pq18xcmnl79xcbfwxc54bg1xi1wv0vryqdpcr"; + sha256 = "0fff9frz0ycbnppfn0w4a2s9x27k21l4hh9zbax3v7a8cg33dcpw"; }; - # FIXME: Turn into a Nix list. + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. configurePhase = '' ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ --without-p11-kit \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --with-libnettle-prefix="${nettle}" \ + CPPFLAGS="-I${gmp}/include" \ ${if guileBindings then "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\"" - 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 ""} ''; + enableParallelBuilding = true; + buildInputs = [ zlib lzo ] ++ stdenv.lib.optional guileBindings guile; -- GitLab From c8d9220257c0503047169446e2c4760928e97b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 19 Oct 2012 14:10:17 +0200 Subject: [PATCH 1164/5607] cairo: pass `libiconvOrEmpty'; fixes builds on non-GNU system --- pkgs/development/libraries/cairo/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index b24cc668bf1..d21f303e741 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -5,7 +5,7 @@ , gobjectSupport ? true, glib , stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype, xlibs , zlib, libpng, pixman, libxcb ? null, xcbutil ? null -, gettext +, gettext, libiconvOrEmpty }: assert postscriptSupport -> zlib != null; @@ -25,7 +25,9 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ] # On non-GNU systems we need GNU Gettext for libintl. - ++ stdenv.lib.optional (!stdenv.isLinux) gettext; + ++ stdenv.lib.optional (!stdenv.isLinux) gettext + + ++ libiconvOrEmpty; propagatedBuildInputs = [ freetype pixman ] ++ -- GitLab From 76d8f6b7be21323a2c25b6f7d4f897c23a5f809c Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Fri, 19 Oct 2012 18:57:19 +0200 Subject: [PATCH 1165/5607] VLC: update to v2.0.4 --- 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 65357acf00f..3341a01101c 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.3"; + version = "2.0.4"; src = fetchurl { url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; - sha256 = "1lnjfpizgp8slj6i4fgk5wld6nfw08wfhkb1i1dvzbhmfigq1agv"; + sha256 = "1dixankckfxf8xixfc32rc9mfsv6mx2lk5h13ym8bp4dsk86w1jf"; }; buildInputs = -- GitLab From c93786bc7e48c163d50f481d280fb0610d9a4bc4 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 19 Oct 2012 16:21:24 -0400 Subject: [PATCH 1166/5607] nodePackages.buffertools --- 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 1f7d5cb7d3a..2b92d291b1f 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -135,6 +135,19 @@ let self = { ]; }; + "buffertools" = self."buffertools-~1"; + + "buffertools-~1" = self.buildNodePackage rec { + name = "buffertools-1.1.0"; + src = fetchurl { + url = "http://registry.npmjs.org/buffertools/-/${name}.tgz"; + sha256 = "a0520dbf39eedbd8c685ac4989bf822ac57cc161924abf82ba567234620380a5"; + }; + deps = [ + + ]; + }; + "bytes" = self."bytes-0.1.0"; "bytes-0.1.0" = self.buildNodePackage rec { -- GitLab From 35a3fc060a923fe91a46d9bc0d92d6230f95c2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 20 Oct 2012 10:34:48 +0200 Subject: [PATCH 1167/5607] alsalib: update + more urls. I can't connect to the main ftp url of alsaproject, then I add a mirror I quickily found by web search. --- pkgs/os-specific/linux/alsa-lib/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 36d9fa2ba9e..3be6d0c3c33 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,11 +1,14 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "alsa-lib-1.0.25"; + name = "alsa-lib-1.0.26"; src = fetchurl { - url = "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"; - sha256 = "1rl6wa06d1jiqnrshyqh5qb1lwg6dh8m1ilyaink21j1y1f806js"; + urls = [ + "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2" + "http://alsa.cybermirror.org/lib/${name}.tar.bz2" + ]; + sha256 = "0zbfkwqn7ixa71lsna9llq6i2gic540h8r8r0rjdphrwc1hq37wc"; }; configureFlags = "--disable-xmlto"; -- GitLab From c91bb2ed64fdfefdd71d22bff5daf5259a353c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 20 Oct 2012 10:52:09 +0200 Subject: [PATCH 1168/5607] freetype: making it crossbuild fine for mips. I think at some point the unwrapped build system gcc got into the PATH, and that breaks some cross-builds, because the configure scripts now choose the unwrapped gcc instead of the wrapped. I'll search when it happened and how to overcome this better. --- pkgs/development/libraries/freetype/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b8a73b97f46..a2d14be5001 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -31,6 +31,13 @@ stdenv.mkDerivation rec { ln -s freetype2/freetype $out/include/freetype ''; + crossAttrs = { + # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead + # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't + # know why it's on the PATH. + configureFlags = "--disable-static CC_BUILD=gcc"; + }; + meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; -- GitLab From 04d13e193e5ac75fd61da06ef6d8c53e7917dd17 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Oct 2012 12:10:28 +0200 Subject: [PATCH 1169/5607] lxc: fix documentation build and make version 0.8.0-rc2 the default --- pkgs/applications/virtualization/lxc/0.8.nix | 49 ---- .../virtualization/lxc/default.nix | 10 +- .../lxc/fix-sgml-documentation.patch | 257 ++++++++++-------- pkgs/top-level/all-packages.nix | 5 +- 4 files changed, 153 insertions(+), 168 deletions(-) delete mode 100644 pkgs/applications/virtualization/lxc/0.8.nix diff --git a/pkgs/applications/virtualization/lxc/0.8.nix b/pkgs/applications/virtualization/lxc/0.8.nix deleted file mode 100644 index 1ae47e0c8f6..00000000000 --- a/pkgs/applications/virtualization/lxc/0.8.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: - -let - name = "lxc-0.8.0-rc2"; -in -stdenv.mkDerivation{ - inherit name; - - src = fetchurl { - url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; - sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef"; - }; - - buildInputs = [ libcap perl docbook2x ]; - - patches = [ - ./dont-run-ldconfig.patch - ./fix-documentation-build.patch - ./fix-sgml-documentation.patch - ]; - - preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - - configureFlags = "--localstatedir=/var --disable-doc"; - - postInstall = '' - cd "$out/lib" - lib=liblxc.so.?.* - ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/') - ''; - - meta = { - homepage = "http://lxc.sourceforge.net"; - description = "lightweight virtual system mechanism"; - license = stdenv.lib.licenses.lgpl21Plus; - - longDescription = '' - LXC is the userspace control package for Linux Containers, a - lightweight virtual system mechanism sometimes described as - "chroot on steroids". LXC builds up from chroot to implement - complete virtual systems, adding resource management and isolation - mechanisms to Linux’s existing process management infrastructure. - ''; - - - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; - }; -} diff --git a/pkgs/applications/virtualization/lxc/default.nix b/pkgs/applications/virtualization/lxc/default.nix index 26180b84368..be943f5df9e 100644 --- a/pkgs/applications/virtualization/lxc/default.nix +++ b/pkgs/applications/virtualization/lxc/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl, libcap, perl, docbook2x, docbook_xml_dtd_45 }: -let - name = "lxc-0.7.5"; -in -stdenv.mkDerivation{ - inherit name; +stdenv.mkDerivation rec { + name = "lxc-0.8.0-rc2"; src = fetchurl { url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; - sha256 = "019ec63f250c874bf7625b1f1bf555b1a6e3a947937a4fca73100abddf829b1c"; + sha256 = "1f0ee0464507d26e494784e841b68c765ecd3abc5976012e226f69d1aa361bef"; }; buildInputs = [ libcap perl docbook2x ]; @@ -42,7 +39,6 @@ stdenv.mkDerivation{ mechanisms to Linux’s existing process management infrastructure. ''; - platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; diff --git a/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch b/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch index 4d2cce0dd62..60c9027cca5 100644 --- a/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch +++ b/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch @@ -1,7 +1,8 @@ -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in lxc-0.7.5/doc/lxc-cgroup.sgml.in ---- lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-cgroup.sgml.in 2011-09-26 10:05:01.753873426 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in +index 7092f16..021da41 100644 +--- a/doc/lxc-attach.sgml.in ++++ b/doc/lxc-attach.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -10,10 +11,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-cgroup.sgml.in lxc-0.7.5/ -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0.7.5/doc/lxc-checkpoint.sgml.in ---- lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in 2011-02-17 10:07:44.000000000 +0100 -+++ lxc-0.7.5/doc/lxc-checkpoint.sgml.in 2011-09-26 10:05:01.753873426 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in +index 5acd313..856a544 100644 +--- a/doc/lxc-cgroup.sgml.in ++++ b/doc/lxc-cgroup.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -22,22 +24,24 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-checkpoint.sgml.in lxc-0. -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.conf.sgml.in lxc-0.7.5/doc/lxc.conf.sgml.in ---- lxc-0.7.5-orig/doc/lxc.conf.sgml.in 2011-08-09 16:51:01.000000000 +0200 -+++ lxc-0.7.5/doc/lxc.conf.sgml.in 2011-09-26 10:05:01.754873476 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in +index bf0efd9..eeb0039 100644 +--- a/doc/lxc-checkpoint.sgml.in ++++ b/doc/lxc-checkpoint.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - - ]> -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5/doc/lxc-console.sgml.in ---- lxc-0.7.5-orig/doc/lxc-console.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-console.sgml.in 2011-09-26 10:05:01.754873476 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in +index 606c868..62f9e07 100644 +--- a/doc/lxc-console.sgml.in ++++ b/doc/lxc-console.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -46,10 +50,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-console.sgml.in lxc-0.7.5 -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-create.sgml.in lxc-0.7.5/doc/lxc-create.sgml.in ---- lxc-0.7.5-orig/doc/lxc-create.sgml.in 2011-07-25 00:27:10.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-create.sgml.in 2011-09-26 10:05:01.755873526 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in +index a3cca83..d59106d 100644 +--- a/doc/lxc-create.sgml.in ++++ b/doc/lxc-create.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -58,10 +63,19 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-create.sgml.in lxc-0.7.5/ -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-destroy.sgml.in lxc-0.7.5/doc/lxc-destroy.sgml.in ---- lxc-0.7.5-orig/doc/lxc-destroy.sgml.in 2010-10-08 11:54:53.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-destroy.sgml.in 2011-09-26 10:05:01.755873526 +0200 -@@ -23,7 +23,7 @@ +@@ -141,6 +141,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + filesystem) of size SIZE rather than the default, which is 1G. + + ++ + + + +diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in +index e75de57..05f53d6 100644 +--- a/doc/lxc-destroy.sgml.in ++++ b/doc/lxc-destroy.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -70,10 +84,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-destroy.sgml.in lxc-0.7.5 -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-execute.sgml.in lxc-0.7.5/doc/lxc-execute.sgml.in ---- lxc-0.7.5-orig/doc/lxc-execute.sgml.in 2011-07-25 00:27:10.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-execute.sgml.in 2011-09-26 10:05:01.755873526 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in +index 77d132a..1e58bef 100644 +--- a/doc/lxc-execute.sgml.in ++++ b/doc/lxc-execute.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -82,10 +97,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-execute.sgml.in lxc-0.7.5 -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-freeze.sgml.in lxc-0.7.5/doc/lxc-freeze.sgml.in ---- lxc-0.7.5-orig/doc/lxc-freeze.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-freeze.sgml.in 2011-09-26 10:05:01.755873526 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in +index 798ccf4..f0d0485 100644 +--- a/doc/lxc-freeze.sgml.in ++++ b/doc/lxc-freeze.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -94,10 +110,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-freeze.sgml.in lxc-0.7.5/ -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-kill.sgml.in lxc-0.7.5/doc/lxc-kill.sgml.in ---- lxc-0.7.5-orig/doc/lxc-kill.sgml.in 2010-10-08 11:54:53.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-kill.sgml.in 2011-09-26 10:05:01.756873576 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in +index 5bec922..1f48820 100644 +--- a/doc/lxc-kill.sgml.in ++++ b/doc/lxc-kill.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -106,10 +123,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-kill.sgml.in lxc-0.7.5/do -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/lxc-ls.sgml.in ---- lxc-0.7.5-orig/doc/lxc-ls.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-ls.sgml.in 2011-09-26 10:05:01.756873576 +0200 -@@ -24,7 +24,7 @@ +diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in +index 3ffd4f8..b11d211 100644 +--- a/doc/lxc-ls.sgml.in ++++ b/doc/lxc-ls.sgml.in +@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -118,10 +136,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ls.sgml.in lxc-0.7.5/doc/ ]> -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5/doc/lxc-monitor.sgml.in ---- lxc-0.7.5-orig/doc/lxc-monitor.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-monitor.sgml.in 2011-09-26 10:05:01.756873576 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in +index 9d8711c..b492968 100644 +--- a/doc/lxc-monitor.sgml.in ++++ b/doc/lxc-monitor.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -130,10 +149,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-monitor.sgml.in lxc-0.7.5 -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ps.sgml.in lxc-0.7.5/doc/lxc-ps.sgml.in ---- lxc-0.7.5-orig/doc/lxc-ps.sgml.in 2011-08-11 17:54:57.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-ps.sgml.in 2011-09-26 10:05:01.756873576 +0200 -@@ -24,7 +24,7 @@ +diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in +index bb7b5a6..05ed59f 100644 +--- a/doc/lxc-ps.sgml.in ++++ b/doc/lxc-ps.sgml.in +@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -142,10 +162,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-ps.sgml.in lxc-0.7.5/doc/ ]> -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5/doc/lxc-restart.sgml.in ---- lxc-0.7.5-orig/doc/lxc-restart.sgml.in 2011-02-17 10:07:44.000000000 +0100 -+++ lxc-0.7.5/doc/lxc-restart.sgml.in 2011-09-26 10:05:01.757873626 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in +index eb556d9..d158cc7 100644 +--- a/doc/lxc-restart.sgml.in ++++ b/doc/lxc-restart.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -154,58 +175,37 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-restart.sgml.in lxc-0.7.5 -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc.sgml.in lxc-0.7.5/doc/lxc.sgml.in ---- lxc-0.7.5-orig/doc/lxc.sgml.in 2010-10-26 18:07:35.000000000 +0200 -+++ lxc-0.7.5/doc/lxc.sgml.in 2011-09-26 10:05:01.758873676 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in +index 4504d58..f268185 100644 +--- a/doc/lxc-start.sgml.in ++++ b/doc/lxc-start.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - - ]> -@@ -280,7 +280,7 @@ - +diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in +index d15e649..51179c4 100644 +--- a/doc/lxc-stop.sgml.in ++++ b/doc/lxc-stop.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -- -+ - - + --> -@@ -570,7 +570,7 @@ - to the background. +- -- -+ - - - -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-start.sgml.in lxc-0.7.5/doc/lxc-start.sgml.in ---- lxc-0.7.5-orig/doc/lxc-start.sgml.in 2011-02-01 15:12:40.000000000 +0100 -+++ lxc-0.7.5/doc/lxc-start.sgml.in 2011-09-26 10:05:01.758873676 +0200 -@@ -23,7 +23,7 @@ + + +diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in +index bb00d85..3f8f59b 100644 +--- a/doc/lxc-unfreeze.sgml.in ++++ b/doc/lxc-unfreeze.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -214,10 +214,11 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-start.sgml.in lxc-0.7.5/d -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-stop.sgml.in lxc-0.7.5/doc/lxc-stop.sgml.in ---- lxc-0.7.5-orig/doc/lxc-stop.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-stop.sgml.in 2011-09-26 10:05:01.758873676 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in +index 97a4c39..0c7c589 100644 +--- a/doc/lxc-wait.sgml.in ++++ b/doc/lxc-wait.sgml.in +@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> @@ -226,27 +227,65 @@ diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-stop.sgml.in lxc-0.7.5/do -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in lxc-0.7.5/doc/lxc-unfreeze.sgml.in ---- lxc-0.7.5-orig/doc/lxc-unfreeze.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-unfreeze.sgml.in 2011-09-26 10:05:01.759873726 +0200 -@@ -23,7 +23,7 @@ +diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in +index 9edabf8..daa2ff8 100644 +--- a/doc/lxc.conf.sgml.in ++++ b/doc/lxc.conf.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - -diff -ubr '--exclude=Makefile*' lxc-0.7.5-orig/doc/lxc-wait.sgml.in lxc-0.7.5/doc/lxc-wait.sgml.in ---- lxc-0.7.5-orig/doc/lxc-wait.sgml.in 2010-06-07 10:51:51.000000000 +0200 -+++ lxc-0.7.5/doc/lxc-wait.sgml.in 2011-09-26 10:05:01.759873726 +0200 -@@ -24,7 +24,7 @@ + ]> +diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in +index 1b30fed..d98ca21 100644 +--- a/doc/lxc.sgml.in ++++ b/doc/lxc.sgml.in +@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --> - + ]> +@@ -280,7 +280,7 @@ rootfs + + + +- ++ + + + +@@ -570,7 +570,7 @@ rootfs + to the background. + + +- ++ + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80f796b892d..045829caba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1025,7 +1025,6 @@ let lshw = callPackage ../tools/system/lshw { }; lxc = callPackage ../applications/virtualization/lxc { }; - lxc_0_8 = callPackage ../applications/virtualization/lxc/0.8.nix { }; lzma = xz; @@ -8143,7 +8142,7 @@ let }; gtypist = callPackage ../games/gtypist { }; - + hexen = callPackage ../games/hexen { }; icbm3d = callPackage ../games/icbm3d { }; @@ -8199,7 +8198,7 @@ let mygui = myguiSvn; }; - rili = callPackage ../games/rili { }; + rili = callPackage ../games/rili { }; rogue = callPackage ../games/rogue { }; -- GitLab From 094cbf9b4d716375ba6bcfa8cd0eda2807332ef8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Oct 2012 12:36:44 +0200 Subject: [PATCH 1170/5607] Move lxc from "applications/virtualization" to "os-specific/linux". --- .../virtualization => os-specific/linux}/lxc/default.nix | 0 .../linux}/lxc/dont-run-ldconfig.patch | 0 .../linux}/lxc/fix-documentation-build.patch | 0 .../linux}/lxc/fix-sgml-documentation.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/virtualization => os-specific/linux}/lxc/default.nix (100%) rename pkgs/{applications/virtualization => os-specific/linux}/lxc/dont-run-ldconfig.patch (100%) rename pkgs/{applications/virtualization => os-specific/linux}/lxc/fix-documentation-build.patch (100%) rename pkgs/{applications/virtualization => os-specific/linux}/lxc/fix-sgml-documentation.patch (100%) diff --git a/pkgs/applications/virtualization/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix similarity index 100% rename from pkgs/applications/virtualization/lxc/default.nix rename to pkgs/os-specific/linux/lxc/default.nix diff --git a/pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch similarity index 100% rename from pkgs/applications/virtualization/lxc/dont-run-ldconfig.patch rename to pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch diff --git a/pkgs/applications/virtualization/lxc/fix-documentation-build.patch b/pkgs/os-specific/linux/lxc/fix-documentation-build.patch similarity index 100% rename from pkgs/applications/virtualization/lxc/fix-documentation-build.patch rename to pkgs/os-specific/linux/lxc/fix-documentation-build.patch diff --git a/pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch b/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch similarity index 100% rename from pkgs/applications/virtualization/lxc/fix-sgml-documentation.patch rename to pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 045829caba0..c1a04e940fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1024,7 +1024,7 @@ let lshw = callPackage ../tools/system/lshw { }; - lxc = callPackage ../applications/virtualization/lxc { }; + lxc = callPackage ../os-specific/linux/lxc { }; lzma = xz; -- GitLab From 00d03f2f50a9426070ab2f078c3e2829ba28d911 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 20 Oct 2012 13:06:09 +0200 Subject: [PATCH 1171/5607] ipsec-tools: add version 0.8.0 --- .../os-specific/linux/ipsec-tools/default.nix | 42 +++++++++++++++++++ ...-create-localstatedir-during-install.patch | 13 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 57 insertions(+) create mode 100644 pkgs/os-specific/linux/ipsec-tools/default.nix create mode 100644 pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix new file mode 100644 index 00000000000..00676319b03 --- /dev/null +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, linuxHeaders, readline, openssl, flex, krb5, pam }: + +# TODO: These tools are supposed to work under NetBSD and FreeBSD as +# well, so I guess it's not appropriate to place this expression in +# "os-specific/linux/ipsec-tools". Since I cannot verify that the +# expression actually builds on those platforms, I'll leave it here for +# the time being. + +stdenv.mkDerivation rec { + name = "ipsec-tools-0.8.0"; + + src = fetchurl { + url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2"; + sha256 = "2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717"; + }; + + buildInputs = [ readline openssl flex krb5 pam ]; + + patches = [ ./dont-create-localstatedir-during-install.patch ]; + + configureFlags = '' + --sysconfdir=/etc --localstatedir=/var + --with-kernel-headers=${linuxHeaders}/include + --disable-security-context + --enable-adminport + --enable-dpd + --enable-frag + --enable-gssapi + --enable-hybrid + --enable-natt + --enable-shared + --enable-stats + ''; + + meta = { + homepage = "http://ipsec-tools.sourceforge.net/"; + description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [stdenv.lib.maintainers.simons]; + }; +} diff --git a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch b/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch new file mode 100644 index 00000000000..16b80c36d6a --- /dev/null +++ b/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch @@ -0,0 +1,13 @@ +diff -ubr ipsec-tools-0.8.0-orig/src/racoon/Makefile.in ipsec-tools-0.8.0/src/racoon/Makefile.in +--- ipsec-tools-0.8.0-orig/src/racoon/Makefile.in 2012-10-20 13:01:07.700903316 +0200 ++++ ipsec-tools-0.8.0/src/racoon/Makefile.in 2012-10-20 13:01:13.177832616 +0200 +@@ -1085,9 +1085,6 @@ + uninstall-sbinPROGRAMS + + +-install-exec-local: +- ${mkinstalldirs} $(DESTDIR)${adminsockdir} +- + # special object rules + crypto_openssl_test.o: crypto_openssl.c + $(COMPILE) -DEAYDEBUG -o crypto_openssl_test.o -c $(srcdir)/crypto_openssl.c diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1a04e940fd..fc3d75db726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1270,6 +1270,8 @@ let { hurd = gnu.hurdCrossIntermediate; }) else null; + ipsecTools = callPackage ../os-specific/linux/ipsec-tools { }; + patch = gnupatch; pbzip2 = callPackage ../tools/compression/pbzip2 { }; -- GitLab From f5c346d556f8069b683233f96e198efc78291e05 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Sun, 21 Oct 2012 03:03:13 +0200 Subject: [PATCH 1172/5607] Add tarsnap package. --- pkgs/tools/backup/tarsnap/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/backup/tarsnap/default.nix diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix new file mode 100644 index 00000000000..bcf03356c68 --- /dev/null +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, openssl, zlib, e2fsprogs }: + +stdenv.mkDerivation { + name = "tarsnap-1.0.33"; + + src = fetchurl { + url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.33.tgz"; + sha256 = "0z8bmra3xms9vcgvkiy9fy1j97192z6w7n658j6zr5cniid8438c"; + }; + + buildInputs = [ openssl zlib e2fsprogs ]; + + meta = { + description = "Online backups for the truly paranoid"; + homepage = "http://www.tarsnap.com/"; + maintainers = with stdenv.lib.maintainers; [roconnor]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7edc90f5940..4a9a201cbb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1517,6 +1517,8 @@ let autoconf = autoconf213; }; + tarsnap = callPackage ../tools/backup/tarsnap { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; /* -- GitLab From fe6d7bc9077fdee8da266523b47b1309d8b8e3ee Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 20 Oct 2012 21:32:25 -0700 Subject: [PATCH 1173/5607] - ncmpcpp 0.5.10 --- pkgs/applications/audio/ncmpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 3af9bc7690f..a7fca8cabf1 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}: stdenv.mkDerivation rec { - version = "0.5.8"; + version = "0.5.10"; name = "ncmpcpp-${version}"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; - sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx"; + sha256 = "ff6d5376a2d9caba6f5bb78e68af77cefbdb2f04cd256f738e39f8ac9a79a4a8"; }; buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ]; -- GitLab From 1db34880d71152229c91225b734cac2ffc909810 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 20 Oct 2012 21:59:25 -0700 Subject: [PATCH 1174/5607] - gphoto2-2.4.14, libgphoto2-2.4.14 --- pkgs/applications/misc/gphoto2/default.nix | 14 ++++++++++++-- .../development/libraries/libgphoto2/default.nix | 16 +++++++++++++--- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 9fff2943d30..022cb437c69 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,17 +3,27 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.4.11"; + name = "gphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0ah42b7rnqh0z8bb96z7cdycxdh5k19h6lmfc02kdhrhqdr3q81y"; + sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47"; }; buildNativeInputs = [ pkgconfig gettext ]; buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; meta = { + description = "a ready to use set of digital camera software applications"; + longDescription = '' + + A set of command line utilities for manipulating over 1400 different + digital cameras. Through libgphoto2, it supports PTP, MTP, and much more.. + + ''; homepage = http://www.gphoto.org/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 16001e689dd..94944052845 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.11"; + name = "libgphoto2-2.4.14"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji"; + sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; }; buildNativeInputs = [ pkgconfig gettext ]; @@ -17,6 +17,16 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; description = "A library for accessing digital cameras"; - license = "LGPL 2.1"; + longDescription = '' + This is the library backend for gphoto2. It contains the code for PTP, + MTP, and other vendor specific protocols for controlling and transferring data + from digital cameras. + ''; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = with stdenv.lib.platforms; unix; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } + +# XXX: the homepage claims LGPL, and the several src files I audited were +# lgpl21Plus -- GitLab From d8006ae36854215819092ddfd678766586600d39 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sat, 20 Oct 2012 22:17:14 -0700 Subject: [PATCH 1175/5607] - libarchive-3.0.4 --- .../libraries/libarchive/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index fc554dcd875..64d769fab75 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,21 +1,29 @@ -{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs +{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz , sharutils }: stdenv.mkDerivation rec { - name = "libarchive-2.8.3"; + name = "libarchive-3.0.4"; src = fetchurl { - url = "http://libarchive.googlecode.com/files/${name}.tar.gz"; - sha256 = "16095d15334b3c8dbb02db5af3d415f12c1c3bdd4eb43af7bbc36ab7572c0b7a"; + url = "https://github.com/downloads/libarchive/libarchive/${name}.tar.gz"; + sha256 = "76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac"; }; - propagatedBuildInputs = [ libxml2 zlib bzip2 openssl ] ++ + propagatedBuildInputs = [ libxml2 zlib bzip2 openssl xz ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; buildInputs = [ sharutils ]; meta = { - description = "A library for reading and writing streaming archives"; - homepage = http://people.freebsd.org/~kientzle/libarchive; + description = "Multi-format archive and compression library"; + longDescription = '' + This library has code for detecting and reading many archive formats and + compressions formats including (but not limited to) tar, shar, cpio, zip, and + compressed with gzip, bzip2, lzma, xz, .. + ''; + homepage = http://libarchive.github.com/; + license = stdenv.lib.licenses.bsd3; + platforms = with stdenv.lib.platforms; all; + maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } -- GitLab From c01c02a74b94fcdd2f835d9dd6d9115c4ee54d94 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 21 Oct 2012 22:36:33 -0400 Subject: [PATCH 1176/5607] Linux 3.0.47 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index b5d54befc09..b0f8e38c84d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.46"; + version = "3.0.47"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1m5zxbnclv1b72pn7zwrmik45pxzsapcj94m39aqq5akq8i149ig"; + sha256 = "0gk6na5qd7j1brvsb1v52550qbidjk0c41spn3nyr8mrq2b8l5kk"; }; config = configWithPlatform stdenv.platform; -- GitLab From e71103deefd19703119a35a2f435b756332b26df Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 21 Oct 2012 22:38:53 -0400 Subject: [PATCH 1177/5607] Linux 3.4.15 --- 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 fe80e38eade..0913f5f65be 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.14"; + version = "3.4.15"; 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 = "0kr7yjhw5di2srryd1aypyi8mlxjh9gvmsz1684mj1fdpxi5adq4"; + sha256 = "1cakx844rzs358bc8sd4kaqjj7m2aawgk7b4i17fb7ccxqjz4zij"; }; config = configWithPlatform stdenv.platform; -- GitLab From 125f6a02a45e931e4d4c24ae845b9a20a2d71153 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 21 Oct 2012 22:40:13 -0400 Subject: [PATCH 1178/5607] Linux 3.6.3 --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index fdd01bc97e7..03c959b3d8e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6.2"; + version = "3.6.3"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "1clxrmxq09bjcxcxi2z2fmbfij0zah5jxy29b0b59hgpg24cfyb0"; + sha256 = "0f1shqhamwmv5sjgr9jcvk5xfdj3lcy5pzymwzj26qv72217vh99"; }; config = configWithPlatform stdenv.platform; -- GitLab From 5e2e5411c96d8b6a4f28f5d67ad1e9ec45fce617 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 22 Oct 2012 06:47:22 +0200 Subject: [PATCH 1179/5607] google-talk-plugin: Update to version 3.9.1.0. Version 3.6.1.0 is no longer available at the upstream site, so we won't break anything with this update. Signed-off-by: aszlig --- .../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 e2e64dbbeb9..009170d284b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,18 +45,18 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - version = "3.6.1.0"; + version = "3.9.1.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "1h6qa9vh1bbhsxsihm56nqg9is9vnrvnjl8cjz3hqym2w160ycbv"; + sha256 = "1bxabczinl94wb0p0qbir392r76ans9fzjwli504pcaaimp4159k"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "0d6dfivmm0azfpv283bqs04w6098z8w4cnjgivp80mfd6ndjv8x2"; + sha256 = "04zmkbxpai84qbywg8slgpz2cab86fska265wd52jv26ihs4iawf"; } else throw "Google Talk does not support your platform."; -- GitLab From 8ba64338f71fc2f60b6c25da2b58ef9c75314290 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Sun, 21 Oct 2012 21:59:23 -0700 Subject: [PATCH 1180/5607] as we dereference a variable in a string, the expression needs to be recursive. --- pkgs/development/libraries/libshout/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 45528829cc3..760b8ecce09 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -3,7 +3,7 @@ # need pkgconfig so that libshout installs ${out}/lib/pkgconfig/shout.pc -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "libshout-2.3.1"; src = fetchurl { -- GitLab From 540966025d16ccf85a701c9b2273ca183165e7ff Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Mon, 22 Oct 2012 14:39:24 +0200 Subject: [PATCH 1181/5607] Add package haskell-lambdacube-engine-0.2.4 Add package haskell-lambdacube-engine-0.2.4 and haskell-vect-0.4.7. --- .../haskell/lambdacube-engine/default.nix | 19 +++++++++++++++++++ .../libraries/haskell/vect/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lambdacube-engine/default.nix create mode 100644 pkgs/development/libraries/haskell/vect/default.nix diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix new file mode 100644 index 00000000000..f3c9a8af4ea --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix @@ -0,0 +1,19 @@ +{ cabal, binary, bitmap, bytestringTrie, filepath, mtl, OpenGLRaw +, stbImage, uulib, vect, vector, vectorAlgorithms, xml, zipArchive +}: + +cabal.mkDerivation (self: { + pname = "lambdacube-engine"; + version = "0.2.4"; + sha256 = "1xdp10nylndmfw16dywqrxj30g99rf9qbcx5qiglvzm1c1kxid3f"; + buildDepends = [ + binary bitmap bytestringTrie filepath mtl OpenGLRaw stbImage uulib + vect vector vectorAlgorithms xml zipArchive + ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine"; + description = "3D rendering engine written entirely in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix new file mode 100644 index 00000000000..2d81a013176 --- /dev/null +++ b/pkgs/development/libraries/haskell/vect/default.nix @@ -0,0 +1,14 @@ +{ cabal, random }: + +cabal.mkDerivation (self: { + pname = "vect"; + version = "0.4.7"; + sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d"; + buildDepends = [ random ]; + meta = { + homepage = "http://code.haskell.org/~bkomuves/"; + description = "A low-dimensional linear algebra library, tailored to computer 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 4acc9ab0186..a9a3ddf5f79 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1081,6 +1081,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {}; + lambdacubeEngine = callPackage ../development/libraries/haskell/lambdacube-engine {}; + largeword = callPackage ../development/libraries/haskell/largeword {}; lazysmallcheck = callPackage ../development/libraries/haskell/lazysmallcheck {}; @@ -1644,6 +1646,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); Vec = callPackage ../development/libraries/haskell/Vec {}; + vect = callPackage ../development/libraries/haskell/vect {}; + vector_0_9_1 = callPackage ../development/libraries/haskell/vector/0.9.1.nix {}; vector_0_10 = callPackage ../development/libraries/haskell/vector/0.10.nix {}; vector_0_10_0_1 = callPackage ../development/libraries/haskell/vector/0.10.0.1.nix {}; -- GitLab From 2c0ff9bf9b9d2a3c0936dec0f891b84d66d8513b Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 22 Oct 2012 15:02:33 +0200 Subject: [PATCH 1182/5607] Remove deprecated option --ephemeral from fetchdarcs --- pkgs/build-support/fetchdarcs/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchdarcs/builder.sh b/pkgs/build-support/fetchdarcs/builder.sh index a211de42da4..efff5ff5ebf 100644 --- a/pkgs/build-support/fetchdarcs/builder.sh +++ b/pkgs/build-support/fetchdarcs/builder.sh @@ -12,7 +12,7 @@ fi header "getting $url $partial ${tagtext} into $out" -darcs get --lazy --ephemeral $tagflags "$url" "$out" +darcs get --lazy $tagflags "$url" "$out" # remove metadata, because it can change rm -rf "$out/_darcs" -- GitLab From 19bffad329cc840b9ca0d067dcc1ef3dcc267953 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 22 Oct 2012 19:52:19 +0200 Subject: [PATCH 1183/5607] virtualbox: Update to version 4.2.2. This time, we need to patch, because the upstream tarball got messed up somehow[TM]. You can find some details about the issue here: https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html Our patch is removing the language file, as it seems that even in SVN trunk it isn't available anymore. So, let's hope we can remove this patch in the next upstream release. Signed-off-by: aszlig --- .../virtualization/virtualbox/default.nix | 8 +++-- .../virtualbox/remove_fa_ir.patch | 30 +++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3af9796136f..e4291703211 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.2.0"; + version = "4.2.2"; 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 = "895426ecac371bef4c070e8bcc9306f0c57dcbd6be25188d915b63ddde6f49e6"; + sha256 = "943daa13694605d5d0a23ffef27c398b5e72ada669de89bad4b98f000f029700"; }; buildInputs = @@ -44,7 +44,9 @@ in stdenv.mkDerivation { ++ optional javaBindings jdk ++ optional pythonBindings python; - patchPhase = '' + patches = [ ./remove_fa_ir.patch ]; + + postPatch = '' set -x MODULES_BUILD_DIR=`echo ${kernel}/lib/modules/*/build` sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ diff --git a/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch new file mode 100644 index 00000000000..0d7a8342192 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/remove_fa_ir.patch @@ -0,0 +1,30 @@ +This patch is for VirtualBox-4.2.2, to temporarily remove references to the +fa_IR language file from the source tree, as it somehow got lost during tarball +creation. For more information on this subject please have a look at: + +https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html + +diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro +index ffeb410..37ac56a 100644 +--- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro ++++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro +@@ -63,7 +63,6 @@ TRANSLATIONS = \ + nls/VirtualBox_es.ts \ + nls/VirtualBox_eu.ts \ + nls/VirtualBox_fi.ts \ +- nls/VirtualBox_fa_IR.ts \ + nls/VirtualBox_fr.ts \ + nls/VirtualBox_gl_ES.ts \ + nls/VirtualBox_hu.ts \ +diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk +index 66f0ec3..2fc19b9 100644 +--- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk ++++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk +@@ -23,7 +23,6 @@ VBOX_APPROVED_GUI_LANGUAGES := \ + de \ + en \ + es \ +- fa_IR \ + hu \ + it \ + ja \ -- GitLab From 78342bde93a38f55b80b867c0007ae7c03819293 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 22 Oct 2012 19:55:31 +0200 Subject: [PATCH 1184/5607] virtualbox-guest: Update to version 4.2.2. This should fix a few issues with charon and VMs crashing starting at an amount of at least 4 running VMs in parallel. 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 8c92b5e0ed3..c4c7a9f2708 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes, libXrandr, libXcursor}: -let version = "4.2.0"; in +let version = "4.2.2"; in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "ef274ecdcb48adec469656959e51c8468b6d3a7733ddf93f9a3713f77f1604f3"; + sha256 = "26f5390b36a3bb9855846d194dcd287b8e53613b599c6ffd7aff1b451cc7f1f1"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; -- GitLab From a0e8e991506060bcaf89656a1c6cc0c581a90644 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Mon, 22 Oct 2012 20:18:35 +0200 Subject: [PATCH 1185/5607] Add haskell-elerea-2.7.0.2 --- .../development/libraries/haskell/elerea/default.nix | 12 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/haskell/elerea/default.nix diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix new file mode 100644 index 00000000000..8ba4687d3e3 --- /dev/null +++ b/pkgs/development/libraries/haskell/elerea/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "elerea"; + version = "2.7.0.2"; + sha256 = "1n45q1hx548c6yqbj3321lky3xxsffpqvmcq0m9hw36d3cvwbvg0"; + meta = { + description = "A minimalistic FRP 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 4acc9ab0186..1bb3291cd17 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -724,6 +724,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); editline = callPackage ../development/libraries/haskell/editline {}; + elerea = callPackage ../development/libraries/haskell/elerea {}; + emailValidate = callPackage ../development/libraries/haskell/email-validate {}; enumerator = callPackage ../development/libraries/haskell/enumerator {}; -- GitLab From 9085403eb2dfc7a69c007aed01e616951c195d91 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 23 Oct 2012 01:06:33 +0400 Subject: [PATCH 1186/5607] Let old WebKit build by silencing some borderline-errors --- pkgs/development/libraries/webkit/gtk2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix index 5c755c193a5..0b836cd08f0 100644 --- a/pkgs/development/libraries/webkit/gtk2.nix +++ b/pkgs/development/libraries/webkit/gtk2.nix @@ -61,6 +61,7 @@ rec { setVars = fullDepEntry ('' export NIX_LDFLAGS="$NIX_LDFLAGS -lXt" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive" '') ["minInit"]; doReplaceUsrBin = fullDepEntry ('' -- GitLab From 737eff7166e2812249a4e786a73e683673d7e228 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 23 Oct 2012 06:04:17 +0200 Subject: [PATCH 1187/5607] chromium: Update beta and dev releases. beta: 23.0.1271.26 -> 23.0.1271.40 dev: 24.0.1284.2 -> 24.0.1297.0 Both are building successful and the BPF seccomp sandbox fix has been dropped as it has finally been applied upstream. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 11 +---------- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index acfb43e7caa..cb0561fa09a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -88,14 +88,6 @@ let pre23 = versionOlder sourceInfo.version "23.0.0.0"; in optional pre23 ./enable_seccomp.patch; - maybeBpfTemporaryFix = let - patch = fetchurl { - url = "https://chromiumcodereview.appspot.com/download/issue11073003_6001_7001.diff"; - sha256 = "bf61871cdaa8fea27ce15482a17048f67b426a55813c3832f9bd39ec47a9eb06"; - }; - needPatch = !versionOlder sourceInfo.version "23.0.1271.0"; - in optional needPatch patch; - in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -129,8 +121,7 @@ in stdenv.mkDerivation rec { patches = optional cfg.cups ./cups_allow_deprecated.patch ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch - ++ maybeSeccompPatch - ++ maybeBpfTemporaryFix; + ++ maybeSeccompPatch; postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index dbb0de72f30..b8d010340b3 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "24.0.1284.2"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1284.2.tar.bz2"; - sha256 = "0lp3r4n3d71wy2ndzcfwvrp9vc1ii98pxip1c8hfinz994ca1ykx"; + version = "24.0.1297.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1297.0.tar.bz2"; + sha256 = "1qwqpj5xnv9fsi8k79c6fzlry32h47w6chxabz3l819c008yrqa4"; }; beta = { - version = "23.0.1271.26"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.26.tar.bz2"; - sha256 = "1iimpmm5lm5rvak49320lmmvwqr8xv4znp4h1pf65jzzx0apbgkh"; + version = "23.0.1271.40"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2"; + sha256 = "151yp9rw7v693mw4glmswl7ls2yx3zk0sz1n646brs5wrnbci9l0"; }; stable = { version = "22.0.1229.94"; -- GitLab From b91a3927e6fa577b7e448e86e03c91098262e6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 23 Oct 2012 09:02:40 +0200 Subject: [PATCH 1188/5607] libxml2: FreeBSD: add explicit dependency on XZ --- pkgs/development/libraries/libxml2/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8fc32babd3b..e25074f8d12 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }: +{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true }: assert pythonSupport -> python != null; @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}"; - buildInputs = stdenv.lib.optional pythonSupport [ python ]; + buildInputs = (stdenv.lib.optional pythonSupport [ python ]) + + # Libxml2 has an optional dependency on liblzma. However, on impure + # platforms, it may end up using that from /usr/lib, and thus lack a + # RUNPATH for that, leading to undefined references for its users. + ++ (stdenv.lib.optional stdenv.isFreeBSD xz); propagatedBuildInputs = [ zlib ]; @@ -26,7 +31,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xmlsoft.org/; - description = "A XML parsing library for C"; + description = "An XML parsing library for C"; license = "bsd"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; -- GitLab From 8b9f3e9de4b5566a8f6d3993a6a99ea3e804b63c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Oct 2012 13:51:13 +0200 Subject: [PATCH 1189/5607] systemd: Update to 195 --- pkgs/os-specific/linux/systemd/default.nix | 7 +++---- .../linux/systemd/fix-device-aliases.patch | 14 -------------- 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/fix-device-aliases.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index cd9cc2dae2c..1da64199179 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,17 +6,16 @@ assert stdenv.gcc.libc or null != null; stdenv.mkDerivation rec { - name = "systemd-194"; + name = "systemd-195"; src = fetchurl { url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz"; - sha256 = "0cgnnl6kqaz3als5y9g8jvsvbs4c8ccp0vl4s1g8rwk69w2cwxd2"; + sha256 = "00v3haymdxhjk71pqp17irw9pm5ivfvz35ibvw41v5zdhj5il179"; }; patches = [ ./reexec.patch ./ignore-duplicates.patch - ./fix-device-aliases.patch ./crypt-devices-are-ready.patch ]; @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { makeFlags = "CPPFLAGS=-I${stdenv.gcc.libc}/include"; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc sysvinitdir=$(TMPDIR)/etc/init.d"; # Get rid of configuration-specific data. postInstall = diff --git a/pkgs/os-specific/linux/systemd/fix-device-aliases.patch b/pkgs/os-specific/linux/systemd/fix-device-aliases.patch deleted file mode 100644 index 508fd0ec074..00000000000 --- a/pkgs/os-specific/linux/systemd/fix-device-aliases.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/core/device.c b/src/core/device.c -index 5307341..7bbe99a 100644 ---- a/src/core/device.c -+++ b/src/core/device.c -@@ -255,8 +255,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p - if (!is_path(alias)) - log_warning("SYSTEMD_ALIAS for %s is not a path, ignoring: %s", sysfs, alias); - else { -- if ((r = device_add_escaped_name(u, alias)) < 0) -- goto fail; -+ device_update_unit(m, dev, alias, false); - } - } - -- GitLab From 56cee6fe5c8411ecfdb8fb2c66f19427ba3c36a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Oct 2012 15:35:48 +0200 Subject: [PATCH 1190/5607] Make Firefox 16 the default --- .../networking/browsers/firefox/12.0.nix | 181 ------------------ pkgs/lib/attrsets.nix | 20 +- pkgs/top-level/all-packages.nix | 8 +- pkgs/top-level/release.nix | 1 - 4 files changed, 12 insertions(+), 198 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/12.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/12.0.nix b/pkgs/applications/networking/browsers/firefox/12.0.nix deleted file mode 100644 index 97e23d1b8b2..00000000000 --- a/pkgs/applications/networking/browsers/firefox/12.0.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip - -, # 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 = "12.0"; - - xulVersion = "12.0"; # this attribute is used by other packages - - - src = fetchurl { - url = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "0177185e54b7d63dc36bd5bd5c80ba6afd52e199"; - }; - - 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 - xlibs.libXext xlibs.xextproto sqlite unzip - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - enableParallelBuilding = true; - - # 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])) - }' ';' - - export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}" - ''; - - # !!! Temporary hack. - preBuild = - '' - export NIX_ENFORCE_PURITY= - ''; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - 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/{xpcshell,plugin-container,*.so}; do - patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true - 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 - ]; - - 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"; - - # 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; - ''; # */ - - 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/lib/attrsets.nix b/pkgs/lib/attrsets.nix index 63448847a15..eca6936bbee 100644 --- a/pkgs/lib/attrsets.nix +++ b/pkgs/lib/attrsets.nix @@ -24,7 +24,7 @@ rec { then attrByPath (tail attrPath) default (getAttr attr e) else default; - + /* Return nested attribute set in which an attribute is set. For instance ["x" "y"] applied with some value v returns `x.y = v;' */ setAttrByPath = attrPath: value: @@ -37,7 +37,7 @@ rec { getAttrFromPath = attrPath: set: let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; in attrByPath attrPath (abort errorMsg) set; - + /* Return the specified attributes from a set. @@ -79,6 +79,7 @@ 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 ]; } @@ -90,6 +91,7 @@ rec { ) 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 verified. @@ -119,7 +121,7 @@ rec { builtins.listToAttrs. */ nameValuePair = name: value: { inherit name value; }; - + /* Apply a function to each element in an attribute set. The function takes two arguments --- the attribute name and its value --- and returns the new value for the attribute. The result is a @@ -137,7 +139,7 @@ rec { /* Like `mapAttrs', but allows the name of each attribute to be changed in addition to the value. The applied function should return both the new name and value as a `nameValuePair'. - + Example: mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value)) { x = "a"; y = "b"; } @@ -145,11 +147,11 @@ rec { */ mapAttrs' = f: set: listToAttrs (map (attr: f attr (getAttr attr set)) (attrNames set)); - + /* Call a function for each attribute in the given set and return the result in a list. - + Example: mapAttrsToList (name: value: name + value) { x = "a"; y = "b"; } @@ -157,7 +159,7 @@ rec { */ mapAttrsToList = f: attrs: map (name: f name (getAttr name attrs)) (attrNames attrs); - + /* Like `mapAttrs', except that it recursively applies itself to attribute sets. Also, the first argument of the argument @@ -174,7 +176,7 @@ rec { */ mapAttrsRecursive = mapAttrsRecursiveCond (as: true); - + /* Like `mapAttrsRecursive', but it takes an additional predicate function that tells it whether to recursive into an attribute set. If it returns false, `mapAttrsRecursiveCond' does not @@ -258,7 +260,7 @@ rec { returns: { foo.bar = 1; # 'foo.*' from the second set - foo.quz = 2; # + foo.quz = 2; # bar = 3; # 'bar' from the first set baz = 4; # 'baz' from the second set } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e67afe2562e..21b090783d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6951,7 +6951,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox15Pkgs; + firefoxPkgs = pkgs.firefox16Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; @@ -6959,12 +6959,6 @@ let firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; }; - firefox12Pkgs = callPackage ../applications/networking/browsers/firefox/12.0.nix { - inherit (gnome) libIDL; - }; - - firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; }; - firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9af498e6377..caf5bd8aafa 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -354,7 +354,6 @@ with (import ./release-lib.nix); }; firefox36Pkgs.firefox = linux; - firefox12Pkgs.firefox = linux; firefox15Pkgs.firefox = linux; firefox16Pkgs.firefox = linux; -- GitLab From 41ade95c300df82de3211fb7a3d089daaaee8780 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 17:17:48 +0200 Subject: [PATCH 1191/5607] haskell-async: update to version 2.0.1.4 --- .../libraries/haskell/async/{2.0.1.3.nix => 2.0.1.4.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/async/{2.0.1.3.nix => 2.0.1.4.nix} (81%) diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix similarity index 81% rename from pkgs/development/libraries/haskell/async/2.0.1.3.nix rename to pkgs/development/libraries/haskell/async/2.0.1.4.nix index a0da6384e95..c5caa55e97f 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "async"; - version = "2.0.1.3"; - sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; + version = "2.0.1.4"; + sha256 = "1hi40bjwpl65mz7zj0sgh16bp9dwafbm5ysi2q8fzwwq5l0zxpa1"; buildDepends = [ stm ]; meta = { homepage = "https://github.com/simonmar/async"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4acc9ab0186..23bfafc0745 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -120,7 +120,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_3; # 7.6 ok + async = self.async_2_0_1_4; # 7.6 ok cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok GLUT = self.GLUT_2_3_0_0; # 7.6 ok @@ -155,7 +155,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_2012_4_0_0 = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_3; + async = self.async_2_0_1_4; cgi = self.cgi_3001_1_7_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_1_2_1; @@ -462,8 +462,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); AspectAG = callPackage ../development/libraries/haskell/AspectAG {}; - async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; - async = self.async_2_0_1_3; + async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; + async = self.async_2_0_1_4; attempt = callPackage ../development/libraries/haskell/attempt {}; -- GitLab From 7d2b61bcb3bd4612dc08201314080c3b2bf2092d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 17:18:36 +0200 Subject: [PATCH 1192/5607] haskell-HTTP: update to version 4000.2.6 --- .../libraries/haskell/HTTP/{4000.2.5.nix => 4000.2.6.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.5.nix => 4000.2.6.nix} (81%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix similarity index 81% rename from pkgs/development/libraries/haskell/HTTP/4000.2.5.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.6.nix index f345e7c98e1..2c85ec7cd9e 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.6.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.5"; - sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; + version = "4000.2.6"; + sha256 = "0rycwrn9cq9mrsgxkbx373zjvmzg4hd8hzclya6ipd3jda1w5r92"; buildDepends = [ mtl network parsec ]; meta = { homepage = "https://github.com/haskell/HTTP"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 23bfafc0745..38178f30efc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -126,7 +126,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_0_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok - HTTP = self.HTTP_4000_2_5; # 7.6 ok + HTTP = self.HTTP_4000_2_6; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_0_1; # 7.6 ok @@ -161,7 +161,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_1_2_1; haskellSrc = self.haskellSrc_1_0_1_5; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_5; + HTTP = self.HTTP_4000_2_6; HUnit = self.HUnit_1_2_5_1; mtl = self.mtl_2_1_2; network = self.network_2_3_1_0; @@ -913,8 +913,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_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; - HTTP = self.HTTP_4000_2_5; + HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {}; + HTTP = self.HTTP_4000_2_6; hackageDb = callPackage ../development/libraries/haskell/hackage-db {}; -- GitLab From 6702643f73c023e02be4ad2e99aa40db3af55534 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:06:35 +0200 Subject: [PATCH 1193/5607] haskell-packages.nix: fix spelling of the attribute name for the HDBC-sqlite3 package --- 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 38178f30efc..54ceb3e3a75 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -934,7 +934,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HDBCPostgresql = callPackage ../development/libraries/haskell/HDBC/HDBC-postgresql.nix {}; - HDBCSqlite = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; + HDBCSqlite3 = callPackage ../development/libraries/haskell/HDBC/HDBC-sqlite3.nix {}; heist = callPackage ../development/libraries/haskell/heist {}; -- GitLab From 0bd2f95a319a03ccc70edf35ac4563c576211997 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1194/5607] haskell-xmonad-extras: update to version 0.10.1.2 --- pkgs/applications/window-managers/xmonad/xmonad-extras.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index eefc865b537..334c7f59d57 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -4,15 +4,12 @@ cabal.mkDerivation (self: { pname = "xmonad-extras"; - version = "0.10.1.1"; - sha256 = "1pkp9z58w2x8yhxhvm5nifxb1qcajv52ji53n77rjhpysvrgq5m7"; + version = "0.10.1.2"; + sha256 = "1v0yhi3sw7qks8d13amps0qs5p90j3prjh5abm02wblcd0bm1xay"; buildDepends = [ hint libmpd mtl network parsec random regexPosix split X11 xmonad xmonadContrib ]; - patchPhase = '' - sed -i xmonad-extras.cabal -e 's|split .*|split|' - ''; configureFlags = "-f-with_hlist -fwith_split -fwith_parsec"; meta = { homepage = "http://projects.haskell.org/xmonad-extras"; -- GitLab From 1301e91a44148212a64d08fb5d947033dca1d4e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1195/5607] haskell-Stream: update to version 0.4.6.1 --- pkgs/development/libraries/haskell/Stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix index 83789765ec7..a95b3076137 100644 --- a/pkgs/development/libraries/haskell/Stream/default.nix +++ b/pkgs/development/libraries/haskell/Stream/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Stream"; - version = "0.4.6"; - sha256 = "0ppjcddm8dxxd260dsnzrdijifg4pa66lm401qj4fiddw0b50wzb"; + version = "0.4.6.1"; + sha256 = "19z052rd0varq5cbw0i0f0vkbpb40kqg6i93kz2brk6a101q5llp"; buildDepends = [ lazysmallcheck QuickCheck ]; meta = { description = "A library for manipulating infinite lists"; -- GitLab From 22bc23464f9a1ae347f0f5bc2cfc59ba136d8d54 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1196/5607] haskell-authenticate: update to version 1.3.1.2 --- 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 27edc1e9a9c..d701b5a31f5 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.1"; - sha256 = "120n7z22x4y4ngxqxsi65zn992f1lksaawcd7rmjvf8m0fysbb4n"; + version = "1.3.1.2"; + sha256 = "1hcil0hmv47jvjvkm9plaizpyrd8z5xazwb3spsa29q0pf3isaxi"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet -- GitLab From 7f6f2cb9770a584d6ee012fbed4a31991b2c6beb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1197/5607] haskell-distributed-process-simplelocalnet: update to version 0.2.0.7 --- .../haskell/distributed-process-simplelocalnet/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix index bec44a0b8e2..bb48c394414 100644 --- a/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process-simplelocalnet/default.nix @@ -5,8 +5,10 @@ cabal.mkDerivation (self: { pname = "distributed-process-simplelocalnet"; - version = "0.2.0.6"; - sha256 = "1mgsmxxy1fcbxh8p82078c70fj7iv6wr8g47r4d0c3jwz84xya57"; + version = "0.2.0.7"; + sha256 = "0jxbxacvdg4pf65s6r48nck45g8dfsarks3m2pdn73gjn4cd81c7"; + isLibrary = true; + isExecutable = true; buildDepends = [ binary dataAccessor distributedProcess network networkMulticast networkTransport networkTransportTcp transformers -- GitLab From 84aa9df309a0c20894218cd78ec83af26e1b13b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1198/5607] haskell-distributed-process: update to version 0.4.0.2 --- .../libraries/haskell/distributed-process/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 7b478d8cd99..b38ae0c46c8 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.4.0.1"; - sha256 = "0yi0403665l01gkqbsix9f4hj8c8m4i42nwjq2i63x259qz2njwi"; + version = "0.4.0.2"; + sha256 = "0wjxai5z6m84blrgic1pd0jgivqcc8ymjya3m0dhqbmsljwh6ynw"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From dfdbb69fdd849cbcdbf85b646e08815628ec1ec1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1199/5607] haskell-filestore: update to version 0.5.0.1 --- pkgs/development/libraries/haskell/filestore/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 752037698ca..887d06e2b07 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "filestore"; - version = "0.5"; - sha256 = "0cppm8iksz4dnh4kafyfy0cqbidw83rdpgc1mksiwh9c9gaxrlq7"; + version = "0.5.0.1"; + sha256 = "1wbiw3skbbcqi9p97xnhg5lnakq3vyan9v4f68wd3g4swk09xp7l"; isLibrary = true; isExecutable = true; buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; noHaddock = true; - jailbreak = true; meta = { description = "Interface for versioning file stores"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From bf84037a658241a5b700714858bd5cc5c2ad0849 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1200/5607] haskell-ghc-mod: update to version 1.11.1 --- .../libraries/haskell/ghc-mod/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index b4412c35421..112c32195c8 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,16 +1,16 @@ -{ cabal, Cabal, emacs, filepath, ghcPaths, ghcSybUtils, hlint -, ioChoice, regexPosix, syb, transformers +{ cabal, Cabal, convertible, emacs, filepath, ghcPaths, ghcSybUtils +, hlint, ioChoice, regexPosix, syb, time, transformers }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.11.0"; - sha256 = "19cx6jhciww2xgad3q35h3jlwiv9s9b6na2qi1cbga7p77swarsv"; + version = "1.11.1"; + sha256 = "1mhmcckpijg44h3njcdkssz72a3x0222gqc2fs477fymcmczv2q3"; isLibrary = false; isExecutable = true; buildDepends = [ - Cabal filepath ghcPaths ghcSybUtils hlint ioChoice regexPosix syb - transformers + Cabal convertible filepath ghcPaths ghcSybUtils hlint ioChoice + regexPosix syb time transformers ]; buildTools = [ emacs ]; postInstall = '' -- GitLab From 4262eec106de4de50884c017d4f4008253621ce9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:58 +0200 Subject: [PATCH 1201/5607] haskell-happstack-hamlet: update to version 7.0.2 --- .../libraries/haskell/happstack/happstack-hamlet.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index cf71dde30c3..fad611798e9 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -2,10 +2,9 @@ cabal.mkDerivation (self: { pname = "happstack-hamlet"; - version = "7.0.1"; - sha256 = "13ayypl2x402h6a7yq7fvgd2mn21gl5gcw2hk7f5vr2bdlvwv53n"; + version = "7.0.2"; + sha256 = "0hsmvv5rggyl7sa4sp30zyr43k6zj7dlpd0mb916wzcqrnyxa34a"; buildDepends = [ hamlet happstackServer text ]; - jailbreak = true; meta = { homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; -- GitLab From 03b44b679036df23f654267f51e7b04283980e1f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1202/5607] haskell-hledger-lib: update to version 0.19 --- pkgs/development/libraries/haskell/hledger-lib/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index af230b2e644..20b73fa5cad 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.18.2"; - sha256 = "0lcs58bdix4m7sslrdi38rqw5x5fb4ip0n5is0phxdrbp0nggd4z"; + version = "0.19"; + sha256 = "1kbjal838b3k0rmvdrndmyjngvyfwpmzh6y8kir4l2nf31jxwjbs"; buildDepends = [ cmdargs csv filepath HUnit mtl parsec regexpr safe shakespeareText split time transformers utf8String ]; - jailbreak = true; meta = { homepage = "http://hledger.org"; description = "Core data types, parsers and utilities for the hledger accounting tool"; -- GitLab From e6f9b990aea34a43b2e511d70d8f0d466f8cc608 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1203/5607] haskell-hledger: update to version 0.19 --- .../libraries/haskell/hledger/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 46ae378d738..063fef9ee53 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,19 +1,18 @@ -{ cabal, cabalFileTh, cmdargs, filepath, haskeline, hledgerLib -, HUnit, mtl, parsec, regexpr, safe, shakespeareText, split, text -, time, utf8String +{ cabal, cmdargs, filepath, haskeline, hledgerLib, HUnit, mtl +, parsec, regexpr, safe, shakespeareText, split, text, time +, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.18.2"; - sha256 = "1i0rix3h5vrq9j01fzgwyhs2n8nfzhidi4rjlvn402ps0w6j15ld"; + version = "0.19"; + sha256 = "0pl280vlwwsnl3grsbl5yv8kli1prkswa0p9j2s13g8m89srd1vf"; isLibrary = true; isExecutable = true; buildDepends = [ - cabalFileTh cmdargs filepath haskeline hledgerLib HUnit mtl parsec - regexpr safe shakespeareText split text time utf8String + cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe + shakespeareText split text time utf8String ]; - jailbreak = true; meta = { homepage = "http://hledger.org"; description = "The main command-line interface for the hledger accounting tool"; -- GitLab From cbca9f876607d46e04bf95c69e3aa7e3521e43bc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1204/5607] haskell-language-javascript: update to version 0.5.7 --- .../libraries/haskell/language-javascript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 1d649ba27a9..e05b93655e4 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "language-javascript"; - version = "0.5.6"; - sha256 = "1a1nki2z7x0rna5jg6g0gqnipvd115k4xgagg6prrvj284ml44wd"; + version = "0.5.7"; + sha256 = "0mndz0bqxkayzm7g92cvai9ahb9msr99syp9djhaya1d45595ad3"; buildDepends = [ blazeBuilder mtl utf8Light utf8String ]; buildTools = [ happy ]; meta = { -- GitLab From 800d44eb9a004894697f73f479cdb7d51c08115a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1205/5607] haskell-network-transport-tcp: update to version 0.3.1 --- .../libraries/haskell/network-transport-tcp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index f0f6957c036..fb313005bda 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.3.0"; - sha256 = "0x2rz0h890bfay52af2wcvja706dr4r6wgfs9csjf7y3jf53nc63"; + version = "0.3.1"; + sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf"; buildDepends = [ dataAccessor network networkTransport ]; meta = { homepage = "http://github.com/haskell-distributed/distributed-process"; -- GitLab From c278b67c2c40b96ad973cbd4bddd50c7e6615e68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1206/5607] haskell-pandoc: update to version 1.9.4.5 --- pkgs/development/libraries/haskell/pandoc/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index a3c1ce94d33..de6b29ff9cc 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.9.4.2"; - sha256 = "1zr2qx6bimyhzia5maqpb454hgdwjvgs234mcki4f1z3dgbq0lsk"; + version = "1.9.4.5"; + sha256 = "05k8i537756m07xlb6kgshpfxa4sp2jxidb1c8m72ilpai13r6fb"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { time utf8String xml zipArchive zlib ]; configureFlags = "-fblaze_html_0_5"; - jailbreak = true; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Conversion between markup formats"; -- GitLab From 9d5d111e6e9ba8fb38c31f6a0d852cbf7789af9c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1207/5607] haskell-sendfile: update to version 0.7.7 --- pkgs/development/libraries/haskell/sendfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index a4b410f4561..150ac8f9d53 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "sendfile"; - version = "0.7.6"; - sha256 = "0wqbnr07s3g7f6p4x27ips9nzjjz1ii5hw1q54i31g40jzv8rs7z"; + version = "0.7.7"; + sha256 = "0pwzgmgc87xms4r7pqymq56qgi601pk195kj62rll05qip6mrba0"; buildDepends = [ network ]; meta = { - homepage = "http://patch-tag.com/r/mae/sendfile"; + homepage = "http://hub.darcs.net/stepcut/sendfile"; description = "A portable sendfile library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From 6e4939ad7ca4f537615fed5abb5ecde89fcd6ec9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1208/5607] haskell-silently: update to version 1.2.4 --- pkgs/development/libraries/haskell/silently/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix index 1153a25cda5..658fe4fc693 100644 --- a/pkgs/development/libraries/haskell/silently/default.nix +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "silently"; - version = "1.2.3"; - sha256 = "1fvkj5qngdi2zxsrfk6dnaynm0wbxpmqr0jzvzayxifhzh04mqld"; + version = "1.2.4"; + sha256 = "0ac75b4n9566vpvv6jfcqafnyplv8dd7bgak89b16wy032z1xl5j"; buildDepends = [ deepseq ]; meta = { homepage = "https://github.com/trystan/silently"; -- GitLab From 466f1f185c8f6c213d5f771683e77bc42f371cb0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1209/5607] haskell-unlambda: update to version 0.1.2 --- pkgs/development/libraries/haskell/unlambda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index c0cfc72bd9e..5ee133d0978 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unlambda"; - version = "0.1"; - sha256 = "0xmn5w5vza6z2i3fs2hv2jgmb1lyk918viknsx3lk36i1dbyivgi"; + version = "0.1.2"; + sha256 = "12x7jc5nwbhkhnylg9l29nr5y8p322avhb9zc0w2apy3fvrq7y93"; isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; -- GitLab From d0a08b93ffec292a38e436d3423d18f3c80c9ba0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1210/5607] haskell-vty: update to version 4.7.0.18 --- pkgs/development/libraries/haskell/vty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 684fbd2eed0..0e32dc1c81b 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,14 +4,14 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.14"; - sha256 = "0wgn2jbr7lih9znkpa09nvb4qjd0801c0r4mwwrw4pd9n9mkjqn9"; + version = "4.7.0.18"; + sha256 = "1a414k8fcnjinr01ly49wyk025zacyznw7gclpa83qm0wn0q7bs3"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; meta = { homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal access library"; + description = "A simple terminal UI library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; -- GitLab From 0752f18e70977cc5d83648944d339828266da603 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1211/5607] haskell-yesod-auth: update to version 1.1.1.3 --- 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 765724e00d4..381615019db 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.2"; - sha256 = "1agyazzkgwmp63vwx84bzalf9lwg14k5jshj6n97g1iagsiaxqa0"; + version = "1.1.1.3"; + sha256 = "0fkrjc2wdv6ils0k7gd3chknw7flb8bbjay3cj355a7kvxnazgyp"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 -- GitLab From 5ff29b0e3de99d431bf5e251ee0ee7e12b96c8a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1212/5607] haskell-yst: update to version 0.3 --- pkgs/development/libraries/haskell/yst/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 6a94987ba91..ce26b67e375 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -1,16 +1,16 @@ -{ cabal, csv, filepath, HsSyck, HStringTemplate, pandoc, parsec -, split, time, utf8String, xhtml +{ cabal, csv, filepath, HDBC, HDBCSqlite3, HsSyck, HStringTemplate +, pandoc, parsec, split, time, utf8String, xhtml }: cabal.mkDerivation (self: { pname = "yst"; - version = "0.2.4.1"; - sha256 = "0y620p6kn1mky30fia63na5idppfjfmc828jcaa0ads08rmj5wgy"; + version = "0.3"; + sha256 = "1f09qcf2kqgq9w7irvzlwhv5sy0q3ml82ksza72hj0f5rfbyvfla"; isLibrary = false; isExecutable = true; buildDepends = [ - csv filepath HsSyck HStringTemplate pandoc parsec split time - utf8String xhtml + csv filepath HDBC HDBCSqlite3 HsSyck HStringTemplate pandoc parsec + split time utf8String xhtml ]; meta = { homepage = "http://github.com/jgm/yst"; -- GitLab From 40c142201d5635f5f07508e47586bae124665cb9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:29:59 +0200 Subject: [PATCH 1213/5607] haskell-hlint: update to version 1.8.32 --- 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 bb61bbaa7dc..c22b861c39f 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.31"; - sha256 = "0d7m7viqf1cawbafiy4nj67hkavlxkv537qypy2vlhr502fispa4"; + version = "1.8.32"; + sha256 = "1iiyfkn5y095j4wgfbgck3p4z28zmsj19r08h9darbgb91l4a4rz"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 8d469a5bbc3abd0fc10a11ec03d70d609a2ff504 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:35:51 +0200 Subject: [PATCH 1214/5607] openssl: update to version 1.0.1c --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index ef6037b7a28..0f1d6167279 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl }: let - name = "openssl-1.0.0j"; + name = "openssl-1.0.1c"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -40,7 +40,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "31e6e8bbf1de2f59fbd53382c34214887ccc1318"; + sha256 = "1gjy6a7d8nszi9wq8jdzx3cffn0nss23h3cw2ywlw4cb9v6v77ia"; }; patches = patchesCross false; -- GitLab From 02cd9a906e8b4b140a110b8b3b25f9e77ba5a9b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:36:02 +0200 Subject: [PATCH 1215/5607] openssl: strip trailing whitespace --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0f1d6167279..3b2f224e6a9 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -29,7 +29,7 @@ let ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; - + in stdenv.mkDerivation { -- GitLab From b3aafc8494b625d9370695f4b5d90bd118fa29b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:36:26 +0200 Subject: [PATCH 1216/5607] bison-2.6: update to version 2.6.4 --- 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 ea43d30410e..da5873595cf 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.2"; + name = "bison-2.6.4"; src = fetchurl { url = "mirror://gnu/bison/${name}.tar.xz"; - sha256 = "79503f80397c30ac81b62eca5ffeaccaed72fdfeddb76257efcf8c3ca24be03d"; + sha256 = "e0c3179ed1a622d7ab9679d64b556a7722f9eb7fa32d568ce8f329f89cca52e9"; }; buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; -- GitLab From 2e2a17a92a8cf42114733ac1030aaba2d18f2a28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:46:09 +0200 Subject: [PATCH 1217/5607] bison: drop obsolete version 1.875 --- .../development/tools/parsing/bison/bison-1.875.nix | 13 ------------- .../parsing/bison/{bison-2.6.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 6 +----- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/tools/parsing/bison/bison-1.875.nix rename pkgs/development/tools/parsing/bison/{bison-2.6.nix => default.nix} (100%) diff --git a/pkgs/development/tools/parsing/bison/bison-1.875.nix b/pkgs/development/tools/parsing/bison/bison-1.875.nix deleted file mode 100644 index 3ee12a252ce..00000000000 --- a/pkgs/development/tools/parsing/bison/bison-1.875.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, m4}: - -assert m4 != null; - -stdenv.mkDerivation { - name = "bison-1.875"; - src = fetchurl { - url = mirror://gnu/bison/bison-1.875.tar.bz2; - md5 = "b7f8027b249ebd4dd0cc948943a71af0"; - }; - buildInputs = [m4]; - passthru = { glrSupport = true; }; -} diff --git a/pkgs/development/tools/parsing/bison/bison-2.6.nix b/pkgs/development/tools/parsing/bison/default.nix similarity index 100% rename from pkgs/development/tools/parsing/bison/bison-2.6.nix rename to pkgs/development/tools/parsing/bison/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6037799ac0..e26da54f6a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2937,11 +2937,7 @@ let cross = assert crossSystem != null; crossSystem; }); - bison = bison26; - - bison1875 = callPackage ../development/tools/parsing/bison/bison-1.875.nix { }; - - bison26 = callPackage ../development/tools/parsing/bison/bison-2.6.nix { }; + bison = callPackage ../development/tools/parsing/bison { }; buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted; -- GitLab From 6d73db319d1fd90a50005bb23b109ed29d16895d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:47:31 +0200 Subject: [PATCH 1218/5607] jujuutils: fix reference to non-existent version of 'linuxHeaders' Plus minor cosmetic changes to the expression. --- pkgs/os-specific/linux/jujuutils/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index c52aae291eb..7c688943ea8 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -1,18 +1,18 @@ -{stdenv, fetchurl, linuxHeaders}: +{ stdenv, fetchurl, linuxHeaders }: stdenv.mkDerivation { name = "jujuutils-0.2"; src = fetchurl { - url = http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz; + url = "http://jujuutils.googlecode.com/files/jujuutils-0.2.tar.gz"; sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; }; buildInputs = [ linuxHeaders ]; meta = { + homepage = "http://code.google.com/p/jujuutils/"; description = "Utilities around FireWire devices connected to a Linux computer"; license = "GPLv2"; - homepage = http://code.google.com/p/jujuutils/; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e26da54f6a8..e985698b30c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5611,9 +5611,7 @@ let iwlwifi6000g2bucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { }; - jujuutils = callPackage ../os-specific/linux/jujuutils { - linuxHeaders = linuxHeaders33; - }; + jujuutils = callPackage ../os-specific/linux/jujuutils { }; kbd = callPackage ../os-specific/linux/kbd { }; -- GitLab From a470e05121bf27e32049c1a54325edf2a37ea06f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 18:49:57 +0200 Subject: [PATCH 1219/5607] all-packages.nix (linuxPackagesFor): fix 'kernelHeaders' attribute The kernelHeaders attribute generated by the linuxPackagesFor function used to refer to ../os-specific/linux/kernel-headersdefault.nix, but that file no longer exists. Instead, we re-use the linuxHeaders attribute. --- 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 e985698b30c..94e6f806db9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5830,7 +5830,7 @@ let broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { }; - kernelHeaders = callPackage ../os-specific/linux/kernel-headers { }; + kernelHeaders = linuxHeaders; nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; -- GitLab From 4be6b18fdf2f664427b7f442b5a21bf48ec8034e Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Tue, 23 Oct 2012 19:40:46 +0200 Subject: [PATCH 1220/5607] Fix waf env python to ${python}/bin/python --- pkgs/desktops/xfce-4.8/applications/gigolo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/xfce-4.8/applications/gigolo.nix b/pkgs/desktops/xfce-4.8/applications/gigolo.nix index 1353546bcc1..5215697bbca 100644 --- a/pkgs/desktops/xfce-4.8/applications/gigolo.nix +++ b/pkgs/desktops/xfce-4.8/applications/gigolo.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ python gettext intltool gtk pkgconfig gvfs]; + preConfigure = '' + sed -i "waf" -e "1 s^.*/env[ ]*python^#!${python}/bin/python^"; + ''; + meta = { homepage = http://goodies.xfce.org/projects/applications/gigolo; description = "Gigolo is a frontend to easily manage connections to remote filesystems"; -- GitLab From f2b9fcdc665d15a518c582e8054a006d37ca886e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Oct 2012 19:48:32 +0200 Subject: [PATCH 1221/5607] asciidoc: update to version 8.6.8 --- pkgs/tools/typesetting/asciidoc/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index a4b9d375bce..f392ad065cc 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, python }: stdenv.mkDerivation rec { - name = "asciidoc-8.6.6"; + name = "asciidoc-8.6.8"; src = fetchurl { url = "mirror://sourceforge/asciidoc/${name}.tar.gz"; - sha256 = "9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71"; + sha256 = "ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4"; }; patchPhase = '' @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; meta = { + homepage = "http://www.methods.co.nz/asciidoc/"; + description = "ASCII text-based document generation system"; + license = "GPLv2+"; + longDescription = '' AsciiDoc is a text-based document generation system. AsciiDoc input files can be translated to HTML and DocBook markups. ''; - homepage = http://www.methods.co.nz/asciidoc/; - license = "GPLv2+"; }; } -- GitLab From bce624c25c2d9fe7a9529b85531cc49708a11e51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 12:13:04 +0200 Subject: [PATCH 1222/5607] hledger no longer depends on haskeline 0.6.x. --- pkgs/top-level/haskell-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 845406394d1..0cfafa650a3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -954,9 +954,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hjsmin = callPackage ../development/libraries/haskell/hjsmin {}; - hledger = callPackage ../development/libraries/haskell/hledger { - haskeline = self.haskeline_0_6_4_7; - }; + hledger = callPackage ../development/libraries/haskell/hledger {}; hledgerLib = callPackage ../development/libraries/haskell/hledger-lib {}; hledgerInterest = callPackage ../applications/office/hledger-interest {}; hledgerWeb = callPackage ../development/libraries/haskell/hledger-web {}; -- GitLab From 2c8fe797ef53aa9e01ccb56a01c20f5892475e3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 12:14:26 +0200 Subject: [PATCH 1223/5607] Agda no longer depends on haskeline 0.6.x. --- 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 0cfafa650a3..863413d5eb9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -429,7 +429,6 @@ 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 {}; -- GitLab From 86eddda7122a32c439319d79ce9121c3d92220aa Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Wed, 24 Oct 2012 13:25:18 +0200 Subject: [PATCH 1224/5607] Add haskell-ListZipper-1.2.0.2 --- .../libraries/haskell/ListZipper/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ListZipper/default.nix diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix new file mode 100644 index 00000000000..d7307bde5d7 --- /dev/null +++ b/pkgs/development/libraries/haskell/ListZipper/default.nix @@ -0,0 +1,13 @@ +{ cabal, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "ListZipper"; + version = "1.2.0.2"; + sha256 = "0z3izxpl21fxz43jpx7zqs965anb3gp5vidv3pwwznr88ss2j6a9"; + buildDepends = [ QuickCheck ]; + meta = { + description = "Simple zipper for 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 4acc9ab0186..8c31420a272 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1097,6 +1097,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); ListLike = callPackage ../development/libraries/haskell/ListLike {}; + ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; + lrucache = callPackage ../development/libraries/haskell/lrucache {}; ltk = callPackage ../development/libraries/haskell/ltk {}; -- GitLab From b96362486756188b8e1a6c41b2af55e427b080d9 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Wed, 24 Oct 2012 16:33:38 +0200 Subject: [PATCH 1225/5607] update git to 1.8.0 --- .../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 dcfaaa74fae..b3229909212 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.12.4"; + version = "1.8.0"; 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 = "1nk3igf7mgcj9yvpyrnp3i9725fljxi96icmzalfzd8nkj94br8p"; + sha1 = "a03afc33f8f0723ad12649d79f1e8968526b4bf7"; }; patches = [ ./docbook2texi.patch ]; -- GitLab From d48aea2118b0604364ab38a5d28c7a255fc7f670 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 16:43:12 +0200 Subject: [PATCH 1226/5607] Fix haskellPackackages_ghc742_pedantic package set, which was broken by an earlier commit. --- .../libraries/haskell/HTTP/4000.2.5.nix | 15 +++++++++++++++ .../libraries/haskell/async/2.0.1.3.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 6 ++++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/HTTP/4000.2.5.nix create mode 100644 pkgs/development/libraries/haskell/async/2.0.1.3.nix diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix new file mode 100644 index 00000000000..f345e7c98e1 --- /dev/null +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -0,0 +1,15 @@ +{ cabal, mtl, network, parsec }: + +cabal.mkDerivation (self: { + pname = "HTTP"; + version = "4000.2.5"; + sha256 = "03ij1zkykc438x2r1szz6ddvfhrjywlx61nrz377srcpbdmhxpb7"; + 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/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix new file mode 100644 index 00000000000..a0da6384e95 --- /dev/null +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -0,0 +1,15 @@ +{ cabal, stm }: + +cabal.mkDerivation (self: { + pname = "async"; + version = "2.0.1.3"; + sha256 = "1rbjr6xw5sp8npw17fxg0942kikssv2hyci2sy26r0na98483mkh"; + buildDepends = [ stm ]; + meta = { + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + 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 863413d5eb9..583e927d646 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -155,13 +155,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_2012_4_0_0 = self : { inherit (self) cabal ghc; - async = self.async_2_0_1_4; + async = self.async_2_0_1_3; cgi = self.cgi_3001_1_7_4; fgl = self.fgl_5_4_2_4; GLUT = self.GLUT_2_1_2_1; haskellSrc = self.haskellSrc_1_0_1_5; html = self.html_1_0_1_2; - HTTP = self.HTTP_4000_2_6; + HTTP = self.HTTP_4000_2_5; HUnit = self.HUnit_1_2_5_1; mtl = self.mtl_2_1_2; network = self.network_2_3_1_0; @@ -461,6 +461,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); AspectAG = callPackage ../development/libraries/haskell/AspectAG {}; + async_2_0_1_3 = callPackage ../development/libraries/haskell/async/2.0.1.3.nix {}; async_2_0_1_4 = callPackage ../development/libraries/haskell/async/2.0.1.4.nix {}; async = self.async_2_0_1_4; @@ -914,6 +915,7 @@ 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_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_6 = callPackage ../development/libraries/haskell/HTTP/4000.2.6.nix {}; HTTP = self.HTTP_4000_2_6; -- GitLab From 4f5e655b36b61505fc1d1c4157e4f721a5e80a8a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 17:26:55 +0200 Subject: [PATCH 1227/5607] grub-2.0x: avoid pragma warnings triggered by bison-2.6.4-generated parsers --- pkgs/tools/misc/grub/2.0x.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index e85e8de3dd8..d0e7738b68e 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -49,10 +49,17 @@ stdenv.mkDerivation rec { sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h ''; + # Source code generated by bison 2.6.4 contains pragmas that trigger + # warnings when built with -Wunknown-pragmas. Since Grub compiles with + # -Werror, this causes the build to fail. We work around this issue by + # ignoring pragma-related warnings, but clearly it would be better if + # Bison wouldn't trigger that issue in the first place. A bug report + # has been sent. prePatch = '' gunzip < "${unifont_bdf}" > "unifont.bdf" sed -i "configure" \ - -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" + -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" \ + -e "s|-Wunknown-pragmas|-Wno-pragmas|g" ''; configureFlags = -- GitLab From ee1ce2bff2a4f0825399c9fe076d7f93620ad890 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1228/5607] haskell-HStringTemplate: update to version 0.6.12 --- .../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 e966fb1283e..c2c4f70b47e 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.10"; - sha256 = "0asv8n4l2j819cngxgdk5p0b4bqcxnmdc2mlp9b3s7mrs15ljxkk"; + version = "0.6.12"; + sha256 = "02jx02qbs4jxpf1s8nzc9lbaz0flkfcy6xj475v77i45xc1hc71p"; buildDepends = [ blazeBuilder deepseq filepath mtl parsec syb sybWithClass text time utf8String -- GitLab From 6b1e437b13a4b4a19012d5da077914fe1204a8ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1229/5607] haskell-authenticate: update to version 1.3.2 --- 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 d701b5a31f5..b336a632b9d 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.2"; - sha256 = "1hcil0hmv47jvjvkm9plaizpyrd8z5xazwb3spsa29q0pf3isaxi"; + version = "1.3.2"; + sha256 = "1bvgfri0c2nyz06r59rm3slpvm1b0s242s4mznmndpdclgg33d9m"; buildDepends = [ aeson attoparsec blazeBuilder blazeBuilderConduit caseInsensitive conduit httpConduit httpTypes monadControl network resourcet -- GitLab From 42d80326d43bf66d2fd8df404bbee2025953dbad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1230/5607] haskell-certificate: update to version 1.3.0 --- .../libraries/haskell/certificate/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 18114de5ec2..52449880a6a 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,12 +1,16 @@ -{ cabal, asn1Data, cryptoPubkeyTypes, mtl, pem, time }: +{ cabal, asn1Data, cryptohash, cryptoPubkeyTypes, filepath, mtl +, pem, time +}: cabal.mkDerivation (self: { pname = "certificate"; - version = "1.2.8"; - sha256 = "0lcyvkr0iqywwid9zlpzfvzpg70gvw7y0ij51ljadrwp882nj0ws"; + version = "1.3.0"; + sha256 = "1vhqbwbk0xpq74f01lkqifq7pgxdbfgq193gy57b9rwsnxvzqip1"; isLibrary = true; isExecutable = true; - buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; + buildDepends = [ + asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time + ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; -- GitLab From 4ba13cae2b4e20decddd617f09f9fcbc48adc628 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1231/5607] haskell-http-conduit: update to version 1.8.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 9a1d45c40f1..c5daa149f52 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.1.2"; - sha256 = "02dh7gh9pk5dj6dl28hn3vqvf9280b57bqas4w7zsgnhjivxy20x"; + version = "1.8.1"; + sha256 = "0569lz00vpkd60ch72xq1y5ymm7ni1dbawka8xyqcra9d4x06ad5"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie -- GitLab From 741467beb399068b13eb07109625a4ffadd75df7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1232/5607] haskell-tls-extra: update to version 0.5.0 --- .../libraries/haskell/tls-extra/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 362dab2125f..6a7b24f1fe2 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,19 +1,19 @@ -{ cabal, certificate, cryptoApi, cryptocipher, cryptohash, mtl -, network, pem, text, time, tls, vector +{ cabal, certificate, cipherAes, cryptoApi, cryptocipher +, cryptohash, mtl, network, pem, text, time, tls, vector }: cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.7"; - sha256 = "1ykmwkzq2vwjvcvg8c9b020baqxp3w7w0x7ka7jrk88aqmil9hiq"; + version = "0.5.0"; + sha256 = "1r645qljn3ql7jcphsqf4cm259cl8fsva64q4p2x37mafi01bkr8"; isLibrary = true; isExecutable = true; buildDepends = [ - certificate cryptoApi cryptocipher cryptohash mtl network pem text - time tls vector + certificate cipherAes cryptoApi cryptocipher cryptohash mtl network + pem text time tls vector ]; meta = { - homepage = "http://github.com/vincenthz/hs-tls-extra"; + homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS extra default values and helpers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; -- GitLab From e3be6f55e5173772241588d9bd30fdbd028e35d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1233/5607] haskell-tls: update to version 1.0.0 --- pkgs/development/libraries/haskell/tls/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 5f5452044df..fc2fb731c61 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,15 +1,15 @@ { cabal, cereal, certificate, cryptoApi, cryptocipher, cryptohash -, mtl +, mtl, network }: cabal.mkDerivation (self: { pname = "tls"; - version = "0.9.11"; - sha256 = "1a0kfwhmlwl581yr63g2plw9680ry0030rqm3bxhvnjbb2xac3k9"; + version = "1.0.0"; + sha256 = "1d82s5h75dh1bqi592q8gm37wnmpl6n2zajz03n51qysa6w90cvm"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal certificate cryptoApi cryptocipher cryptohash mtl + cereal certificate cryptoApi cryptocipher cryptohash mtl network ]; meta = { homepage = "http://github.com/vincenthz/hs-tls"; -- GitLab From 3349b40b3f9181b8d021f453c3513b075b3eeaff Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1234/5607] haskell-yesod-auth: update to version 1.1.1.4 --- 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 381615019db..56143269e42 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.3"; - sha256 = "0fkrjc2wdv6ils0k7gd3chknw7flb8bbjay3cj355a7kvxnazgyp"; + version = "1.1.1.4"; + sha256 = "162f92s78ppqr7f2bcdcr9wvl0n77nr8lma7z1816dn1j5mwm0kr"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 -- GitLab From 67952094e4660f22bec9543a1efd13ee525f97a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1235/5607] haskell-yst: update to version 0.3.0.1 --- pkgs/development/libraries/haskell/yst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index ce26b67e375..5cb5fb6a209 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yst"; - version = "0.3"; - sha256 = "1f09qcf2kqgq9w7irvzlwhv5sy0q3ml82ksza72hj0f5rfbyvfla"; + version = "0.3.0.1"; + sha256 = "17jp9vdbpp82wzsj8rhp5nh6fbmgm2xrclfnb7jl4gjwls7xggrv"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From f54cc84aeca0bae5d75cfd8130e6b3fcf986ddd2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:06:11 +0200 Subject: [PATCH 1236/5607] haskell-hlint: update to version 1.8.33 --- 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 c22b861c39f..7bee8229be9 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.32"; - sha256 = "1iiyfkn5y095j4wgfbgck3p4z28zmsj19r08h9darbgb91l4a4rz"; + version = "1.8.33"; + sha256 = "1n1kcd99226f8cwx3zmjv0fh1xk2k0y490l6p2fa9m0av835brr7"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From e810a42b84134808ef7135b696830a7d7d444043 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:17:27 +0200 Subject: [PATCH 1237/5607] zeromq: add version 3.x --- .../libraries/zeromq/{default.nix => 2.x.nix} | 0 pkgs/development/libraries/zeromq/3.x.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) rename pkgs/development/libraries/zeromq/{default.nix => 2.x.nix} (100%) create mode 100644 pkgs/development/libraries/zeromq/3.x.nix diff --git a/pkgs/development/libraries/zeromq/default.nix b/pkgs/development/libraries/zeromq/2.x.nix similarity index 100% rename from pkgs/development/libraries/zeromq/default.nix rename to pkgs/development/libraries/zeromq/2.x.nix diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix new file mode 100644 index 00000000000..fbb3b5ad74f --- /dev/null +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, libuuid}: + +stdenv.mkDerivation rec { + name = "zeromq-3.2.1-rc2"; + + src = fetchurl { + url = "http://download.zeromq.org/${name}.tar.gz"; + sha256 = "b0a70da77e39537120a1fa058c49434982741ecef5211edcd7aeab4caffb82b7"; + }; + + buildInputs = [ libuuid ]; + + meta = { + homepage = "http://www.zeromq.org"; + description = "The Intelligent Transport Layer"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21b090783d3..23bdb735938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5088,7 +5088,8 @@ let static = true; })); - zeromq = callPackage ../development/libraries/zeromq {}; + zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; + zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; ### DEVELOPMENT / LIBRARIES / JAVA -- GitLab From 7b0d9ecdd5cb61c6f06373b3a509e94bb73ba158 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:17:42 +0200 Subject: [PATCH 1238/5607] haskell-zeromq3-haskell: add version 0.1.4 --- .../libraries/haskell/zeromq3-haskell/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/zeromq3-haskell/default.nix diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix new file mode 100644 index 00000000000..44b04397c3f --- /dev/null +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -0,0 +1,14 @@ +{ cabal, zeromq }: + +cabal.mkDerivation (self: { + pname = "zeromq3-haskell"; + version = "0.1.4"; + sha256 = "026b18ligbrfbg4x7vivk6r2gj9rj3vy6pm3h0s81571h6lk3dhx"; + extraLibraries = [ zeromq ]; + meta = { + homepage = "http://github.com/twittner/zeromq-haskell/"; + description = "Bindings to ZeroMQ 3.x"; + 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 d81918836a6..b6c9c8c2671 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1761,7 +1761,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); yst = callPackage ../development/libraries/haskell/yst {}; - zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell {}; + zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell { zeromq = pkgs.zeromq2; }; + + zeromq3Haskell = callPackage ../development/libraries/haskell/zeromq3-haskell { zeromq = pkgs.zeromq3; }; zipArchive = callPackage ../development/libraries/haskell/zip-archive {}; -- GitLab From b170bb0bf06b824920a1c3311de31f0563a8d480 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 18:28:36 +0200 Subject: [PATCH 1239/5607] gprolog: update to version 1.4.1 --- pkgs/development/compilers/gprolog/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index f7a64da7309..3e667f79003 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gprolog-1.4.0"; + name = "gprolog-1.4.1"; src = fetchurl { urls = [ "mirror://gnu/gprolog/${name}.tar.gz" "http://www.gprolog.org/${name}.tar.gz" ]; - sha256 = "1l66k66ryfw1nfi2wlvsyq4cmr6mm95f4iay1fxdk3hdk3fjyjl0"; + sha256 = "e2819ed9c426138d3191e4d97ae5121cf97e132eecf102400f87f1e372a05b72"; }; configurePhase = "cd src ;" @@ -17,16 +17,18 @@ stdenv.mkDerivation rec { + "--with-examples-dir=$out/share/doc/${name}/examples " + "--with-doc-dir=$out/share/doc/${name}"; - doCheck = true; - postInstall = '' ln -vs "$out/share/${name}/include" "$out/include" + ln -vs "$out/share/${name}/lib" "$out/lib" ''; - meta = { - homepage = http://www.gnu.org/software/gprolog/; + doCheck = true; + enableParallelBuilding = true; + meta = { + homepage = "http://www.gnu.org/software/gprolog/"; description = "GNU Prolog, a free Prolog compiler with constraint solving over finite domains"; + license = "GPLv2+"; longDescription = '' GNU Prolog is a free Prolog compiler with constraint solving @@ -52,8 +54,6 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - license = "GPLv2+"; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.gnu; }; -- GitLab From 59d7e941454c8265ba67bbc671acbd8df441b94c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 24 Oct 2012 20:30:04 +0200 Subject: [PATCH 1240/5607] gprolog: disable parallel building to (hopefully) fix the weird error that occurred on Hydra --- pkgs/development/compilers/gprolog/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 3e667f79003..bbc273365b9 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ''; doCheck = true; - enableParallelBuilding = true; meta = { homepage = "http://www.gnu.org/software/gprolog/"; -- GitLab From b2d0900e6e6dc770bb2fdb02fe7cb1e01a5b2cab Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 24 Oct 2012 23:09:29 +0400 Subject: [PATCH 1241/5607] Update SBCL to 1.1.0 --- 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 d56520d2902..fc23f901e5a 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.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"; + version="1.1.0"; + name="sbcl-1.1.0"; + hash="128zb7i6w2a93yjvh8mc6f36w47psnda671y81a9yl6mr5696k00"; + url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-source.tar.bz2"; + advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-source.tar.bz2"; } -- GitLab From ccfb0562558b87dc39a695da54e5fbc33b552ad8 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Wed, 24 Oct 2012 18:15:48 -0700 Subject: [PATCH 1242/5607] shoutcast support for mpd --- pkgs/servers/mpd/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 0c3257d61c3..a5cc810ada8 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -2,16 +2,18 @@ , flacSupport ? true, flac, vorbisSupport ? true, libvorbis , madSupport ? true, libmad, id3tagSupport ? true, libid3tag , mikmodSupport ? true, libmikmod, cueSupport ? true, libcue +, shoutSupport ? true, libshout }: let opt = stdenv.lib.optional; in stdenv.mkDerivation rec { - name = "mpd-0.16.3"; + name = "mpd-0.16.8"; src = fetchurl { url = "mirror://sourceforge/musicpd/${name}.tar.bz2"; - sha256 = "1liihxj58f944gapdqg15firl6phbxh3y3vjxq9m8dlvm37pkpsq"; + sha256 = "35183ae4a706391f5d739e4378b74f516952adda09a260fecfd531a58b0fff17"; }; + buildInputs = [ pkgconfig glib ] ++ opt alsaSupport alsaLib ++ opt flacSupport flac @@ -19,7 +21,9 @@ stdenv.mkDerivation rec { ++ opt madSupport libmad ++ opt id3tagSupport libid3tag ++ opt mikmodSupport libmikmod - ++ opt cueSupport libcue; + ++ opt cueSupport libcue + ++ opt shoutSupport libshout; + configureFlags = '' ${if alsaSupport then "--enable-alsa" else "--disable-alsa"} ${if flacSupport then "--enable-flac" else "--disable-flac"} @@ -28,7 +32,13 @@ stdenv.mkDerivation rec { ${if mikmodSupport then "--enable-mikmod" else "--disable-mikmod"} ${if id3tagSupport then "--enable-id3" else "--disable-id3"} ${if cueSupport then "--enable-cue" else "--disable-cue"} + ${if shoutSupport then "--enable-shout" else "--disable-shout"} ''; + + NIX_LDFLAGS = '' + ${if shoutSupport then "-lshout" else ""} + ''; + meta = { description = "A flexible, powerful daemon for playing music"; longDescription = '' -- GitLab From ca5077f03f1bae64db08cbe593e57df0f627421c Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 25 Oct 2012 06:07:39 +0200 Subject: [PATCH 1243/5607] 2.6-2 moved to 2.6-3, so patches were not found Maybe some new important patches can be found here? http://patch-tracker.debian.org/package/plotutils/2.6-3 upstream source didn't change --- pkgs/tools/graphics/plotutils/debian-patches.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix index d72974445e6..0615d1f52e1 100644 --- a/pkgs/tools/graphics/plotutils/debian-patches.nix +++ b/pkgs/tools/graphics/plotutils/debian-patches.nix @@ -1,6 +1,6 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-2"; + prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-3"; in [ { -- GitLab From 8dfa0a361f0a11d91283c9cd36498f7219fcc6e6 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 25 Oct 2012 06:52:43 +0200 Subject: [PATCH 1244/5607] source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash --- pkgs/development/libraries/gupnp-igd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index bd930e5ecf6..a8bb065d7eb 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gupnp-igd-0.2.1"; src = fetchurl { - url = "http://www.gupnp.org/sites/all/files/sources/${name}.tar.gz"; + url = https://launchpad.net/ubuntu/+archive/primary/+files/gupnp-igd_0.2.1.orig.tar.gz; sha256 = "18ia8l24hbylz3dnbg2jf848bmbx0hjkq4fkwzzfn57z021f0fh2"; }; -- GitLab From d900694b3ddab0b49b17c05189fc5690353daf12 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 25 Oct 2012 09:59:18 +0200 Subject: [PATCH 1245/5607] Update to Haskell Platform 2012.4.0.0 RC2. --- .../haskell-platform-2012.4.0.0.cabal | 69 ++++++++++++------- pkgs/top-level/haskell-packages.nix | 6 +- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal index 6346b6ab297..23af64e4489 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal @@ -25,35 +25,48 @@ cabal-version: >= 1.8 build-type: Custom tested-with: GHC ==7.4.2 +flag include-ghc-depends + description: Include all the GHC provided packages in the dependencies + default: False + library - build-depends: - -- ghc ==7.4.2, + if flag(include-ghc-depends) + build-depends: + ghc ==7.4.2, - -- Core libraries: provided by every ghc installation - -- We don't include "non-API" packages here. - -- array ==0.4.0.0, - -- base ==4.5.1.0, - -- bytestring ==0.9.2.1, - -- Cabal ==1.14.0, - -- containers ==0.4.2.1, - -- deepseq ==1.3.0.0, - -- directory ==1.1.0.2, - -- extensible-exceptions ==0.1.1.4, - -- filepath ==1.3.0.0, - -- haskell2010 ==1.1.0.1, - -- haskell98 ==2.0.0.1, - -- hpc ==0.5.1.1, - -- old-locale ==1.0.0.4, - -- old-time ==1.1.0.0, - -- pretty ==1.1.1.0, - -- process ==1.1.0.1, - -- template-haskell ==2.7.0.0, - -- time ==1.4, - -- unix ==2.5.1.1, - -- Win32 ==2.2.2.0, + -- Core libraries: provided by every ghc installation + -- We don't include "non-API" packages here. + -- begin core packages + array ==0.4.0.0, + base ==4.5.1.0, + bytestring ==0.9.2.1, + Cabal ==1.14.0, + containers ==0.4.2.1, + deepseq ==1.3.0.0, + directory ==1.1.0.2, + extensible-exceptions ==0.1.1.4, + filepath ==1.3.0.0, + haskell2010 ==1.1.0.1, + haskell98 ==2.0.0.1, + hpc ==0.5.1.1, + old-locale ==1.0.0.4, + old-time ==1.1.0.0, + pretty ==1.1.1.0, + process ==1.1.0.1, + template-haskell ==2.7.0.0, + time ==1.4 + if !os(windows) + build-depends: + unix ==2.5.1.1 + -- end core packages + else + build-depends: + Win32 ==2.2.2.0 + build-depends: -- Libraries in addition to what GHC provides: -- Note: newer versions of cgi need monad-catchio. + -- begin platform packages async ==2.0.1.3, cgi ==3001.1.7.4, fgl ==5.4.2.4, @@ -77,13 +90,13 @@ library syb ==0.3.7, text ==0.11.2.3, transformers ==0.3.0.0, - vector ==0.10, + vector ==0.10.0.1, xhtml ==3000.2.1, zlib ==0.5.4.0, -- Libraries that are needed to support the above, -- though are not officially part of the platform - primitive ==0.5 + primitive ==0.5.0.1 -- Depending on programs does not work, they are not registered -- We list them to help distro packaging. @@ -91,6 +104,10 @@ library cabal-install ==0.14.0, alex ==3.0.2, happy ==1.18.10 + -- end platform packages -- hscolour ==1.19 -- ??? -- haddock ==2.11.0 -- need to use the one shipped with ghc +-- N.B.: The begin/end comment annocations are used to build the source +-- installer: Packages that are part of the core are checked at build time. +-- Source of packages that are part of the platform are included in the tarball. diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b6c9c8c2671..3d1e7984ae7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); 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 - vector = self.vector_0_10; # 7.6 ok + vector = self.vector_0_10_0_1; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_0; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok @@ -178,14 +178,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); syb = self.syb_0_3_7; text = self.text_0_11_2_3; transformers = self.transformers_0_3_0_0; - vector = self.vector_0_10; + vector = self.vector_0_10_0_1; xhtml = self.xhtml_3000_2_1; zlib = self.zlib_0_5_4_0; cabalInstall = self.cabalInstall_0_14_0; alex = self.alex_3_0_2; haddock = self.haddock_2_11_0; happy = self.happy_1_18_10; - primitive = self.primitive_0_5; # semi-official, but specified + primitive = self.primitive_0_5_0_1; # semi-official, but specified }; haskellPlatform_2012_4_0_0 = -- GitLab From 9c0459972f8c4770cd35b00402d4d3a1ccfe4217 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 25 Oct 2012 10:00:44 +0200 Subject: [PATCH 1246/5607] Revert "gnum4: Disable tests for ARM." This reverts commit b63305721d39107c04ef9fa1e74f3eb8f32beb79. gnum4 builds fine on Sheevaplug for me now. I consider my previous failure a glitch, since I'm not sure how my stdenv looked at that time. Sorry for the noise. --- pkgs/development/tools/misc/gnum4/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index e603c398b02..1f026f12f52 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -10,8 +10,7 @@ stdenv.mkDerivation { doCheck = !stdenv.isDarwin && !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin - && !stdenv.isSunOS # XXX: `test-setlocale2.sh' fails - && !stdenv.isArm; # XXX: `diversions' fails on SheevaPlug + && !stdenv.isSunOS; # XXX: `test-setlocale2.sh' fails # Upstream is aware of it; it may be in the next release. patches = [ ./s_isdir.patch ./readlink-EINVAL.patch ]; -- GitLab From 56957e27cc16b75942bc3fba6f6189f7a091cdf3 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 25 Oct 2012 10:55:22 +0200 Subject: [PATCH 1247/5607] update boto to 2.6.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ef6887d2be..ed352306c20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -246,11 +246,11 @@ let pythonPackages = python.modules // rec { boto = buildPythonPackage rec { - name = "boto-2.3.0"; + name = "boto-2.6.0"; src = fetchurl { url = "https://github.com/downloads/boto/boto/${name}.tar.gz"; - sha256 = "05im9vyk9wq8cjw4cp93jlqb9v98rnrm067p93ih7f0ynnlnjaf1"; + sha256 = "1wnzs9frf44mrnw7l2vijc5anbcvcqqrv7237gjn27v0ja76slff"; }; # The tests seem to require AWS credentials. -- GitLab From 989a9f86361e3cd5907634f078f0e65cd110117d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 25 Oct 2012 10:33:23 -0400 Subject: [PATCH 1248/5607] perlPackages.NetSMTPTLS --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0e1f11d0b8a..0604ae46e4f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2898,6 +2898,15 @@ rec { propagatedBuildInputs = [IOSocketSSL]; }; + NetSMTPTLS = buildPerlPackage { + name = "Net-SMTP-TLS-0.12"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz; + sha256 = "19g48kabj22v66jbf69q78xplhi7r1y2kdbddfwh4xy3g9k75rzg"; + }; + propagatedBuildInputs = [IOSocketSSL DigestHMAC]; + }; + NetSSLeay = buildPerlPackage rec { name = "Net-SSLeay-1.42"; src = fetchurl { -- GitLab From 4f31337f0702789369b34413f039997354b92d56 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Mon, 22 Oct 2012 18:23:53 +0200 Subject: [PATCH 1249/5607] fix mount/umount into libzfs --- pkgs/os-specific/linux/zfs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index cbb8f30e1b3..4c13320f6d8 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs" substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" + substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount" substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id" ''; -- GitLab From 2ac4ad0c9cabba374b991b4933468e8abc0ddd9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 25 Oct 2012 23:16:32 +0200 Subject: [PATCH 1250/5607] Setting the loongson2f bootstrap tools in a public place. It'd be nice having this in nixos.org though. --- pkgs/stdenv/linux/bootstrap/loongson2f/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix index a87f07e00ce..8949d0e078d 100644 --- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix +++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix @@ -7,7 +7,7 @@ curl = ./curl.bz2; bootstrapTools = { - url = "file:///root/cross-bootstrap-tools.cpio.bz2"; + url = "http://viric.name/tmp/nix/loongson2f/cross-bootstrap-tools.cpio.bz2"; sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j"; }; } -- GitLab From 9b973e02e1a2b910d5555fc3247f158b2711e435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 25 Oct 2012 23:22:41 +0200 Subject: [PATCH 1251/5607] The loongson2f bootstrap files were already at nixos.org. I make the nix expression point to them. --- pkgs/stdenv/linux/bootstrap/loongson2f/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix index 8949d0e078d..b0ad8d6545d 100644 --- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix +++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix @@ -7,7 +7,7 @@ curl = ./curl.bz2; bootstrapTools = { - url = "http://viric.name/tmp/nix/loongson2f/cross-bootstrap-tools.cpio.bz2"; + url = "http://nixos.org/tarballs/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2"; sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j"; }; } -- GitLab From a2342803406365d9190b4bff88107b24b05cfcfc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 25 Oct 2012 23:33:09 -0400 Subject: [PATCH 1252/5607] openjdk: Create a cacerts file from pkgs.cacerts --- .../development/compilers/openjdk/default.nix | 7 + .../compilers/openjdk/generate-cacerts.pl | 366 ++++++++++++++++++ 2 files changed, 373 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/generate-cacerts.pl diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 0aaa275ccc5..41efb497e4b 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -21,7 +21,9 @@ , libXcursor , fontconfig , cpio +, cacert , jreOnly ? false +, perl }: let @@ -88,6 +90,7 @@ stdenv.mkDerivation rec { libXinerama libXcursor fontconfig + perl ]; NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; @@ -139,6 +142,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out + pushd $out/jre/lib/security + rm cacerts + perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt + popd ''; # '' + (if jreOnly then "" else '' # if [ -z $jre ]; then diff --git a/pkgs/development/compilers/openjdk/generate-cacerts.pl b/pkgs/development/compilers/openjdk/generate-cacerts.pl new file mode 100644 index 00000000000..3bdd42f7274 --- /dev/null +++ b/pkgs/development/compilers/openjdk/generate-cacerts.pl @@ -0,0 +1,366 @@ +#!/usr/bin/perl + +# Copyright (C) 2007, 2008 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# generate-cacerts.pl generates a JKS keystore named 'cacerts' from +# OpenSSL's certificate bundle using OpenJDK's keytool. + +# First extract each of OpenSSL's bundled certificates into its own +# aliased filename. + +# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2 +# Check and prevention of duplicate aliases added by Vlastimil Babka + +$file = $ARGV[1]; +open(CERTS, $file); +@certs = ; +close(CERTS); + +$pem_file_count = 0; +$in_cert_block = 0; +$write_current_cert = 1; +foreach $cert (@certs) +{ + if ($cert =~ /Issuer: /) + { + $_ = $cert; + if ($cert =~ /personal-freemail/) + { + $cert_alias = "thawtepersonalfreemailca"; + } + elsif ($cert =~ /personal-basic/) + { + $cert_alias = "thawtepersonalbasicca"; + } + elsif ($cert =~ /personal-premium/) + { + $cert_alias = "thawtepersonalpremiumca"; + } + elsif ($cert =~ /server-certs/) + { + $cert_alias = "thawteserverca"; + } + elsif ($cert =~ /premium-server/) + { + $cert_alias = "thawtepremiumserverca"; + } + elsif ($cert =~ /Class 1 Public Primary Certification Authority$/) + { + $cert_alias = "verisignclass1ca"; + } + elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/) + { + $cert_alias = "verisignclass1g2ca"; + } + elsif ($cert =~ + /VeriSign Class 1 Public Primary Certification Authority - G3/) + { + $cert_alias = "verisignclass1g3ca"; + } + elsif ($cert =~ /Class 2 Public Primary Certification Authority$/) + { + $cert_alias = "verisignclass2ca"; + } + elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/) + { + $cert_alias = "verisignclass2g2ca"; + } + elsif ($cert =~ + /VeriSign Class 2 Public Primary Certification Authority - G3/) + { + $cert_alias = "verisignclass2g3ca"; + } + elsif ($cert =~ /Class 3 Public Primary Certification Authority$/) + { + $cert_alias = "verisignclass3ca"; + } + # Version 1 of Class 3 Public Primary Certification Authority + # - G2 is added. Version 3 is excluded. See below. + elsif ($cert =~ + /VeriSign Class 3 Public Primary Certification Authority - G3/) + { + $cert_alias = "verisignclass3g3ca"; + } + elsif ($cert =~ + /RSA Data Security.*Secure Server Certification Authority/) + { + $cert_alias = "verisignserverca"; + } + elsif ($cert =~ /GTE CyberTrust Global Root/) + { + $cert_alias = "gtecybertrustglobalca"; + } + elsif ($cert =~ /Baltimore CyberTrust Root/) + { + $cert_alias = "baltimorecybertrustca"; + } + elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/) + { + $cert_alias = "entrustclientca"; + } + elsif ($cert =~ /www.entrust.net\/GCCA_CPS/) + { + $cert_alias = "entrustglobalclientca"; + } + elsif ($cert =~ /www.entrust.net\/CPS_2048/) + { + $cert_alias = "entrust2048ca"; + } + elsif ($cert =~ /www.entrust.net\/CPS /) + { + $cert_alias = "entrustsslca"; + } + elsif ($cert =~ /www.entrust.net\/SSL_CPS/) + { + $cert_alias = "entrustgsslca"; + } + elsif ($cert =~ /The Go Daddy Group/) + { + $cert_alias = "godaddyclass2ca"; + } + elsif ($cert =~ /Starfield Class 2 Certification Authority/) + { + $cert_alias = "starfieldclass2ca"; + } + elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/) + { + $cert_alias = "valicertclass2ca"; + } + elsif ($cert =~ /GeoTrust Global CA$/) + { + $cert_alias = "geotrustglobalca"; + } + elsif ($cert =~ /Equifax Secure Certificate Authority/) + { + $cert_alias = "equifaxsecureca"; + } + elsif ($cert =~ /Equifax Secure eBusiness CA-1/) + { + $cert_alias = "equifaxsecureebusinessca1"; + } + elsif ($cert =~ /Equifax Secure eBusiness CA-2/) + { + $cert_alias = "equifaxsecureebusinessca2"; + } + elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/) + { + $cert_alias = "equifaxsecureglobalebusinessca1"; + } + elsif ($cert =~ /Sonera Class1 CA/) + { + $cert_alias = "soneraclass1ca"; + } + elsif ($cert =~ /Sonera Class2 CA/) + { + $cert_alias = "soneraclass2ca"; + } + elsif ($cert =~ /AAA Certificate Services/) + { + $cert_alias = "comodoaaaca"; + } + elsif ($cert =~ /AddTrust Class 1 CA Root/) + { + $cert_alias = "addtrustclass1ca"; + } + elsif ($cert =~ /AddTrust External CA Root/) + { + $cert_alias = "addtrustexternalca"; + } + elsif ($cert =~ /AddTrust Qualified CA Root/) + { + $cert_alias = "addtrustqualifiedca"; + } + elsif ($cert =~ /UTN-USERFirst-Hardware/) + { + $cert_alias = "utnuserfirsthardwareca"; + } + elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/) + { + $cert_alias = "utnuserfirstclientauthemailca"; + } + elsif ($cert =~ /UTN - DATACorp SGC/) + { + $cert_alias = "utndatacorpsgcca"; + } + elsif ($cert =~ /UTN-USERFirst-Object/) + { + $cert_alias = "utnuserfirstobjectca"; + } + elsif ($cert =~ /America Online Root Certification Authority 1/) + { + $cert_alias = "aolrootca1"; + } + elsif ($cert =~ /DigiCert Assured ID Root CA/) + { + $cert_alias = "digicertassuredidrootca"; + } + elsif ($cert =~ /DigiCert Global Root CA/) + { + $cert_alias = "digicertglobalrootca"; + } + elsif ($cert =~ /DigiCert High Assurance EV Root CA/) + { + $cert_alias = "digicerthighassuranceevrootca"; + } + elsif ($cert =~ /GlobalSign Root CA$/) + { + $cert_alias = "globalsignca"; + } + elsif ($cert =~ /GlobalSign Root CA - R2/) + { + $cert_alias = "globalsignr2ca"; + } + elsif ($cert =~ /Elektronik.*Kas.*2005/) + { + $cert_alias = "extra-elektronikkas2005"; + } + elsif ($cert =~ /Elektronik/) + { + $cert_alias = "extra-elektronik2005"; + } + # Mozilla does not provide these certificates: + # baltimorecodesigningca + # gtecybertrust5ca + # trustcenterclass2caii + # trustcenterclass4caii + # trustcenteruniversalcai + else + { + # Generate an alias using the OU and CN attributes of the + # Issuer field if both are present, otherwise use only the + # CN attribute. The Issuer field must have either the OU + # or the CN attribute. + $_ = $cert; + if ($cert =~ /OU=/) + { + s/Issuer:.*?OU=//; + # Remove other occurrences of OU=. + s/OU=.*CN=//; + # Remove CN= if there were not other occurrences of OU=. + s/CN=//; + s/\/emailAddress.*//; + s/Certificate Authority/ca/g; + s/Certification Authority/ca/g; + } + elsif ($cert =~ /CN=/) + { + s/Issuer:.*CN=//; + s/\/emailAddress.*//; + s/Certificate Authority/ca/g; + s/Certification Authority/ca/g; + } + s/\W//g; + tr/A-Z/a-z/; + $cert_alias = "extra-$_"; + + } + while (-e "$cert_alias.pem") + { + $cert_alias = "$cert_alias" . "_"; + } + } + # When it attempts to parse: + # + # Class 3 Public Primary Certification Authority - G2, Version 3 + # + # keytool says: + # + # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false + # Unparseable AuthorityInfoAccess extension due to + # java.io.IOException: Invalid encoding of URI + # + # If we do not exclude this file + # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails + # on this cert, printing: + # + # Couldn't verify: java.security.SignatureException: Signature + # does not match. + # + elsif ($cert =~ + /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/) + { + $write_current_cert = 0; + $pem_file_count--; + } + elsif ($cert eq "-----BEGIN CERTIFICATE-----\n") + { + $_ = $cert; + s/\W//g; + tr/A-Z/a-z/; + $cert_alias = "extra-$_"; + while (-e "$cert_alias.pem") + { + $cert_alias = "$cert_alias" . "_"; + } + if ($in_cert_block != 0) + { + die "$file is malformed."; + } + $in_cert_block = 1; + if ($write_current_cert == 1) + { + $pem_file_count++; + if (-e "$cert_alias.pem") + { + print "$cert_alias"; + die "already exists" + } + open(PEM, ">$cert_alias.pem"); + print PEM $cert; + } + } + elsif ($cert eq "-----END CERTIFICATE-----\n") + { + $in_cert_block = 0; + if ($write_current_cert == 1) + { + print PEM $cert; + close(PEM); + } + $write_current_cert = 1 + } + else + { + if ($in_cert_block == 1 && $write_current_cert == 1) + { + print PEM $cert; + } + } +} + +# Check that the correct number of .pem files were produced. +@pem_files = <*.pem>; +if (@pem_files != $pem_file_count) +{ + print "$pem_file_count"; + die "Number of .pem files produced does not match". + " number of certs read from $file."; +} + +# Now store each cert in the 'cacerts' file using keytool. +$certs_written_count = 0; +foreach $pem_file (@pem_files) +{ + system "$ARGV[0] -noprompt -import". + " -alias `basename $pem_file .pem`". + " -keystore cacerts -storepass 'changeit' -file $pem_file"; + unlink($pem_file); + $certs_written_count++; +} + +# Check that the correct number of certs were added to the keystore. +if ($certs_written_count != $pem_file_count) +{ + die "Number of certs added to keystore does not match". + " number of certs read from $file."; +} -- GitLab From e862c150f00dc450207b4bdd34f8c8b91e92327d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 26 Oct 2012 11:06:25 +0400 Subject: [PATCH 1253/5607] Trying to fix OpenJDK build --- pkgs/development/compilers/openjdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 41efb497e4b..c91e3f2c1b5 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out - pushd $out/jre/lib/security + pushd $out/lib/security rm cacerts perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt popd -- GitLab From e7493370bdd40a18cb4284fa4481811f6c34d8bf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 26 Oct 2012 12:09:37 +0400 Subject: [PATCH 1254/5607] Account for difference between JRE and JDK in build --- pkgs/development/compilers/openjdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index c91e3f2c1b5..ee64a563a32 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out - pushd $out/lib/security + pushd $out/lib/security || pushd $out/jre/lib/security rm cacerts perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt popd -- GitLab From c0b393866f664e9caf8fcf5cdbebb5dd61cdb859 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 10:32:04 +0200 Subject: [PATCH 1255/5607] curl: update to version 7.28.0 --- pkgs/tools/networking/curl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ad08065e2eb..028b672380c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.27.0"; + name = "curl-7.28.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "164k2vw8v4ppsgqgk4gwhl26h70c8x3rgnl4c2s711626lhmi9db"; + sha256 = "b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; meta = { + homepage = "http://curl.haxx.se/"; description = "A command line tool for transferring files with URL syntax"; - homepage = http://curl.haxx.se/; }; } -- GitLab From df297001786eefdc92a249329bd1e2dc171f554e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 10:32:23 +0200 Subject: [PATCH 1256/5607] esniper: update to version 2.28.0 --- pkgs/applications/networking/esniper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 327e4c4a9c5..8208da621af 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.27.0"; + name = "esniper-2.28.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-27-0.tgz"; - sha256 = "0ca9946395be8958d3eb28c9abc4a1a4d4c9134e4b6b3c3816f4631e3be25c02"; + url = "mirror://sourceforge/esniper/esniper-2-28-0.tgz"; + sha256 = "c2b0ccb757616b32f2d6cf54a4a5e367405fa7bcd6e6ed11835fe4f8a06a016b"; }; buildInputs = [openssl curl]; -- GitLab From 263ca3e8865e76a443e5dd4376c04767e8eeac9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 10:35:07 +0200 Subject: [PATCH 1257/5607] jbidwatcher: update to version 2.5.2 --- pkgs/applications/misc/jbidwatcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 70cd5d3faf4..9b74b0c93a9 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jbidwatcher"; - version = "2.1.5"; + version = "2.5.2"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar"; - sha256 = "0nrs9ly56cqn33dm1sjm53pzj1cf7jncwn4c8v0xyva4jqyz2y5p"; + sha256 = "07w75ryn8inm5i1829gabr8lifbycz40ynzsyaw22yzqk5if1n9l"; }; buildInputs = [ java ]; -- GitLab From ac254165b1a597857526da9af3745191a59e4d92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 10:41:05 +0200 Subject: [PATCH 1258/5607] haskell-Cabal: update to version 1.16.0.2 --- .../libraries/haskell/Cabal/{1.16.0.1.nix => 1.16.0.2.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/haskell/Cabal/{1.16.0.1.nix => 1.16.0.2.nix} (81%) diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.1.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.2.nix similarity index 81% rename from pkgs/development/libraries/haskell/Cabal/1.16.0.1.nix rename to pkgs/development/libraries/haskell/Cabal/1.16.0.2.nix index e4698c72cad..0d2fa370966 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.2.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "Cabal"; - version = "1.16.0.1"; - sha256 = "03h0fsdm00i5pq37j3d7rjw3gnqkmacvgvdhcrmmamn5q81qld5g"; + version = "1.16.0.2"; + sha256 = "1yqzcml460ya98b0ylik1591zwinr8pa3q3wgw894x7m55g321db"; buildDepends = [ filepath ]; meta = { homepage = "http://www.haskell.org/cabal/"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3d1e7984ae7..665ab3f8032 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -541,7 +541,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; }; - Cabal_1_16_0_1 = callPackage ../development/libraries/haskell/Cabal/1.16.0.1.nix { cabal = self.cabal.override { Cabal = null; }; }; + Cabal_1_16_0_2 = callPackage ../development/libraries/haskell/Cabal/1.16.0.2.nix { cabal = self.cabal.override { Cabal = null; }; }; Cabal = null; # core package in GHC cabalFileTh = callPackage ../development/libraries/haskell/cabal-file-th {}; -- GitLab From 1c1f3962d3bef4c6960698b101361b49202f40dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 10:42:36 +0200 Subject: [PATCH 1259/5607] cabal-install: update to version 1.16.0.1 --- .../cabal-install/{1.16.0.nix => 1.16.0.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/tools/package-management/cabal-install/{1.16.0.nix => 1.16.0.1.nix} (87%) diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.nix b/pkgs/tools/package-management/cabal-install/1.16.0.1.nix similarity index 87% rename from pkgs/tools/package-management/cabal-install/1.16.0.nix rename to pkgs/tools/package-management/cabal-install/1.16.0.1.nix index 7c977989471..9194fb4385b 100644 --- a/pkgs/tools/package-management/cabal-install/1.16.0.nix +++ b/pkgs/tools/package-management/cabal-install/1.16.0.1.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.16.0"; - sha256 = "0yg8h028sixvzx42v1spjyx4qfhpsar38cvz9188m62rac8ak8az"; + version = "1.16.0.1"; + sha256 = "0w9fs3r82ipw0ya95az2y8fqg0c9lkfx6z7q89lp4qhwy2l3g0d3"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 665ab3f8032..c9c72cc4a6b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vector = self.vector_0_10_0_1; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_0; # 7.6 ok - cabalInstall = self.cabalInstall_1_16_0; # 7.6 ok + cabalInstall = self.cabalInstall_1_16_0_1; # 7.6 ok alex = self.alex_3_0_2; # 7.6 ok haddock = self.haddock_2_13_1; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok @@ -1911,8 +1911,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabalInstall_0_8_2 = callPackage ../tools/package-management/cabal-install/0.8.2.nix {}; cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; - cabalInstall_1_16_0 = callPackage ../tools/package-management/cabal-install/1.16.0.nix {}; - cabalInstall = self.cabalInstall_1_16_0; + cabalInstall_1_16_0_1 = callPackage ../tools/package-management/cabal-install/1.16.0.1.nix {}; + cabalInstall = self.cabalInstall_1_16_0_1; jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; -- GitLab From 978c16a0eae61bb85d266a9915675605cfe02708 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:15 +0200 Subject: [PATCH 1260/5607] haskell-JuicyPixels: update to version 2.0.2 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 8ec3a41a709..1f7d9067e75 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "2.0.1"; - sha256 = "0irisyrqz9cyyjd428qnnxyybrqc54s1qi5vyz0md0acz7mr5anh"; + version = "2.0.2"; + sha256 = "14nqifdsdhzlfq29waqlwspyy37gp174vw368ph772zp9b0ngyff"; buildDepends = [ cereal deepseq mtl primitive transformers vector zlib ]; -- GitLab From 3bd4fc8848e9ca924a711e2af18b4dc74b45e6ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:15 +0200 Subject: [PATCH 1261/5607] haskell-certificate: update to version 1.3.1 --- 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 52449880a6a..ea64cef451f 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.0"; - sha256 = "1vhqbwbk0xpq74f01lkqifq7pgxdbfgq193gy57b9rwsnxvzqip1"; + version = "1.3.1"; + sha256 = "10qn6bpvkqxj0lnfkb6a2aqphwl9yg9qv7q10rn72myyf2l101zy"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 5df99f8838dfbd2799366fc6f3b5ed46ec467b0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:15 +0200 Subject: [PATCH 1262/5607] haskell-dbus: update to version 0.10.3 --- pkgs/development/libraries/haskell/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index b9c436f4a56..ba310862948 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.2"; - sha256 = "11nzpc2x2khln6xm2fbz54fy3ry1s08c83jndrcn1a4ymv3j1xh1"; + version = "0.10.3"; + sha256 = "1l74whkrznlycl6rc1h63rc1vmvp6q2g8g92imycf8f4sizmigfq"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes -- GitLab From d1b848f3e59aa281ce2965d25d830a97d756eeef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:16 +0200 Subject: [PATCH 1263/5607] haskell-digestive-functors-snap: update to version 0.5.0.2 --- .../libraries/haskell/digestive-functors-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index a6490953341..2d7fdada428 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-snap"; - version = "0.5.0.1"; - sha256 = "149c01vxzlwskqsncc5l26mk67icmsq2zbav2asjxpp6z8b53i3b"; + version = "0.5.0.2"; + sha256 = "0xx5i09l8n1srdmslq0sq1h366cdq3xqxwjd3kp2ck9s6x65zyjz"; buildDepends = [ digestiveFunctors filepath mtl snapCore text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; -- GitLab From cf9b80082beb6bb5db508c35588510bee1717a77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:16 +0200 Subject: [PATCH 1264/5607] haskell-digestive-functors: update to version 0.5.0.4 --- .../libraries/haskell/digestive-functors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 31a81778f45..cce033eaf29 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.5.0.3"; - sha256 = "176wpnwg4zpfwphl0ifb3zdm0dhw5xyd3vr81rc98s4db5y9csl0"; + version = "0.5.0.4"; + sha256 = "0diaj1pmfmhwbyjmw49kna59f7dckwrp16cbar5xpcn9k2pf19nv"; buildDepends = [ mtl text ]; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; -- GitLab From 8695749668cf33668161e246eb0a44e4ec89d6e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:16 +0200 Subject: [PATCH 1265/5607] haskell-mongoDB: update to version 1.3.1 --- pkgs/development/libraries/haskell/mongoDB/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index aec216ea59d..32187c39963 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.3.0"; - sha256 = "1l6r55bicjdybn8jn9rp94aamjqy5j5qs2775m05aba8svsl4kma"; + version = "1.3.1"; + sha256 = "1qvsb993n5gmchym4zz2pv68mdyir439cfindqdqlvjwam0jf4l5"; buildDepends = [ binary bson cryptohash liftedBase monadControl mtl network parsec random randomShuffle text transformersBase -- GitLab From c7d12cdd90115f946022b95439f1d445790b47c7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:16 +0200 Subject: [PATCH 1266/5607] haskell-shelly: update to version 0.14.2.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 c266b6bd085..a7f434bfb2c 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.14.2"; - sha256 = "1vx7yq5fj4dnba94ypf8ldd236kivxisrzhkxcfhhar5zvw2jqng"; + version = "0.14.2.1"; + sha256 = "0zddrb17i9aazwziazjzcb96n6m794qyj3h85whph06y4krbygnl"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; -- GitLab From 7ffcf39ad6d0df37222991ed15cc69956e60f491 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:04:16 +0200 Subject: [PATCH 1267/5607] haskell-timeplot: update to version 1.0.14 --- pkgs/development/tools/haskell/timeplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 4e4834e2241..68cd981410d 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.11"; - sha256 = "08lgs96wi0issnjwb6w41v3z1bbb6g08hrlbkw7h60rjqkg48svs"; + version = "1.0.14"; + sha256 = "11caiv1dp7gannvkz30p2dkna61pqa9lzb2z755lzbbzbl79y665"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 7268c1c00821fd53235adc4bb1c21bdd6b4b9257 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Oct 2012 11:07:34 +0200 Subject: [PATCH 1268/5607] nvidia-x11: Update to 304.60 --- 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 dce5eec27a1..9a6a23500be 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.51"; in +let versionNumber = "304.60"; 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 = "08hc4w5ic1zbanfn5cpj3nqjk5s3brs6b4bcllzqd5nrfxizdzbq"; + sha256 = "0h64wxivh4kmqqhyklvkfwy9nxddqhc0whrw1skpczyjblr2ranr"; } 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 = "0fix999d1fzryjs635krh1ff9ha3agbwzscicrj0apwsfrbvqf5w"; + sha256 = "1jkgvpd7c760bn34zvq6iinidmbmn70ymh635c3sy9nnx2gr2f7m"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; -- GitLab From 0f8345a7f2fe00e5c7ede01dba2059632d398af4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Oct 2012 11:08:02 +0200 Subject: [PATCH 1269/5607] Small cleanup --- pkgs/os-specific/linux/nfs-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 6429d8092cf..4060204d505 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; # One test fails on mips. - doCheck = if stdenv.isMips then false else true; + doCheck = !stdenv.isMips; meta = { description = "Linux user-space NFS utilities"; -- GitLab From 27cdf7af771d212fc63aa151326593f74b7c51fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Oct 2012 11:10:02 +0200 Subject: [PATCH 1270/5607] hadoop: update to version 2.0.2-alpha --- pkgs/applications/networking/cluster/hadoop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 7d475a67558..ef2f16e3193 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { - name = "hadoop-2.0.1-alpha"; + name = "hadoop-2.0.2-alpha"; src = fetchurl { url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz"; - sha256 = "4e5f4fa1574ee58fd6d59a220b66578fc2cf62c229120eeed07f2880c86f0e59"; + sha256 = "1r7ailmqhny3pl5nb8bcblnhckszy6hb9n58kwa3s4b8qfk87gkb"; }; buildInputs = [ makeWrapper ]; -- GitLab From 5e071cd74de9c525f7d40e5d94acc362df6be856 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 26 Oct 2012 13:19:54 +0400 Subject: [PATCH 1271/5607] OK, this version definitely builds both ways --- pkgs/development/compilers/openjdk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index ee64a563a32..a5a915ae642 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out - pushd $out/lib/security || pushd $out/jre/lib/security + pushd $out/${if ! jreOnly then "jre/" else ""}lib/security rm cacerts perl ${./generate-cacerts.pl} $out/bin/keytool ${cacert}/etc/ca-bundle.crt popd -- GitLab From 01d749f0aa19a96f3e31c2b116ce3c3cc2317076 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 25 Oct 2012 11:18:32 -0700 Subject: [PATCH 1272/5607] Rolled back xf86-video-ati to 6.14.4. 6.14.6 requires a newer version of libdrm, which in turn requires a newer version of mesa. I cheated and edited the generated default.nix file instead of re-generating it, since generate-expr-from-tarballs.pl complained of a collision between two tarballs providing different versions of xorg-server. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8508f87e043..23600b0e014 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1438,11 +1438,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-6.14.6"; + name = "xf86-video-ati-6.14.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-6.14.6.tar.bz2; - sha256 = "0dpcdgw7vmx53l3byp900na5s980v1nw11a7y5yps67hwjrqclma"; + url = mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2; + sha256 = "11gg6xn65vym75769hzgzpkjsyhlkrw4zw3ncngriq7vz1g47zjg"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 5511f3f043f..7b361636264 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-vmmouse-12.9.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-ark-0.7.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-ast-0.93.10.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-6.14.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-6.14.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-dummy-0.3.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.3.tar.bz2 -- GitLab From d72ee9c96161318edc7105c8d8a85a085419f8fb Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 26 Oct 2012 14:45:16 +0200 Subject: [PATCH 1273/5607] Added sysbench 0.4.12 --- .../tools/misc/sysbench/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/tools/misc/sysbench/default.nix diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix new file mode 100644 index 00000000000..2860ac3731f --- /dev/null +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, mysql, libxslt, zlib, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "sysbench-0.4.12"; + buildInputs = [ autoreconfHook mysql libxslt zlib ]; + src = fetchurl { + url = mirror://sourceforge/sysbench/0.4.12/sysbench-0.4.12.tar.gz; + sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3"; + }; + preAutoreconf = '' + touch NEWS AUTHORS + ''; + + meta = { + description = "SysBench is a modular, cross-platform and multi-threaded benchmark tool."; + license = "GPLv2"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23bdb735938..2dad1899494 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1521,6 +1521,8 @@ let svnfs = callPackage ../tools/filesystems/svnfs { }; + sysbench = callPackage ../development/tools/misc/sysbench {}; + system_config_printer = callPackage ../tools/misc/system-config-printer { libxml2 = libxml2Python; }; -- GitLab From b40c41b7e3352ccc0dfd6b2a1a07c31fe1e04f50 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Oct 2012 15:20:20 +0200 Subject: [PATCH 1274/5607] zabbix: Update to 1.8.15 --- pkgs/servers/monitoring/zabbix/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 864f11bee3e..0189f3dd8fd 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.10"; - + version = "1.8.15"; + src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0jx5i1ps1zr908g8gh1zisajiblg40x8cchmgbpdviz85hzx4rfr"; + sha256 = "0358syx6vck6l8j9wwlsb78faivh4qxrgy3jlkmjqr99xi6h3r3f"; }; preConfigure = @@ -49,7 +49,7 @@ in platforms = stdenv.lib.platforms.linux; }; }; - + agent = stdenv.mkDerivation { name = "zabbix-agent-${version}"; @@ -65,5 +65,5 @@ in platforms = stdenv.lib.platforms.all; }; }; - + } -- GitLab From 620e3a15162a1ca2a391c483f97d1c1757270bc2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Oct 2012 15:20:34 +0200 Subject: [PATCH 1275/5607] php: Update to 5.3.18 --- 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 b811e7349c8..e073a51c92d 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -4,7 +4,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.3.17"; + version = "5.3.18"; name = "php-${version}"; @@ -152,7 +152,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; - sha256 = "02bmjlznnfhxhyd4wvk8ky9vpqwl9rbyng803r7ygf84sibyi1dd"; + sha256 = "0bqsdwil13m1r449c4rhrc8cmx2a09k8h2g107qqxfwanzndwrgh"; name = "php-${version}.tar.bz2"; }; -- GitLab From 0efbc7d3bfe6d9eb0fcdecc6964c10c093352e0e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 26 Oct 2012 15:54:53 +0200 Subject: [PATCH 1276/5607] dnsmasq: Update to 2.63 --- pkgs/tools/networking/dnsmasq/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 89c15b91a1a..20964213d53 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dnsmasq-2.59"; + name = "dnsmasq-2.63"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz"; - sha256 = "02s1y5320aiqhcrgzc7c2zs292vidijc156k5w7apzzsk5hfdhdx"; + sha256 = "043p8qjd1zx8bklcli9qnk3vzfz7j2kvl82abvipcg56qsyf71px"; }; makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; - meta = { + meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; license = "GPL"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } -- GitLab From f16f48be885ce57b5a119aeebafc3a7606656b32 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 26 Oct 2012 18:24:48 +0200 Subject: [PATCH 1277/5607] update pulseaudio to 2.1 Systemd support has also been added because pulseaudio needs it to be useable with the systemd branch of nixos. --- pkgs/servers/pulseaudio/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 21112250597..e315f788904 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -4,16 +4,17 @@ , jackaudioSupport ? false, jackaudio ? null , x11Support ? false, xlibs , json_c +, useSystemd ? false, systemd ? null }: assert jackaudioSupport -> jackaudio != null; stdenv.mkDerivation rec { - name = "pulseaudio-1.1"; + name = "pulseaudio-2.1"; src = fetchurl { - url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz"; - sha256 = "1vpm0681zj2jvhbabvnmrmfxr3172k4x58kjb39y5g3fdw9k3rbg"; + url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-2.1.tar.xz"; + sha256 = "0zyal2mix7lzhxmr3pxlmss5kjca061iapvrh20bkgvsyixk8szg"; }; # Since `libpulse*.la' contain `-lgdbm', it must be propagated. @@ -26,13 +27,10 @@ stdenv.mkDerivation rec { #gtk gconf ] ++ stdenv.lib.optional jackaudioSupport jackaudio - ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]; + ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ] + ++ stdenv.lib.optional useSystemd systemd; preConfigure = '' - # Change the `padsp' script so that it contains the full path to - # `libpulsedsp.so'. - sed -i "src/utils/padsp" \ - -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g" # Move the udev rules under $(prefix). sed -i "src/Makefile.in" \ -- GitLab From 4afe7286c383f0ef2c97dfcd15f3519c53536347 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 24 Oct 2012 10:11:48 +0200 Subject: [PATCH 1278/5607] node.js: upgrade to v0.8.12 --- 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 af2fd780b61..6a654b3b78d 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, utillinux }: stdenv.mkDerivation rec { - version = "0.8.9"; + version = "0.8.12"; name = "nodejs-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "1finh64yra4lqy5jzqif3hhq8hzjvkbc8xkw8364sjsygj3hc3rj"; + sha256 = "0igsz9g3hmxcnn685v4k8p6d2vv6cmh9sdz5pl8rlhglp0m7yjnn"; }; configureFlags = [ -- GitLab From 11228a3834dd58ef0b05883ceff032836e72b894 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Wed, 24 Oct 2012 14:10:46 +0200 Subject: [PATCH 1279/5607] node-packages: add "escape-html" --- 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 2b92d291b1f..3657c25e8c9 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -327,6 +327,19 @@ let self = { ]; }; + "escape-html" = self."escape-html-0.0.1"; + + "escape-html-0.0.1" = self.buildNodePackage rec { + name = "escape-html-0.0.1"; + src = fetchurl { + url = "http://registry.npmjs.org/escape-html/-/${name}.tgz"; + sha256 = "03c24a492f80659c25f788809ae64277408a4c12594cff62f89db4b3259c6b58"; + }; + deps = [ + + ]; + }; + "eyes" = self."eyes->=0.1.6"; "eyes->=0.1.6" = self.buildNodePackage rec { -- GitLab From 49f2fef481def02d9af090ff7f70b84bcc269cf0 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 28 Oct 2012 13:43:15 +0000 Subject: [PATCH 1280/5607] updated spring from 88 to 91 and downgraded the boost library which spring uses from default to 1.49 as the more recent boost version results in a build issue at about 30% --- pkgs/games/spring/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 09eb41f7267..3cb79e94631 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "spring-${version}"; - version = "0.88.0"; + version = "0.91.0"; src = fetchurl { - url = "mirror://sourceforge/springrts/spring_88.0_src.tar.lzma"; - sha256 = "f203114b849a83795fe2d413d01c843b6f5b50df0832ce570bc476502f89e6fa"; + url = "mirror://sourceforge/springrts/spring_91.0_src.tar.lzma"; + sha256 = "0ycn9yxpbw58a8p3j3wf3r0x102k665l27bfp1vxq7kpwlk6314l"; }; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dad1899494..905b7b0ae40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8226,7 +8226,7 @@ let # You still can override by passing more arguments. spaceOrbit = callPackage ../games/orbit { }; - spring = callPackage ../games/spring { }; + spring = callPackage ../games/spring { boost = boost149;}; springLobby = callPackage ../games/spring/springlobby.nix { }; -- GitLab From 29035e15a4f73f954975844e5110d7edc08797db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 28 Oct 2012 17:27:13 +0100 Subject: [PATCH 1281/5607] ng-spice-rework: update to version 24 --- pkgs/applications/science/electronics/ngspice/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index c7ddceb6b87..70153eee61b 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}: stdenv.mkDerivation { - name = "ng-spice-rework-21"; + name = "ng-spice-rework-24"; src = fetchurl { - url = mirror://sourceforge/ngspice/ng-spice-rework-21.tar.gz; - sha256 = "1hmvfl33dszy8xgbixx0zmiz4rdzjhl7lwlwm953jibd4dgx42j5"; + url = "mirror://sourceforge/ngspice/ngspice-24.tar.gz"; + sha256 = "0rgh75hbqrsljz767whbj65wi6369yc286v0qk8jxnv2da7p9ll6"; }; buildInputs = [ readline libX11 bison libICE libXaw libXext ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "The Next Generation Spice (Electronic Circuit Simulator)."; - homepage = http://ngspice.sourceforge.net; + homepage = "http://ngspice.sourceforge.net"; license = ["BSD" "GPLv2"]; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; -- GitLab From 85145941fac524c1e9b6dd3c1279f7f989d63469 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 28 Oct 2012 17:27:30 +0100 Subject: [PATCH 1282/5607] kicad: update homepage URL --- pkgs/applications/science/electronics/kicad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 9da45184978..d90c6632916 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Software EDA Suite"; - homepage = http://kicad.sourceforge.net; + homepage = "http://www.kicad-pcb.org/"; license = "GPLv2"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; -- GitLab From d843ec6b28a198ce1c904be7ac125fe9cc8adc09 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 28 Oct 2012 22:05:33 -0400 Subject: [PATCH 1283/5607] Linux 3.0.49 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index b0f8e38c84d..ad69486622e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.47"; + version = "3.0.49"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0gk6na5qd7j1brvsb1v52550qbidjk0c41spn3nyr8mrq2b8l5kk"; + sha256 = "0h24c0mhxznnlqgqq9yf12ad5g1ya33qjjcahzhaafb7kwvjkqyx"; }; config = configWithPlatform stdenv.platform; -- GitLab From 1da5d3495793cd0d686f5696cb9391309bda56bd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 28 Oct 2012 22:09:25 -0400 Subject: [PATCH 1284/5607] Linux 3.4.16 --- 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 0913f5f65be..af1c8c2d512 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.15"; + version = "3.4.16"; 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 = "1cakx844rzs358bc8sd4kaqjj7m2aawgk7b4i17fb7ccxqjz4zij"; + sha256 = "1dg8zy33vri71yv6zavyfyr5dg2wl4xz5ll8gqa4kjlq8hn8d5s2"; }; config = configWithPlatform stdenv.platform; -- GitLab From 9f221073c2914e620f0f60c6aaa7b1d5fbe72bd3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 28 Oct 2012 22:13:59 -0400 Subject: [PATCH 1285/5607] Linux 3.6.4 --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 03c959b3d8e..02a509e7df2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6.3"; + version = "3.6.4"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0f1shqhamwmv5sjgr9jcvk5xfdj3lcy5pzymwzj26qv72217vh99"; + sha256 = "0y64hd9cdrg9fpkwsww8s7dvq7z55k55a5pd06kkr1kwgjxqnj4a"; }; config = configWithPlatform stdenv.platform; -- GitLab From 52d68190db81cf6a2bc7c3967bc303744452856d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Oct 2012 14:27:31 +0400 Subject: [PATCH 1286/5607] Update Pidgin --- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 5e85c4c26b4..238e7e50f44 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation rec { - name = "pidgin-2.10.2"; + name = "pidgin-2.10.6"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "1f1j9pr7zwpxwbv94510brh69pmwn4v3np12h75pfrnkas8d5kg5"; + sha256 = "3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96"; }; inherit nss ncurses; -- GitLab From 472c5a5d77404831ea604f3bf76c1da64be1be01 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 29 Oct 2012 23:56:26 +0400 Subject: [PATCH 1287/5607] Update Bluez/Obex --- pkgs/os-specific/linux/bluez/default.nix | 4 ++-- pkgs/tools/bluetooth/obexd/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 10187986111..3b876322f1f 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { - name = "bluez-4.98"; + name = "bluez-4.101"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233"; + sha256 = "11vldy255zkmmpj0g0a1m6dy9bzsmyd7vxy02cdfdw79ml888wsr"; }; buildInputs = diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 215ecb167ba..1cf3918c21f 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }: stdenv.mkDerivation rec { - name = "obexd-0.40"; + name = "obexd-0.47"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "0jz0ldg2wvdzzl639xzf76hqwj23svlg3zv1r8nc3hik3pgs6h2l"; + sha256 = "15zw008098qr5az9y1c010yv8gkw1f6hi3mnfcvpmwxwh23kfh4i"; }; buildInputs = [ glib dbus.libs openobex bluez libical ]; -- GitLab From 78db9a8cb1db2dcac7ed14a657a74334733cfe76 Mon Sep 17 00:00:00 2001 From: Michael Ashton Date: Sat, 27 Oct 2012 15:13:56 -0700 Subject: [PATCH 1288/5607] Updated version of abcde to 2.5.4 - Added support for MusicBrainz queries to abcde package - Added new dependencies to abcde: mkcue, eject, perl, MusicBrainz, MusicBrainzDiscID - libdiscid version in pkg-config was incorrect; patched libdiscid to fix - Added WebServices::MusicBrainz Perl module - Added MusicBrainz::DiscID Perl module - Commented out XSLoader Perl module since it was broken, no packages depend on it, and it has been incorporated into the Perl core --- pkgs/applications/audio/abcde/abcde.patch | 30 +++++++++++++++ .../audio/abcde/cd-paranoia.patch | 16 -------- pkgs/applications/audio/abcde/default.nix | 31 ++++++++++----- pkgs/applications/audio/abcde/install.patch | 21 ---------- pkgs/applications/audio/abcde/which.patch | 16 -------- .../libraries/libdiscid/default.nix | 10 ++++- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/perl-packages.nix | 38 +++++++++++++++---- 8 files changed, 95 insertions(+), 71 deletions(-) create mode 100644 pkgs/applications/audio/abcde/abcde.patch delete mode 100644 pkgs/applications/audio/abcde/cd-paranoia.patch delete mode 100644 pkgs/applications/audio/abcde/install.patch delete mode 100644 pkgs/applications/audio/abcde/which.patch diff --git a/pkgs/applications/audio/abcde/abcde.patch b/pkgs/applications/audio/abcde/abcde.patch new file mode 100644 index 00000000000..ae187043e6c --- /dev/null +++ b/pkgs/applications/audio/abcde/abcde.patch @@ -0,0 +1,30 @@ +Two changes: + +* Add an alias for `which', so abcde can find things in store +* Choose the right CDROM reader syntax for `cd-paranoia' + +--- abcde-2.5.4/abcde~ 2012-09-18 06:09:31.000000000 -0700 ++++ abcde-2.5.4/abcde 2012-10-27 00:08:48.000862364 -0700 +@@ -17,6 +17,11 @@ + + VERSION='2.5.4' + ++which () ++{ ++ type -P $1 ++} ++ + usage () + { + echo "This is abcde v$VERSION." +@@ -3497,6 +3502,10 @@ + for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do + if new_checkexec $DEFAULT_CDROMREADER; then + CDROMREADERSYNTAX=$DEFAULT_CDROMREADER ++ case "$DEFAULT_CDROMREADER" in ++ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;; ++ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;; ++ esac + break + fi + done diff --git a/pkgs/applications/audio/abcde/cd-paranoia.patch b/pkgs/applications/audio/abcde/cd-paranoia.patch deleted file mode 100644 index 58cada65fb8..00000000000 --- a/pkgs/applications/audio/abcde/cd-paranoia.patch +++ /dev/null @@ -1,16 +0,0 @@ -Choose the right CDROM reader syntax for `cd-paranoia'. - ---- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-10-29 22:55:38.000000000 +0100 -@@ -3184,7 +3184,10 @@ if [ -n "$DISCID" ] || [ "$CDROMREADERSY - if [ "$CDROMREADERSYNTAX" = "" ]; then - for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do - if new_checkexec $DEFAULT_CDROMREADER; then -- CDROMREADERSYNTAX=$DEFAULT_CDROMREADER -+ case "$DEFAULT_CDROMREADER" in -+ cd-paranoia) CDROMREADERSYNTAX=cdparanoia;; -+ *) CDROMREADERSYNTAX=$DEFAULT_CDROMREADER;; -+ esac - break - fi - done diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index e7da594e4bc..e8c37d25694 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame +{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, lame, flac, eject, mkcue +, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID , makeWrapper }: -let version = "2.3.99.6"; +let version = "2.5.4"; in stdenv.mkDerivation { name = "abcde-${version}"; src = fetchurl { url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz"; - sha256 = "1wl4ygj1cf1d6g05gwwygsd5g83l039fzi011r30ma5lnm763lyb"; + sha256 = "14g5lsgh53hza9848351kwpygc0yqpvvzp3s923aja77f2wpkdl5"; }; # FIXME: This package does not support MP3 encoding (only Ogg), # nor `distmp3', `eject', etc. - patches = [ ./install.patch ./which.patch ./cd-paranoia.patch ]; + patches = [ ./abcde.patch ]; configurePhase = '' sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ; @@ -29,25 +30,37 @@ in substituteInPlace "abcde" \ --replace "/etc/abcde.conf" "$out/etc/abcde.conf" + ''; + # no ELFs in this package, only scripts + dontStrip = true; + dontPatchELF = true; + buildInputs = [ makeWrapper ]; postInstall = '' - substituteInPlace "$out/bin/cddb-tool" \ - --replace '#!/bin/sh' '#!${bash}/bin/sh' - substituteInPlace "$out/bin/abcde" \ - --replace '#!/bin/bash' '#!${bash}/bin/bash' + # substituteInPlace "$out/bin/cddb-tool" \ + # --replace '#!/bin/sh' '#!${bash}/bin/sh' + # substituteInPlace "$out/bin/abcde" \ + # --replace '#!/bin/bash' '#!${bash}/bin/bash' + + # generic fixup script should be doing this, but it ignores this file for some reason + substituteInPlace "$out/bin/abcde-musicbrainz-tool" \ + --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' wrapProgram "$out/bin/abcde" --prefix PATH ":" \ "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${lame}/bin" wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \ "${wget}/bin" + + wrapProgram "$out/bin/abcde-musicbrainz-tool" --prefix PATH ":" \ + "${wget}/bin" ''; meta = { - homepage = http://www.hispalinux.es/~data/abcde.php; + homepage = "http://lly.org/~rcw/abcde/page/"; licence = "GPLv2+"; description = "A Better CD Encoder (ABCDE)"; diff --git a/pkgs/applications/audio/abcde/install.patch b/pkgs/applications/audio/abcde/install.patch deleted file mode 100644 index f5ab75f4bb9..00000000000 --- a/pkgs/applications/audio/abcde/install.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- abcde-2.3.3/Makefile~ 2005-08-26 00:43:27.000000000 +0200 -+++ abcde-2.3.3/Makefile 2008-05-26 22:20:17.000000000 +0200 -@@ -14,13 +14,13 @@ clean: - - install: - $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -m 755 -o 0 abcde $(bindir) -- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) -+ $(INSTALL) -m 755 abcde $(bindir) -+ $(INSTALL) -m 755 cddb-tool $(bindir) - $(INSTALL) -d -m 755 $(mandir) -- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir) -- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir) -+ $(INSTALL) -m 644 abcde.1 $(mandir) -+ $(INSTALL) -m 644 cddb-tool.1 $(mandir) - $(INSTALL) -d -m 755 $(etcdir) -- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir) -+ $(INSTALL) -m 644 abcde.conf $(etcdir) - - tarball: - @cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \ diff --git a/pkgs/applications/audio/abcde/which.patch b/pkgs/applications/audio/abcde/which.patch deleted file mode 100644 index 70474000ddd..00000000000 --- a/pkgs/applications/audio/abcde/which.patch +++ /dev/null @@ -1,16 +0,0 @@ -Add an alias for `which'. - ---- abcde-2.3.99.6/abcde 2006-08-05 21:14:00.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-10-29 22:49:16.000000000 +0100 -@@ -15,6 +15,11 @@ - - VERSION='2.3.99-$Revision: 222M $' - -+which () -+{ -+ type -P $1 -+} -+ - usage () - { - echo "This is abcde v$VERSION." diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index bd39ea9464c..3ee43ba3bee 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { name = "libdiscid-0.2.2"; + buildNativeInputs = [ pkgconfig ]; buildInputs = [ cmake ]; src = fetchurl { @@ -10,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp"; }; + # developer forgot to update his version number + # this is propagated to pkg-config + preConfigure = '' + substituteInPlace "CMakeLists.txt" \ + --replace "PROJECT_VERSION 0.1.1" "PROJECT_VERSION 0.2.2" + ''; + meta = { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905b7b0ae40..3d20787dede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6510,7 +6510,9 @@ let aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { }; - abcde = callPackage ../applications/audio/abcde { }; + abcde = callPackage ../applications/audio/abcde { + inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID; + }; abiword = callPackage ../applications/office/abiword { inherit (gnome) libglade libgnomecanvas; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0604ae46e4f..18e21a6f309 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2775,6 +2775,30 @@ rec { }; }; + MusicBrainzDiscID = buildModule rec { + name = "MusicBrainz-DiscID-0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NJ/NJH/${name}.tar.gz"; + sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; + }; + # Build.PL in this package uses which to find pkg-config -- make it use path instead + patchPhase = ''sed -ie 's/`which pkg-config`/"pkg-config"/' Build.PL''; + doCheck = false; # The main test performs network access + #buildInputs = [ TestMore TestPod ]; + buildInputs = [ pkgs.pkgconfig ]; + propagatedBuildInputs = [ pkgs.libdiscid ]; + }; + + MusicBrainz = buildPerlPackage rec { + name = "WebService-MusicBrainz-0.93"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BF/BFAIST/${name}.tar.gz"; + sha256 = "1gg62x6qv4jj73jsqh0sb237k96i22blj29afpbp1scp3m7i5g61"; + }; + propagatedBuildInputs = [ XMLLibXML LWP ClassAccessor URI ]; + doCheck = false; # Test performs network access. + }; + NamespaceAutoclean = buildPerlPackage rec { name = "namespace-autoclean-0.12"; src = fetchurl { @@ -4345,13 +4369,13 @@ rec { }; }; - XSLoader = buildPerlPackage { - name = "XSLoader-0.08"; - src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; - sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; - }; - }; + # XSLoader = buildPerlPackage { + # name = "XSLoader-0.08"; + # src = fetchurl { + # url = mirror://cpan/authors/id/S/SA/SAPER/XSLoader-0.08.tar.gz; + # sha256 = "0mr4l3givrpyvz1kg0kap2ds8g0rza2cim9kbnjy8hi64igkixi5"; + # }; + # }; YAML = buildPerlPackage rec { name = "YAML-0.80"; -- GitLab From 4c5b56d21232bd0f22338cbf9838f8c3dbf13e50 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Tue, 30 Oct 2012 09:03:53 +0100 Subject: [PATCH 1289/5607] Add cabal-dev. --- .../tools/haskell/cabal-dev/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 7 +++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/haskell/cabal-dev/default.nix diff --git a/pkgs/development/tools/haskell/cabal-dev/default.nix b/pkgs/development/tools/haskell/cabal-dev/default.nix new file mode 100644 index 00000000000..79385bd88a9 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal-dev/default.nix @@ -0,0 +1,21 @@ +{ cabal, Cabal, cabalInstall, filepath, HTTP, mtl, network, tar +, transformers, zlib +}: + +cabal.mkDerivation (self: { + pname = "cabal-dev"; + version = "0.9.1"; + sha256 = "1brz0nw959jdyjrhjqy9sixsb316hjmw4pxxsybfl8vixsivdfh6"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + Cabal filepath HTTP mtl network tar transformers zlib + ]; + buildTools = [ cabalInstall ]; + meta = { + homepage = "http://github.com/creswick/cabal-dev"; + description = "Manage sandboxed Haskell build environments"; + 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 c9c72cc4a6b..3a1ad4f2081 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1904,6 +1904,13 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cabal2nix = callPackage ../development/tools/haskell/cabal2nix {}; + cabalDev = callPackage ../development/tools/haskell/cabal-dev { + mtl = self.mtl_2_0_1_0.override { transformers = self.transformers_0_2_2_0; }; + transformers = self.transformers_0_2_2_0; + tar = self.tar_0_3_2_0; + }; + + cabalGhci = callPackage ../development/tools/haskell/cabal-ghci {}; cabalInstall_0_6_2 = callPackage ../tools/package-management/cabal-install/0.6.2.nix {}; -- GitLab From 8775cb95ba848ca07e295f64efb608cda2b1c6fa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 30 Oct 2012 12:49:43 +0400 Subject: [PATCH 1290/5607] Update/fix PuTTY --- .../networking/remote/putty/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 5fa1aefe7b0..e35f8c739c5 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut }: +{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut +, libtool }: let - rev = 8934; + rev = 9690; in stdenv.mkDerivation { name = "putty-${toString rev}"; @@ -10,10 +11,11 @@ stdenv.mkDerivation { preConfigure = '' perl mkfiles.pl ( cd doc ; make ); + sed '/AM_PATH_GTK(/d' -i unix/configure.ac + sed '/AC_OUTPUT/iAM_PROG_CC_C_O' -i unix/configure.ac + sed '/AC_OUTPUT/iAM_PROG_AR' -i unix/configure.ac + ./mkauto.sh cd unix - sed '/AM_PATH_GTK(/d' -i configure.ac - cp ${automake}/share/automake-*/install-sh . - autoreconf -vf ''; # The hash is going to change on new snapshot. @@ -21,8 +23,8 @@ stdenv.mkDerivation { src = fetchsvn { url = svn://svn.tartarus.org/sgt/putty; rev = rev; - sha256 = "f5d9870dde7166afd277f7501914c6515b35ee7bb42965ccd22fe977ee5d1b0d"; + sha256 = "e1fb49766e0724a12776ec3d6cd0bd420e03ebdc3383a01a12dbfd30983f81ef"; }; - buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut ]; + buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; } -- GitLab From d1202f702b886766ac0008427713a7ab9481a0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 30 Oct 2012 15:07:20 +0100 Subject: [PATCH 1291/5607] smatch: install files in the right place --- pkgs/development/tools/analysis/smatch/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 8b9deca409f..c5aea9a6075 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -20,7 +20,10 @@ stdenv.mkDerivation { ++ stdenv.lib.optional buildllvmsparse llvm ++ stdenv.lib.optional buildc2xml libxml2; - installFlags = "DESTDIR=$(out)"; + preBuild = + '' sed -i Makefile \ + -e "s|^PREFIX=.*|PREFIX = $out|g" + ''; meta = { description = "A semantic analysis tool for C"; -- GitLab From 4b3d29003e316635e340d83d1dea64ce48db6652 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Tue, 30 Oct 2012 17:14:06 +0100 Subject: [PATCH 1292/5607] smatch: add dependency on Perl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cyril Roelandt Signed-off-by: Ludovic Courtès --- pkgs/development/tools/analysis/smatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index c5aea9a6075..1d1bf7a818a 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, sqlite, pkgconfig +{ stdenv, fetchgit, sqlite, pkgconfig, perl , buildllvmsparse ? true , buildc2xml ? true , llvm ? null, libxml2 ? null @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "09a44967d4cff026c67062f778e251d0b432af132e9d59a47b7d3167f379adfa"; }; - buildInputs = [sqlite pkgconfig] + buildInputs = [sqlite pkgconfig perl] ++ stdenv.lib.optional buildllvmsparse llvm ++ stdenv.lib.optional buildc2xml libxml2; -- GitLab From 0dd3996ab4f2921f7f436329305fe02397794e57 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 30 Oct 2012 10:17:52 +0100 Subject: [PATCH 1293/5607] node-packages: upgrade coffee-script to 1.4.0 I'm not sure yet how to handle these upgrades. Should we keep the old version around? Should we only keep it around if other pkgs in nixpkgs depend on it? Probably people develop their own projects (that are not in nixpkgs) on top of these and we don't want to break these. For now, I think it's best just to keep old versions around, but update the (unversioned) link to the latest. External projects should then depend on explicit version numbers if they don't want stuff to break. If a certain package has +5 versions in nixpkgs, we can clear out the unuseful ones. --- pkgs/top-level/node-packages.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 3657c25e8c9..9d1137925c3 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -178,8 +178,8 @@ let self = { ]; }; - "coffee-script" = self."coffee-script-1.3.3"; - "coffee-script-~1" = self."coffee-script-1.3.3"; + "coffee-script" = self."coffee-script-1.4.0"; + "coffee-script-~1" = self."coffee-script-1.4.0"; "coffee-script-~1.1.2" = self.buildNodePackage rec { name = "coffee-script-1.1.3"; @@ -203,6 +203,17 @@ let self = { ]; }; + "coffee-script-1.4.0" = self.buildNodePackage rec { + name = "coffee-script-1.4.0"; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/${name}.tgz"; + sha256 = "146e8985d89210b63dae83378fd851ccf54d38d7d11cadcdca01520d50882613"; + }; + deps = [ + + ]; + }; + "commander" = self."commander-~0.6.1"; "commander-~0.6.1" = self.buildNodePackage rec { -- GitLab From ccd44e84c888fcf6a945a99cd4e5fcae1c7198fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Oct 2012 13:41:54 +0100 Subject: [PATCH 1294/5607] =?UTF-8?q?Add=20a=20stdenv=20adapter=20?= =?UTF-8?q?=E2=80=98keepDebugInfo=E2=80=99=20to=20make=20a=20debug=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adapter causes the resulting binaries to have debug info and no optimisations. Example use (in all-packages.nix): foo = callPackage ./foo.nix { stdenv = keepDebugInfo stdenv; }; --- pkgs/stdenv/adapters.nix | 42 ++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index dc9314f6885..fb0eed51d56 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -3,8 +3,8 @@ compiler. */ {dietlibc, fetchurl, runCommand}: - - + + rec { @@ -14,7 +14,7 @@ rec { inherit gcc; }; - + # Add some arbitrary packages to buildInputs for specific packages. # Used to override packages in stdenv like Make. Should not be used # for other dependencies. @@ -65,7 +65,7 @@ rec { isDietLibC = true; } // {inherit fetchurl;}; - + # Return a modified stdenv that uses klibc to create small # statically linked binaries. useKlibc = stdenv: klibc: stdenv // @@ -94,7 +94,7 @@ rec { isStatic = true; } // {inherit fetchurl;}; - + # Return a modified stdenv that tries to build statically linked # binaries. makeStaticBinaries = stdenv: stdenv // @@ -108,7 +108,7 @@ rec { isStatic = true; } // {inherit fetchurl;}; - + # Return a modified stdenv that builds static libraries instead of # shared libraries. makeStaticLibraries = stdenv: stdenv // @@ -120,7 +120,7 @@ rec { }); } // {inherit fetchurl;}; - + # Return a modified stdenv that adds a cross compiler to the # builds. makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv // @@ -185,7 +185,7 @@ rec { inherit cross gccCross binutilsCross; }; - + /* Modify a stdenv so that the specified attributes are added to every derivation returned by its mkDerivation function. @@ -202,7 +202,7 @@ rec { /* Return a modified stdenv that performs the build under $out/.build instead of in $TMPDIR. Thus, the sources are kept available. This is useful for things like debugging or generation of - dynamic analysis reports. */ + dynamic analysis reports. */ keepBuildTree = stdenv: addAttrsToDerivation { prePhases = "moveBuildDir"; @@ -230,12 +230,12 @@ rec { \( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \ | xargs rm -f -- - for i in $(find $out/.build/ -name ".tmp_*.gcno"); do + for i in $(find $out/.build/ -name ".tmp_*.gcno"); do mv "$i" "$(echo $i | sed s/.tmp_//)" done ''; - } stdenv; - + } stdenv; + /* Return a modified stdenv that builds packages with GCC's coverage instrumentation. The coverage note files (*.gcno) are stored in @@ -258,7 +258,7 @@ rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage" ''; } - + # Object files instrumented with coverage analysis write # runtime coverage data to /.gcda, where # is the location where gcc originally created the object @@ -269,7 +269,7 @@ rec { # we need the source code. So we have to use the # `keepBuildTree' adapter as well. (cleanupBuildTree (keepBuildTree stdenv)); - + /* Replace the meta.maintainers field of a derivation. This is useful when you want to fork to update some packages without disturbing other @@ -311,7 +311,7 @@ rec { }; }; - + /* Abort if the license predicate is not verified for a derivation declared with mkDerivation. @@ -355,4 +355,16 @@ rec { drvPath = validate pkg.drvPath; }; }; + + + /* Modify a stdenv so that it produces debug builds; that is, + binaries have debug info, and compiler optimisations are + disabled. */ + keepDebugInfo = stdenv: stdenv // + { mkDerivation = args: stdenv.mkDerivation (args // { + dontStrip = true; + NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -g -O0"; + }); + }; + } -- GitLab From 094c1fd1083494d22d5771494625d2fbfc98d02b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Oct 2012 13:44:31 +0100 Subject: [PATCH 1295/5607] systemd: Fix a systemd crash when doing "systemctl list-unit-files" --- pkgs/os-specific/linux/systemd/default.nix | 1 + .../linux/systemd/listunitfiles-abort.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/os-specific/linux/systemd/listunitfiles-abort.patch diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1da64199179..bab8dfa4a89 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { [ ./reexec.patch ./ignore-duplicates.patch ./crypt-devices-are-ready.patch + ./listunitfiles-abort.patch ]; buildInputs = diff --git a/pkgs/os-specific/linux/systemd/listunitfiles-abort.patch b/pkgs/os-specific/linux/systemd/listunitfiles-abort.patch new file mode 100644 index 00000000000..4bbb0a9b1be --- /dev/null +++ b/pkgs/os-specific/linux/systemd/listunitfiles-abort.patch @@ -0,0 +1,20 @@ +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index ed9784b..6d045cc 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -491,7 +491,6 @@ static DBusMessage *message_from_file_changes( + return reply; + + oom: +- dbus_message_unref(reply); + return NULL; + } + +@@ -1432,7 +1431,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h); + if (r < 0) { + unit_file_list_free(h); +- dbus_message_unref(reply); + return bus_send_error_reply(connection, message, NULL, r); + } + -- GitLab From 7a4e0c6b96aee369a8be19ee9747ddf6e7b51f2f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Oct 2012 13:45:11 +0100 Subject: [PATCH 1296/5607] firefox: Update to 16.0.2 --- pkgs/applications/networking/browsers/firefox/16.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/16.0.nix index 063d36ccfcf..70c04faa2e9 100644 --- a/pkgs/applications/networking/browsers/firefox/16.0.nix +++ b/pkgs/applications/networking/browsers/firefox/16.0.nix @@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "16.0.1"; + firefoxVersion = "16.0.2"; - xulVersion = "16.0.1"; # this attribute is used by other packages + xulVersion = "16.0.2"; # this attribute is used by other packages src = fetchurl { @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "ad5723fcf4ec6c6734e2022cecad174290fa425e"; + sha1 = "842d852b31a388d4cf3ac59bc89e8611474e2ec7"; }; commonConfigureFlags = -- GitLab From 1d384b0fe0ea8d81fbe45580971b42ee46219ec3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Oct 2012 13:48:04 +0100 Subject: [PATCH 1297/5607] linux: Update to 3.2.33 --- 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 607e9deff0a..f1f45b9aae3 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.32"; + version = "3.2.33"; 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 = "0kp52fz5xkaypgn19qa47bbrawj04g0vv0lfmx5vc51cvxljipa0"; + sha256 = "19m8w332vlm0h1by365k1f85q2j067klr5ryrkkihdymwl3ddb3n"; }; config = configWithPlatform stdenv.platform; -- GitLab From db6abc4569d9732d4d9bbd716a8207a0fc500880 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Oct 2012 13:49:25 +0100 Subject: [PATCH 1298/5607] nspr: Update to 4.9.3 --- pkgs/development/libraries/nspr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 2b8a327e2d5..77003961fd9 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.9.2"; in +let version = "4.9.3"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha1 = "455eab365f8fd732a4b014ca0af685f3c2dec598"; + sha256 = "1igkfb7dm3fd59swa5m961rgc53z98l3jadk42c4yy76b85z78ww"; }; preConfigure = "cd mozilla/nsprpub"; -- GitLab From df5cca471ebd4a537eed4e0cc1ee0a3e31eb65b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Oct 2012 14:04:58 +0100 Subject: [PATCH 1299/5607] nss: Update to 3.14 --- pkgs/development/libraries/nss/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a9629def8a3..e0bd1d2a53e 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -21,14 +21,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.13.6"; + version = "3.14"; - 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"; + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_RTM/src/${name}.tar.gz"; + sha1 = "ace3642fb2ca67854ea7075d053ca01a6d81e616"; }; buildInputs = [ nspr perl zlib sqlite ]; -- GitLab From 5896f139611bb2c56fccf363ede1ee14e80dafe8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 31 Oct 2012 17:16:01 +0100 Subject: [PATCH 1300/5607] thunderbird: Update to 16.0.2 --- .../mailreaders/thunderbird/{15.x.nix => default.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/networking/mailreaders/thunderbird/{15.x.nix => default.nix} (97%) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/15.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix similarity index 97% rename from pkgs/applications/networking/mailreaders/thunderbird/15.x.nix rename to pkgs/applications/networking/mailreaders/thunderbird/default.nix index 0deee99eadf..1d5bcfa5b9b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/15.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -12,14 +12,14 @@ enableOfficialBranding ? false }: -let version = "15.0.1"; in +let version = "16.0.2"; in stdenv.mkDerivation { name = "thunderbird-${version}"; src = fetchurl { url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2"; - sha1 = "688bed2b48abda000b489f3c84de0ba9f93818f0"; + sha1 = "842d852b31a388d4cf3ac59bc89e8611474e2ec7"; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905b7b0ae40..9cc10a68968 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7776,7 +7776,7 @@ let thinkingRock = callPackage ../applications/misc/thinking-rock { }; - thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/15.x.nix { + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome) libIDL; }; -- GitLab From 3f50c024962e4e292fb3056670b432d4ea6af41e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 09:40:00 +0100 Subject: [PATCH 1301/5607] haskell-List: add version 0.4.4 --- .../development/libraries/haskell/List/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/List/default.nix diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix new file mode 100644 index 00000000000..809a3549428 --- /dev/null +++ b/pkgs/development/libraries/haskell/List/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "List"; + version = "0.4.4"; + sha256 = "1dmri9l2mzq1kwy2539z9z21a61rr5ldy990kcixngi4wnaymdbz"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/yairchu/generator/tree"; + description = "List monad transformer and class"; + 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 3a1ad4f2081..895a12c55e7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1098,6 +1098,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; + List = callPackage ../development/libraries/haskell/List {}; + ListLike = callPackage ../development/libraries/haskell/ListLike {}; ListZipper = callPackage ../development/libraries/haskell/ListZipper {}; -- GitLab From f51d329343263bb453195ec419e80f0cb5e98b19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 09:40:09 +0100 Subject: [PATCH 1302/5607] haskell-hexpat: add version 0.20.2 --- .../libraries/haskell/hexpat/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hexpat/default.nix diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix new file mode 100644 index 00000000000..ec208aaad59 --- /dev/null +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -0,0 +1,18 @@ +{ cabal, deepseq, extensibleExceptions, List, text, transformers +, utf8String +}: + +cabal.mkDerivation (self: { + pname = "hexpat"; + version = "0.20.2"; + sha256 = "1v96xiys1664cdspbd9mps9m1ia4xwykzsg4z62pklqnf21wna7j"; + buildDepends = [ + deepseq extensibleExceptions List text transformers utf8String + ]; + meta = { + homepage = "http://haskell.org/haskellwiki/Hexpat/"; + description = "XML parser/formatter based on expat"; + 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 895a12c55e7..a821914ef6b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -908,6 +908,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); hastache = callPackage ../development/libraries/haskell/hastache {}; + hexpat = callPackage ../development/libraries/haskell/hexpat {}; + HTTP_4000_0_6 = callPackage ../development/libraries/haskell/HTTP/4000.0.6.nix {}; HTTP_4000_0_9 = callPackage ../development/libraries/haskell/HTTP/4000.0.9.nix {}; HTTP_4000_1_1 = callPackage ../development/libraries/haskell/HTTP/4000.1.1.nix {}; -- GitLab From 9d4aa6a6bec8793179de14853bd731ef5ef53994 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:27 +0100 Subject: [PATCH 1303/5607] haskell-idris: update to version 0.9.5.1 --- pkgs/development/compilers/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index b240824ff73..dbd35d9e948 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.4.1"; - sha256 = "1f1jrgnclr0443rbhfcnm0vvbb2jcliskqm6vq1c0xgywab7bjhx"; + version = "0.9.5.1"; + sha256 = "0cy27b2kq696lw354y55mpx1gv66jdax1xjph989kxp0rd1v1sw9"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 71de088cd56b99af603b548479bb5af1a0b5bcf5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:27 +0100 Subject: [PATCH 1304/5607] haskell-c2hs: update to version 0.16.4 --- pkgs/development/libraries/haskell/c2hs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index d717174902b..6ad4db61cfd 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.16.3"; - sha256 = "1qqsxfdkf5sfj3mvk265dbng3br9w633y8v1piajqaidki7vwqm5"; + version = "0.16.4"; + sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi"; isLibrary = false; isExecutable = true; buildDepends = [ filepath languageC ]; -- GitLab From 3b1a14fc4b1c030e2b3e195af0fdcbe67021ebec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:27 +0100 Subject: [PATCH 1305/5607] haskell-citeproc-hs: update to version 0.3.6 --- .../libraries/haskell/citeproc-hs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index 2899f526f36..027fe75033a 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -1,14 +1,14 @@ -{ cabal, filepath, hsBibutils, HTTP, json, mtl, network -, pandocTypes, parsec, syb, time, utf8String, xml +{ cabal, filepath, hexpat, hsBibutils, HTTP, json, mtl, network +, pandocTypes, parsec, syb, time, utf8String }: cabal.mkDerivation (self: { pname = "citeproc-hs"; - version = "0.3.5"; - sha256 = "134sdz22h2aqwy3cmn0vw91nmbp3ckpjg5djxsg93ddl08ahr4zr"; + version = "0.3.6"; + sha256 = "0zxwca3i7gg1vhdvrxd15c8zgx1gy3y7zjj746bcvf8pwavkq5q2"; buildDepends = [ - filepath hsBibutils HTTP json mtl network pandocTypes parsec syb - time utf8String xml + filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec + syb time utf8String ]; meta = { homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; -- GitLab From 4b6aa99d433b4cf1341e8b7990906e4107bddf35 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:28 +0100 Subject: [PATCH 1306/5607] haskell-cryptohash: update to version 0.7.6 --- pkgs/development/libraries/haskell/cryptohash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 77ecc4ef554..6f8143a9543 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.7.5"; - sha256 = "18x1k22m2mw0jx3p1mc68n0gg1vsnkp50qvmlkh3i34vdnjcdrqg"; + version = "0.7.6"; + sha256 = "1sx89b4k0wm9a4ivh5zfn0jlccflg4cm0mic3i829l14y5184ngm"; isLibrary = true; isExecutable = true; buildDepends = [ cereal cryptoApi tagged ]; -- GitLab From c25f23d3e15e1950cfe832136a2d49c60dd5af7b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:28 +0100 Subject: [PATCH 1307/5607] haskell-generic-deriving: update to version 1.3.1 --- .../libraries/haskell/generic-deriving/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 67a35960ac9..27eecd552a6 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "generic-deriving"; - version = "1.2.2"; - sha256 = "1k64c3wqvgcvwarv55v8c303l959rs01znq443wynzi7kz7xcfl9"; + version = "1.3.1"; + sha256 = "1z02j86lgn57ws0rfq2m0zb0m866k9afh9346k8bbwb5c4914wm3"; meta = { description = "Generic programming library for generalised deriving"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 00dedcba80c7dcbda22992d8f73828719a21e970 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:28 +0100 Subject: [PATCH 1308/5607] haskell-ghc-mod: update to version 1.11.2 --- pkgs/development/libraries/haskell/ghc-mod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 112c32195c8..6ef59a4451b 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "1.11.1"; - sha256 = "1mhmcckpijg44h3njcdkssz72a3x0222gqc2fs477fymcmczv2q3"; + version = "1.11.2"; + sha256 = "0df1g57mwgd9avd2smnc7j97n14553p3zdmnbjanhnzin2fqj0dc"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 6d8235b7aacb103fca540d69027307b2ab397b38 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:28 +0100 Subject: [PATCH 1309/5607] haskell-hakyll: update to version 3.5.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 c3e10a31572..fd62553886e 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.4.2.1"; - sha256 = "0h2xs4qwy2lqdg4v7zbzfmkvr411j34fba3dm05skq7d908wjji0"; + version = "3.5.0.0"; + sha256 = "18mvnhhf03qq2zr85vyg3h87kf2ny0jrj0zjp0886i6qvmbrjwlj"; buildDepends = [ binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet lrucache mtl pandoc parsec regexBase regexTdfa snapCore snapServer -- GitLab From 23604072cf18cd269bb9be980727682c6667d7f9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:28 +0100 Subject: [PATCH 1310/5607] haskell-hinotify: update to version 0.3.3 --- pkgs/development/libraries/haskell/hinotify/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix index 8cbf3f20a72..3767fe635f0 100644 --- a/pkgs/development/libraries/haskell/hinotify/default.nix +++ b/pkgs/development/libraries/haskell/hinotify/default.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: { pname = "hinotify"; - version = "0.3.2"; - sha256 = "0gr9rv1af6w7g2hbjhz1livi5zfhzdswjyapvjz3d7cga906bj48"; + version = "0.3.3"; + sha256 = "0z8pd5zva25zii5kkh807kdkn4j9w9z74f2dw4kyflwidn0063fr"; meta = { - homepage = "http://code.haskell.org/hinotify/README.html"; - description = "Haskell binding to INotify"; + homepage = "https://github.com/kolmodin/hinotify.git"; + description = "Haskell binding to inotify"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; -- GitLab From 1eac54a4f75406ee1236d77a28114014b47e8bfb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:28 +0100 Subject: [PATCH 1311/5607] haskell-http-conduit: update to version 1.8.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 c5daa149f52..2909d56368f 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.8.1"; - sha256 = "0569lz00vpkd60ch72xq1y5ymm7ni1dbawka8xyqcra9d4x06ad5"; + version = "1.8.2"; + sha256 = "01iv4gfsch5dyxykmq6g4ki3wmlpwhkjwmgxcpz6cphrv67lbysl"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie -- GitLab From cada9e93e0ef5df293079746e07ea7782d81341b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:28 +0100 Subject: [PATCH 1312/5607] haskell-lrucache: update to version 1.1.1.1 --- pkgs/development/libraries/haskell/lrucache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix index d92bd820348..2a93ee4af33 100644 --- a/pkgs/development/libraries/haskell/lrucache/default.nix +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lrucache"; - version = "1.1.1"; - sha256 = "05y0b2dbbp017hkbr0pz943956dm31g5xhma4bqnh49yd4lyn5l9"; + version = "1.1.1.1"; + sha256 = "0w310wsvin5hw3awpicnzddyifcq0844h52jwjcqnin81l2lqrfw"; meta = { homepage = "http://github.com/chowells79/lrucache"; description = "a simple, pure LRU cache"; -- GitLab From 17ddc48e1b096b4f5384320a6a6b60ec037cb82d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1313/5607] haskell-reactive-banana-wx: update to version 0.7.1.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 2d46992ddab..ee408fea480 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.7.0.0"; - sha256 = "06qln09d57l084nvh1js3k6074vl8yzih5kwfpp43gsy8in2dspx"; + version = "0.7.1.0"; + sha256 = "06hkb8v6rjpw95vf16xh547igxxzddr6wpjiwhqwpwhz2alavk2v"; isLibrary = true; isExecutable = true; buildDepends = [ cabalMacosx reactiveBanana wx wxcore ]; -- GitLab From b7b8313c976c7cd2842637bced3bb700b73ed4a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1314/5607] haskell-reactive-banana: update to version 0.7.1.0 --- .../libraries/haskell/reactive-banana/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index a80e911eefa..467addefeeb 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,14 +1,10 @@ -{ cabal, hashable, QuickCheck, transformers, unorderedContainers -, vault -}: +{ cabal, hashable, transformers, unorderedContainers, vault }: cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.0.1"; - sha256 = "0nd6j2782x7i12xw480qgk42jkya9qi0xdas15ik6cmg4c9z1dyk"; - buildDepends = [ - hashable QuickCheck transformers unorderedContainers vault - ]; + version = "0.7.1.0"; + sha256 = "0diklfkc4fq05g5fhgcdkx8y0vmq26zfnmfkj95yvmwks8p9k22r"; + buildDepends = [ hashable transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Practical library for functional reactive programming (FRP)"; -- GitLab From 659895febd4c4e1183acacbd3264d59cb2adff77 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1315/5607] haskell-sendfile: update to version 0.7.8 --- pkgs/development/libraries/haskell/sendfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index 150ac8f9d53..455328ec9cb 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "sendfile"; - version = "0.7.7"; - sha256 = "0pwzgmgc87xms4r7pqymq56qgi601pk195kj62rll05qip6mrba0"; + version = "0.7.8"; + sha256 = "0xy9ciikr444gblh3r8z3w4h4rcrfjfciw3dvxgzbygqs5dy6yxl"; buildDepends = [ network ]; meta = { homepage = "http://hub.darcs.net/stepcut/sendfile"; -- GitLab From 0d61261b4ca1f1d3f1c13e048a0173b5b898d4a4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1316/5607] haskell-shelly: update to version 0.14.2.2 --- 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 a7f434bfb2c..9f67c6ff1b4 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.14.2.1"; - sha256 = "0zddrb17i9aazwziazjzcb96n6m794qyj3h85whph06y4krbygnl"; + version = "0.14.2.2"; + sha256 = "10wnmbs8bfj5m7z8gxj4z5ncvrx55br4mcfgs9x2w1avjzq5yhq3"; buildDepends = [ mtl systemFileio systemFilepath text time unixCompat ]; -- GitLab From 54a881f1226799f23db6b9e62dfee3d81788267a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1317/5607] haskell-stylish-haskell: update to version 0.5.3.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 59c10c40133..ef02145a2a7 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.2.0"; - sha256 = "1g02ih4hgn2chv56vy8dcql7x421w15m4fsgqnff236znxarn0v7"; + version = "0.5.3.0"; + sha256 = "1qg24cm2mxkskh701zcg5g8l5hnh3nkaw71mijxr80izls1wlf0z"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From fa6807fa2a0ad38beab247f037971c0ac942a884 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1318/5607] haskell-tls: update to version 1.0.1 --- 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 fc2fb731c61..81901c3d587 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.0.0"; - sha256 = "1d82s5h75dh1bqi592q8gm37wnmpl6n2zajz03n51qysa6w90cvm"; + version = "1.0.1"; + sha256 = "1p0v0lrc3hkgyhczz3w9krxnnrlq1w75z4jb9vba0ygq5bxj3d53"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From b74182cb9b3b02f8933a878de720e47f56b0942c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1319/5607] haskell-unlambda: update to version 0.1.3 --- pkgs/development/libraries/haskell/unlambda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index 5ee133d0978..474bb1a8b09 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unlambda"; - version = "0.1.2"; - sha256 = "12x7jc5nwbhkhnylg9l29nr5y8p322avhb9zc0w2apy3fvrq7y93"; + version = "0.1.3"; + sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89"; isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; -- GitLab From 7be8dc38a1bd3695d871342799ab011346b82e6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1320/5607] haskell-vector-space: update to version 0.8.4 --- 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 3a3cc4a561e..60762ce3f9b 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.3"; - sha256 = "1wiwzbzp2fcavps0fqc9rwm50b2yv0ysgs78d29mvwcya1ywwxgw"; + version = "0.8.4"; + sha256 = "1hrilbv44lrqm9p3z97xw8nlgxam98abll4iqik8a4d6ky225bwq"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { description = "Vector & affine spaces, linear maps, and derivatives"; -- GitLab From 8cdcbc91e255e9cfef593ee4aca763a6c7e29684 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:29 +0100 Subject: [PATCH 1321/5607] haskell-wai-app-static: update to version 1.3.0.3 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index f7f858b17f2..442d59d8988 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "1.3.0.2"; - sha256 = "0z49s4kc365q3brfkgdnja964h3h3yc3wypccnkj71dl11n040zq"; + version = "1.3.0.3"; + sha256 = "00fa2gjm26yhcy1g8k7hr81f5vbvqfcar7xzx25ibfshv64lyqkx"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoConduit cryptohash fileEmbed httpDate httpTypes mimeTypes -- GitLab From 6293ad030718e794ca277372072771dba2e926d5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:30 +0100 Subject: [PATCH 1322/5607] haskell-warp: update to version 1.3.4.2 --- pkgs/development/libraries/haskell/warp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 2d9fa98d5ce..53e819a9cc0 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.4.1"; - sha256 = "09slbxbk88sjdgs3mibsvp17c85mn2r2sp67fchkmqkhf40lhcxw"; + version = "1.3.4.2"; + sha256 = "1qh986ljnlz1607aypjiqmk62wjs9rzc4dffab5isipg199vshwj"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile -- GitLab From 78a308f6f50bb51aed960dd47df7d313a80d491a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:30 +0100 Subject: [PATCH 1323/5607] haskell-BNFC-meta: update to version 0.4.0.1 --- pkgs/development/tools/haskell/BNFC-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index 198fb89f33c..e18a63cd86c 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "BNFC-meta"; - version = "0.4"; - sha256 = "0qmkc2h4fqryvq763k6skx6c24h9njh4bsdspfbyq1nzxxb9mvy0"; + version = "0.4.0.1"; + sha256 = "0x31a25njbgd3r8shh7rrqa9qq66iqjhh82k538p9bd2hblg30ka"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; noHaddock = true; meta = { -- GitLab From 2531a08ef9e24e236005b79a6325dd43ebaa35af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:30 +0100 Subject: [PATCH 1324/5607] haskell-splot: update to version 0.3.5 --- pkgs/development/tools/haskell/splot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 4541bece004..12d603bc736 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "splot"; - version = "0.3.4"; - sha256 = "1qfi8vqm4zliz0lmi6njicm8xha6w8w55il09k0d1w5akwi93x5j"; + version = "0.3.5"; + sha256 = "1bayh9s0jj8874w7lv9m11h2f609h30ywgrp438h57jq1prs2wlk"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From e2e152688445fd0b9b2f85a639cfdcc106c1bb6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Nov 2012 10:08:30 +0100 Subject: [PATCH 1325/5607] haskell-timeplot: update to version 1.0.18 --- pkgs/development/tools/haskell/timeplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 68cd981410d..ffdfa7869e0 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "timeplot"; - version = "1.0.14"; - sha256 = "11caiv1dp7gannvkz30p2dkna61pqa9lzb2z755lzbbzbl79y665"; + version = "1.0.18"; + sha256 = "1q4kzzqmr7bx97wfaasrkzii6b9zpxcxggshpsjv02bwb1hazxmc"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 59a1d74ffba2b89469f1fcf5d1ece19601e7f4e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Nov 2012 14:56:43 +0100 Subject: [PATCH 1326/5607] firefox: Fix hash --- pkgs/applications/networking/browsers/firefox/16.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/16.0.nix b/pkgs/applications/networking/browsers/firefox/16.0.nix index 70c04faa2e9..a9a10fbc4ec 100644 --- a/pkgs/applications/networking/browsers/firefox/16.0.nix +++ b/pkgs/applications/networking/browsers/firefox/16.0.nix @@ -27,7 +27,7 @@ rec { # Fall back to this url for versions not available at releases.mozilla.org. "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "842d852b31a388d4cf3ac59bc89e8611474e2ec7"; + sha1 = "0ffe96896583e92561b341330ab09ddc50140dd1"; }; commonConfigureFlags = -- GitLab From 2a58708d7406cf27ae70931527c9e63d6fd53664 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 2 Nov 2012 23:56:13 +0100 Subject: [PATCH 1327/5607] acpid: Update to version 2.0.17. The reason behind this is because /proc/acpi/event has long been deprecated in kernel 2.6.24 and is only there far backwards-compatibility reasons. New ACPI events are delivered by either the input layer or the netlink interface. As we no longer use kernels down to 2.6.24, I guess it's safe to make this switch. Signed-off-by: aszlig --- pkgs/os-specific/linux/acpid/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index 40db323c522..fe1792478d6 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "acpid-1.0.10"; - + name = "acpid-2.0.17"; + src = fetchurl { - url = "mirror://sourceforge/acpid/${name}.tar.gz"; - sha256 = "0q27adx0c0bzvy9f9zfny69iaay3b4b79b693fhaq1bkvph3qw12"; + url = "http://tedfelix.com/linux/${name}.tar.xz"; + sha256 = "0gksl6z3sb6yyk7bdmldxsrncvprd3rny0i8ggl4m95nvv3x5drn"; }; preBuild = '' @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://acpid.sourceforge.net/; + homepage = http://tedfelix.com/linux/acpid-netlink.html; description = "A daemon for delivering ACPI events to userspace programs"; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; }; } -- GitLab From 3d76661bd81003a87140d4ee9b30e568c1562717 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 3 Nov 2012 11:52:12 +0100 Subject: [PATCH 1328/5607] haskell-boomerang: add version 1.3.3 --- .../libraries/haskell/boomerang/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/boomerang/default.nix diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix new file mode 100644 index 00000000000..963448a56e7 --- /dev/null +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -0,0 +1,13 @@ +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "boomerang"; + version = "1.3.3"; + sha256 = "1i44j3qyjkq69h65wfsrps5zp097i3nh9fwcb2f1spr8nznb5mff"; + buildDepends = [ mtl text ]; + meta = { + description = "Library for invertible parsing and printing"; + 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 a821914ef6b..ee627aaf78b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -526,6 +526,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bson = callPackage ../development/libraries/haskell/bson {}; + boomerang = callPackage ../development/libraries/haskell/boomerang {}; + byteorder = callPackage ../development/libraries/haskell/byteorder {}; bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {}; -- GitLab From a28fe192038995f8267b9d280bc4483e35952825 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Nov 2012 12:44:47 +0100 Subject: [PATCH 1329/5607] chromium: Update dev and beta channels. beta: 23.0.1271.60 (build successful) dev: 24.0.1312.2 (build successful after patching) The development version needs a patch in order to build properly against PulseAudio. Issue and origin of the patch can be found here: http://crbug.com/157876 Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 10 +++++++++- .../networking/browsers/chromium/sources.nix | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index cb0561fa09a..c8a470ce9da 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -88,6 +88,13 @@ let pre23 = versionOlder sourceInfo.version "23.0.0.0"; in optional pre23 ./enable_seccomp.patch; + maybeFixPulseAudioBuild = let + post23 = !versionOlder sourceInfo.version "24.0.0.0"; + in optional (post23 && cfg.pulseaudio) (fetchurl { + url = http://archrepo.jeago.com/sources/chromium-dev/pulse_audio_fix.patch; + sha256 = "1w91mirrkqigdhsj892mqxlc0nlv1dsp5shc46w9xf8nl96jxgfb"; + }); + in stdenv.mkDerivation rec { name = "${packageName}-${version}"; packageName = "chromium"; @@ -121,7 +128,8 @@ in stdenv.mkDerivation rec { patches = optional cfg.cups ./cups_allow_deprecated.patch ++ optional cfg.pulseaudio ./pulseaudio_array_bounds.patch - ++ maybeSeccompPatch; + ++ maybeSeccompPatch + ++ maybeFixPulseAudioBuild; postPatch = optionalString cfg.openssl '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index b8d010340b3..e829f00471c 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "24.0.1297.0"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1297.0.tar.bz2"; - sha256 = "1qwqpj5xnv9fsi8k79c6fzlry32h47w6chxabz3l819c008yrqa4"; + version = "24.0.1312.2"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-24.0.1312.2.tar.bz2"; + sha256 = "155l6sm76cp2vzmm673dnb0vcz7akrz6xfp6jsmaa1175h0yal6h"; }; beta = { - version = "23.0.1271.40"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.40.tar.bz2"; - sha256 = "151yp9rw7v693mw4glmswl7ls2yx3zk0sz1n646brs5wrnbci9l0"; + version = "23.0.1271.60"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.60.tar.bz2"; + sha256 = "1xsa27ay37jls9jiwqn7wfsc4ag02qd316gszb226hp2vhfv6pf2"; }; stable = { version = "22.0.1229.94"; -- GitLab From d23c7564c7eb0095d4f14c4a882b2e1c3bc8e507 Mon Sep 17 00:00:00 2001 From: Eduard Carreras Date: Sat, 3 Nov 2012 21:52:08 +0100 Subject: [PATCH 1330/5607] Update google talk plugin to 3.10.2.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 009170d284b..811847920c5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -45,18 +45,18 @@ in stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; - version = "3.9.1.0"; + version = "3.10.2.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "1bxabczinl94wb0p0qbir392r76ans9fzjwli504pcaaimp4159k"; + sha256 = "0ivjmqrxy3xkwqjp20aqz47smdcdds0i82pfyb5k9jywi8afvchr"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "04zmkbxpai84qbywg8slgpz2cab86fska265wd52jv26ihs4iawf"; + sha256 = "1bac95r9721sc7fsklsmv0lq673901zppdgabjjarpnx8z280jvj"; } else throw "Google Talk does not support your platform."; -- GitLab From 6c48c3c230f7ca797dbe3d3793e94e2454416a3d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 4 Nov 2012 21:58:13 +0400 Subject: [PATCH 1331/5607] Add libpng dependency to MPlayer - screenshots now work --- pkgs/applications/video/MPlayer/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 13ebd39734e..944af1c2657 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -16,6 +16,8 @@ , x264Support ? false, x264 ? null , jackaudioSupport ? false, jackaudio ? null , pulseSupport ? false, pulseaudio ? null +# For screenshots +, libpngSupport ? true, libpng ? null }: assert x11Support -> (libX11 != null && libXext != null && mesa != null); @@ -35,7 +37,7 @@ assert theoraSupport -> libtheora != null; assert x264Support -> x264 != null; assert jackaudioSupport -> jackaudio != null; assert pulseSupport -> pulseaudio != null; - +assert libpngSupport -> libpng != null; let @@ -109,7 +111,9 @@ stdenv.mkDerivation rec { ++ optional screenSaverSupport libXScrnSaver ++ optional lameSupport lame ++ optional vdpauSupport libvdpau - ++ optional speexSupport speex; + ++ optional speexSupport speex + ++ optional libpngSupport libpng + ; buildNativeInputs = [ yasm ]; -- GitLab From af2fd342cd7114b7d5c39a4fd37c1a89c15c6496 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 4 Nov 2012 23:52:19 +0400 Subject: [PATCH 1332/5607] Updating SBCL to freshest release 1.1.1. Replacing SBCL upstream tracking expression with a new version in a new format. Minuses: gave up on defining everything in Nix language (now update expression is a series of actions to do when downloading fresh release, it is actually interpreted by shell), now Nix expression contains meaningful whitespace (the area to regenerate is determined by the line with a specific comment and the closing brace on the otherwise empty line). Plusses: only one extra file which could even be moved out-of-tree if desired, clean semantics for traversing multiple links (it is not found in either Debian uscan or Gentoo euscan), the main expression is in one file and is less different from usual style. --- .../upstream-updater/update-walker.sh | 127 ++++++++++++++++++ pkgs/development/compilers/sbcl/default.nix | 11 +- .../compilers/sbcl/default.upstream | 9 ++ .../compilers/sbcl/src-for-default.nix | 9 -- .../compilers/sbcl/src-info-for-default.nix | 7 - 5 files changed, 146 insertions(+), 17 deletions(-) create mode 100755 pkgs/build-support/upstream-updater/update-walker.sh create mode 100644 pkgs/development/compilers/sbcl/default.upstream delete mode 100644 pkgs/development/compilers/sbcl/src-for-default.nix delete mode 100644 pkgs/development/compilers/sbcl/src-info-for-default.nix diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh new file mode 100755 index 00000000000..12b12a11e89 --- /dev/null +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -0,0 +1,127 @@ +#! /bin/sh + +own_dir="$(cd "$(dirname "$0")"; pwd)" + +CURRENT_URL= + +url () { + CURRENT_URL="$1" +} + +version_unpack () { + sed -re ' + s/[.]/ /g; + s@/@ / @g + s/-(rc|pre)/ -1 \1 /g; + s/-(gamma)/ -2 \1 /g; + s/-(beta)/ -3 \1 /g; + s/-(alpha)/ -4 \1 /g; + ' +} + +version_repack () { + sed -re ' + s/ -[0-9]+ ([a-z]+) /-\1/g; + s@ / @/@g + s/ /./g; + ' +} + +version_sort () { + version_unpack | + sort -t ' ' -k 1n -k 2n -k 3n -k 4n -k 5n -k 6n -k 7n -n | tac | + version_repack +} + +position_choice () { + head -n "${1:-1}" | tail -n "${2:-1}" +} + +matching_links () { + "$own_dir"/urls-from-page.sh "$CURRENT_URL" | grep -E "$1" +} + +link () { + CURRENT_URL="$(matching_links "$1" | position_choice "$2" "$3")" + echo "Linked by: $*" + echo "URL: $CURRENT_URL" >&2 +} + +version_link () { + CURRENT_URL="$(matching_links "$1" | version_sort | position_choice "$2" "$3")" + echo "Linked version by: $*" + echo "URL: $CURRENT_URL" >&2 +} + +redirect () { + CURRENT_URL="$(curl -I -L --max-redirs "${1:-99}" "$CURRENT_URL" | + grep -E '^Location: ' | position_choice "${2:-999999}" "$3" | + sed -e 's/^Location: //; s/\r//')" + echo "Redirected: $*" + echo "URL: $CURRENT_URL" >&2 +} + +replace () { + sed -re "s $1 $2 g" +} + +process () { + CURRENT_URL="$(echo "$CURRENT_URL" | replace "$1" "$2")" + echo "Processed: $*" + echo "URL: $CURRENT_URL" >&2 +} + +version () { + CURRENT_VERSION="$(echo "$CURRENT_URL" | replace "$1" "$2")" + echo "Version: $CURRENT_VERSION" >&2 +} + +hash () { + CURRENT_HASH="$(nix-prefetch-url "$CURRENT_URL")" +} + +name () { + CURRENT_NAME="$1" +} + +retrieve_version () { + PACKAGED_VERSION="$(nix-instantiate --eval-only '' -A "$CURRENT_NAME".meta.version | xargs)" +} + +target () { + CURRENT_TARGET="$1" +} + +update_found () { + echo "Compare: $CURRENT_VERSION vs $PACKAGED_VERSION" + [ "$CURRENT_VERSION" != "$PACKAGED_VERSION" ] +} + +do_regenerate () { + cat "$1" | grep -F '# Generated upstream information' -B 999999; + echo " rec {" + echo " baseName=\"$CURRENT_NAME\";" + echo " version=\"$CURRENT_VERSION\";" + echo ' name="${baseName}-${version}";' + echo " hash=\"$CURRENT_HASH\";" + echo " url=\"$CURRENT_URL\";" + cat "$1" | grep -F '# Generated upstream information' -A 999999 | grep -E '^ *[}]; *$' -A 999999; +} + +do_overwrite () { + hash + do_regenerate "$1" > "$1.new.tmp" + mv "$1.new.tmp" "$1" +} + +full_path () { + echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")" +} + +process_config () { + source "$(full_path "$1")" + retrieve_version + update_found && do_overwrite "$CURRENT_TARGET" +} + +process_config "$1" diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index eb3f47a15c0..adffb7c5074 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,7 +1,14 @@ a : let fetchurl = a.fetchurl; - s= import ./src-for-default.nix; + s= # Generated upstream information + rec { + baseName="sbcl"; + version="1.1.1"; + name="${baseName}-${version}"; + hash="1gkwz0248zl2nhx79ck5wiyxj8407c10gcrpgg1c67102pgyiikv"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.1/sbcl-1.1.1-source.tar.bz2"; + }; buildInputs = with a; [ clisp makeWrapper ]; @@ -73,12 +80,14 @@ rec { '') ["doBuild" "minInit" "addInputs"]; inherit(s) name; + inherit(s) version; meta = { description = "Lisp compiler"; homepage = "http://www.sbcl.org"; license = "bsd"; maintainers = [a.lib.maintainers.raskin]; platforms = with a.lib.platforms; all; + inherit(s) version; }; } diff --git a/pkgs/development/compilers/sbcl/default.upstream b/pkgs/development/compilers/sbcl/default.upstream new file mode 100644 index 00000000000..de69a2828c6 --- /dev/null +++ b/pkgs/development/compilers/sbcl/default.upstream @@ -0,0 +1,9 @@ +name sbcl +target default.nix +url http://sf.net/projects/sbcl/files/sbcl/ +version_link '/sbcl/[0-9.]+/$' +link "source.tar.bz2" +version '.*/sbcl-([0-9.]+)-source.*' '\1' +redirect +process 'http://[a-z]+[.]dl[.]sourceforge[.]net/' 'mirror://sourceforge/' +process '[?].*' '' diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix deleted file mode 100644 index fc23f901e5a..00000000000 --- a/pkgs/development/compilers/sbcl/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="1.1.0"; - name="sbcl-1.1.0"; - hash="128zb7i6w2a93yjvh8mc6f36w47psnda671y81a9yl6mr5696k00"; - url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-source.tar.bz2"; - advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.1.0/sbcl-1.1.0-source.tar.bz2"; - - -} diff --git a/pkgs/development/compilers/sbcl/src-info-for-default.nix b/pkgs/development/compilers/sbcl/src-info-for-default.nix deleted file mode 100644 index 597aded1792..00000000000 --- a/pkgs/development/compilers/sbcl/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - baseName = "sbcl"; - downloadPage = "http://sourceforge.net/projects/sbcl/files/sbcl/"; - choiceCommand = "head -n 1 | sed -re 's%.*/([0-9.]+)/%http://downloads.sourceforge.net/project/sbcl/sbcl/\\1/sbcl-\\1-source.tar.bz2%'"; - sourceRegexp = "[/][0-9.]+/\$"; - versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/"; -} -- GitLab From 993601a7c5b8751da033f119a75f0607cecd8004 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 5 Nov 2012 09:45:03 +0100 Subject: [PATCH 1333/5607] screen: Enable PAM support by default. I hope noone is unhappy with enabling PAM bu default. Whover doesn't want PAM to take care of authentication can still use the "password" configuration directive. Signed-off-by: aszlig --- pkgs/tools/misc/screen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 329754ab5f5..930cd67bb13 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses}: +{ stdenv, fetchurl, ncurses, pam }: stdenv.mkDerivation rec { name = "screen-4.0.3"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { }; preConfigure = '' - configureFlags="--enable-telnet --infodir=$out/share/info --mandir=$out/share/man" + configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man" sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in ''; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses pam ]; doCheck = true; -- GitLab From 234b4affa381b1900fadec83aca42b9211777ccc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 11:42:05 +0100 Subject: [PATCH 1334/5607] man-pages: update to version 3.43 --- pkgs/data/documentation/man-pages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index f9e4f1b4371..465d83f8b4c 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.42"; - + name = "man-pages-3.43"; + src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz"; - sha256 = "11kh0ifzqbxk797lq037ixqhpf6h90w9xxygzh796mddg4rr4s9j"; + sha256 = "05fjq8llfxm77mnf2jhly98780xbkakim7b7hbx6kafvvs5zisrf"; }; preBuild = -- GitLab From a4bb7cfc84185f4a7bb121de43bde86c288464c4 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Fri, 2 Nov 2012 11:32:08 +0000 Subject: [PATCH 1335/5607] test-framework-th-prime: add version 0.0.5 --- .../haskell/test-framework-th-prime/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/haskell/test-framework-th-prime/default.nix diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix new file mode 100644 index 00000000000..ebcd608eb6a --- /dev/null +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -0,0 +1,13 @@ +{ cabal, cpphs, haskellSrcExts, testFramework }: + +cabal.mkDerivation (self: { + pname = "test-framework-th-prime"; + version = "0.0.5"; + sha256 = "0lsxnbckh88cq38azml86szdcvx3rhs3is13ib4z0ryfqnv4hhpl"; + buildDepends = [ cpphs haskellSrcExts testFramework ]; + meta = { + description = "Template Haskell for test framework"; + 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 ee627aaf78b..4cf0faa91cf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1570,6 +1570,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testFrameworkTh = callPackage ../development/libraries/haskell/test-framework-th {}; + testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; + testpack = callPackage ../development/libraries/haskell/testpack {}; texmath = callPackage ../development/libraries/haskell/texmath {}; -- GitLab From 54f58e9f2afaca0f73b2a12476ac234561a2ffc0 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Thu, 1 Nov 2012 14:07:15 +0000 Subject: [PATCH 1336/5607] optparse-applicative: add version 0.4.1 --- .../haskell/optparse-applicative/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/optparse-applicative/default.nix diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix new file mode 100644 index 00000000000..75f801eee18 --- /dev/null +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -0,0 +1,14 @@ +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "optparse-applicative"; + version = "0.4.1"; + sha256 = "00byv248662n6pr8gn5b777l0fjg6f0wcxfkbhw0qyhd1ciq8d38"; + buildDepends = [ transformers ]; + meta = { + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + 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 4cf0faa91cf..312ab37ebfe 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1243,6 +1243,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; + optparse_applicative = callPackage ../development/libraries/haskell/optparse-applicative {}; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; pandoc = callPackage ../development/libraries/haskell/pandoc {}; -- GitLab From 6ac427d3915f88c3ddc08f9958bd69c739651df6 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Mon, 5 Nov 2012 13:45:49 +0000 Subject: [PATCH 1337/5607] Update git-annex to 3.20121017 --- .../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 13b3d263ad4..79473242e89 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 @@ -11,14 +11,14 @@ }: let - version = "3.20121010"; + version = "3.20121017"; 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 = "4db543af6cbcb2d92c808c01969425d1fd1a916b37386dcdfe1a3101876ccde2"; + sha256 = "1949efb22cd3154323ee00d3ab62b07158df4024283a67a53134a1fa2efa9841"; name = "git-annex-${version}.tar.gz"; }; -- GitLab From 321ee97b4c219a5580bbbd3a05929a849a70e2bb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:50 +0100 Subject: [PATCH 1338/5607] haskell-darcs: update to version 2.8.3 --- 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 a6b4b9a60de..8ac93af8c46 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.2"; - sha256 = "1gd8028k91hjsd9hvx3pw4h5zsn2ckc7pfp7f1f566dpp1g422v5"; + version = "2.8.3"; + sha256 = "0nbg45i5sgbsc488siqirgysy3z912xghqbwm5hcsl37j910hxch"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From ff8156ac13c5b36a2d5b02923c716381ebf8d4e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:50 +0100 Subject: [PATCH 1339/5607] haskell-GLFW: update to version 0.5.1.0 --- pkgs/development/libraries/haskell/GLFW/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index 59095ba7927..f204bcdf655 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLFW"; - version = "0.5.0.1"; - sha256 = "1zjxw0fn1am9n4bwqn8jwp14cdgyg1cv5v8rrg2bisggw7wdc4c6"; + version = "0.5.1.0"; + sha256 = "190d75w84y9gayxvdz13dnzpyflc5qy4vdg5iv9p2dpcamcih3km"; buildDepends = [ OpenGL ]; extraLibraries = [ libX11 mesa ]; meta = { -- GitLab From 5df5841f55cd4898ac5495bf276191cd8fb2b26a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1340/5607] haskell-GLURaw: update to version 1.3.0.0 --- pkgs/development/libraries/haskell/GLURaw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLURaw/default.nix b/pkgs/development/libraries/haskell/GLURaw/default.nix index 459c7b99e5c..d719e8179d4 100644 --- a/pkgs/development/libraries/haskell/GLURaw/default.nix +++ b/pkgs/development/libraries/haskell/GLURaw/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "GLURaw"; - version = "1.2.0.0"; - sha256 = "06dsazj3zadjahwy926gnjngqg8cb1mhdxh8bg5f3axf3hsvxqp1"; + version = "1.3.0.0"; + sha256 = "1sh87jz9161svsf719y63cr21wf4d7wpbz75g2c2xss301qhafg0"; buildDepends = [ OpenGLRaw ]; extraLibraries = [ freeglut mesa ]; meta = { -- GitLab From eb1dff71ebd4034e9bc0cb37fdc2c40e443da2b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1341/5607] haskell-OpenGLRaw: update to version 1.3.0.0 --- pkgs/development/libraries/haskell/OpenGLRaw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix index b51e12eab65..a6a45bf5b24 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/default.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "OpenGLRaw"; - version = "1.2.0.0"; - sha256 = "1nwk93wlwh7gz2lb1dc88frmwik71g61a7k8xfiib2q5a8a8kf9r"; + version = "1.3.0.0"; + sha256 = "0ifp5inrm48hzpq0x9hlk5cxh2k64y05phmsdb5hydb7r6dcla32"; extraLibraries = [ mesa ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; -- GitLab From 1392f6166a0e0d32cfa3f3b7ab98e11fd97810f6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1342/5607] haskell-dbus: update to version 0.10.4 --- pkgs/development/libraries/haskell/dbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index ba310862948..16cb2c7ca03 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.3"; - sha256 = "1l74whkrznlycl6rc1h63rc1vmvp6q2g8g92imycf8f4sizmigfq"; + version = "0.10.4"; + sha256 = "0cv4sgk1mdxc81jlky21k0y3zg7qii585xiapr1m589r5528gj2f"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes -- GitLab From 202ade2109a3f35e71dd8f7145daf26a75bccaa2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1343/5607] haskell-ghc-events: update to version 0.4.2.0 --- pkgs/development/libraries/haskell/ghc-events/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index dfbf5181d40..4cba5ed74e9 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ghc-events"; - version = "0.4.0.1"; - sha256 = "1ic8r3hn1m500xwq1n8wz7fp65vm43n7dkjnn341xdmpd1546wlc"; + version = "0.4.2.0"; + sha256 = "0209r9g5w4ifsaw3dkfra6kma1vyk50dc306an72mcwnp4l7dv4l"; isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; -- GitLab From e0522ca42bac90df44a4cc6a88a876fc00e3e004 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1344/5607] haskell-gitit: update to version 0.10.0.2 --- pkgs/development/libraries/haskell/gitit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 7de302aee6d..f1230ad2f39 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.0.1"; - sha256 = "0dx4jq7j0s6h5lfl8qrr4qnyb3j0cnnc1c786yf8kcmhk04n028f"; + version = "0.10.0.2"; + sha256 = "0cnql35h4laqpaymg32dmszwzc74qmbmmjas44gcsd8v5n6f701i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize zlib ]; - jailbreak = true; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; -- GitLab From a029dcbbea168859546160936ac85286c204ded4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1345/5607] haskell-html-conduit: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/html-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index b3482292b04..ab0d5b7b969 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "html-conduit"; - version = "0.1.0.2"; - sha256 = "0r9bnzz6r5q2fgichg8vfjgwyig33diqvj5pxchk97m3m5rqj5k4"; + version = "0.1.0.3"; + sha256 = "002862if2i9r0ww4q0iapp0j745970pfcmfpi3ni64k41qfqapsn"; buildDepends = [ conduit filesystemConduit resourcet systemFilepath tagstreamConduit text transformers xmlConduit xmlTypes -- GitLab From c51bb70aaebb4b8fb9cd82ee8a9ed4990707cd73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1346/5607] haskell-shakespeare-css: update to version 1.0.2 --- .../libraries/haskell/shakespeare-css/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 54bc170f069..61c783c6727 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,10 +1,10 @@ -{ cabal, parsec, shakespeare, text }: +{ cabal, parsec, shakespeare, text, transformers }: cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.1.5"; - sha256 = "0arfc64wsyn0af34blbjgxxr9xxk9k61p7zy4b7m3ynnpxqh2hzn"; - buildDepends = [ parsec shakespeare text ]; + version = "1.0.2"; + sha256 = "02sk9ql357ybj1h5a4xjn06di5zdafibabhy32j5vs9kpyamvck3"; + buildDepends = [ parsec shakespeare text transformers ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into css at compile time"; -- GitLab From c19546cda7e840caecdf4fb53721b836a9218a30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:51 +0100 Subject: [PATCH 1347/5607] haskell-shakespeare-js: update to version 1.0.1 --- 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 bed71a7c14e..c86a3fd2a74 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.6"; - sha256 = "0ilzg5g2pvq36cv5fhyv9sqz3nnj9gscrc2y4vlqkm6f1ks3gyg8"; + version = "1.0.1"; + sha256 = "1djv34x2nb634lmv28bm2qfsjr0vs0rlq98y8yaiyjdphkzhlaax"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; -- GitLab From efeadc8d3a0d94bc12eaa3de07e74507fbd0c544 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1348/5607] haskell-shakespeare: update to version 1.0.2 --- 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 fca3d04a305..11a03eaa9b2 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.4"; - sha256 = "01gw31g75v8r8hjvkv7mxvx7736ib9x9nqpxavpbrfplyxgk2y31"; + version = "1.0.2"; + sha256 = "1n7qymrn2f83a11zdh2950pf8rsqnc52blwi02amjxsvy2piidzm"; buildDepends = [ parsec text ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; -- GitLab From d14453b73ca7e077cb6e188d734610623dc71098 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1349/5607] haskell-stylish-haskell: update to version 0.5.4.0 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index ef02145a2a7..fc875d75bd0 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.3.0"; - sha256 = "1qg24cm2mxkskh701zcg5g8l5hnh3nkaw71mijxr80izls1wlf0z"; + version = "0.5.4.0"; + sha256 = "1bnsjs5s760xnk3s1l7kjqr2svxp4a881p9z2slaywi5kn0v5mwf"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 41268019a2f61f0c0123e061c3342da027c0f561 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1350/5607] haskell-vty: update to version 4.7.0.20 --- pkgs/development/libraries/haskell/vty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 0e32dc1c81b..2642af7457e 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "4.7.0.18"; - sha256 = "1a414k8fcnjinr01ly49wyk025zacyznw7gclpa83qm0wn0q7bs3"; + version = "4.7.0.20"; + sha256 = "15slw4zpvfkx9qwj2g5ndcxwbw0kkhyq8frvh9kharqd0zqzgqzb"; buildDepends = [ deepseq mtl parallel parsec terminfo utf8String vector ]; -- GitLab From 22d12135b9ae7960f9751915735458d0473fefe7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1351/5607] haskell-xml-conduit: update to version 1.0.3.2 --- 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 3f2e6e6af4f..3978ae14843 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.1"; - sha256 = "1000gbdwfp98s44kkp793lmqrdm046phwxcvlik20b2485ml8yrj"; + version = "1.0.3.2"; + sha256 = "0vli0pj0d8nn4f7i8aihv6l931am0h0xsmh7k5pkh8lzvdgwihfi"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit dataDefault failure monadControl -- GitLab From 42c1c63919250fd2eb754eec08565c791b1d42b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1352/5607] haskell-splot: update to version 0.3.6 --- pkgs/development/tools/haskell/splot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 12d603bc736..9f35054b4c0 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "splot"; - version = "0.3.5"; - sha256 = "1bayh9s0jj8874w7lv9m11h2f609h30ywgrp438h57jq1prs2wlk"; + version = "0.3.6"; + sha256 = "0fxjji6b0v3hf4pn1cbh88nvp4n4bfgfkiga6l149flk5nmlapqx"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 4fa4749b4f284e00ef2a705a47f3836688b9fed0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1353/5607] haskell-threadscope: update to version 0.2.2 --- pkgs/development/tools/haskell/threadscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index f0d80e84c5a..4928c40e129 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "threadscope"; - version = "0.2.1"; - sha256 = "08s9fbwg33rgbqjdx7n90q83livfay9khr2ddjwj8brw8k1wkmxg"; + version = "0.2.2"; + sha256 = "07cmza391hjq77lx8m9g2287bzsh5ffka3s07fr49v6x6hivsic3"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 3385f76ae17561cc25c43cfcf7d1eef864442838 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1354/5607] haskell-uuagc-cabal: update to version 1.0.3.0 --- pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 24eded529b3..3c2f0351672 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.2.0"; - sha256 = "0nvnyc6c1611rziglpp0ywqkgg9sgfi9ph33ya33k5zv3jxxh1q0"; + version = "1.0.3.0"; + sha256 = "0kr0k8pgz52n4g7x998djwncfr9byyxg5slqq80qijh06v01bm79"; buildDepends = [ Cabal filepath mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; -- GitLab From 5ce4e11e40e20f47e8e8556acced2df934308910 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:19:52 +0100 Subject: [PATCH 1355/5607] haskell-uuagc: update to version 0.9.42.1 --- pkgs/development/tools/haskell/uuagc/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index 833189b89ac..6289abd7120 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,16 +1,12 @@ -{ cabal, filepath, haskellSrcExts, mtl, uuagcBootstrap, uuagcCabal -, uulib -}: +{ cabal, filepath, haskellSrcExts, mtl, uuagcCabal, uulib }: cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.40.3"; - sha256 = "053p7cbis843zn0qg8imc77xnfj4kna8wwfanxbj8kcapcqvwihl"; + version = "0.9.42.1"; + sha256 = "1xyzvv9rqzqdc7kd2rncafnglfg699sn3f4987kbsxzhilvmhw78"; isLibrary = true; isExecutable = true; - buildDepends = [ - filepath haskellSrcExts mtl uuagcBootstrap uuagcCabal uulib - ]; + buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; -- GitLab From 2d5732e48d6cea7701276ec651bd88a7c0dc2d73 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:25:02 +0100 Subject: [PATCH 1356/5607] haskell: update OpenGL to version 2.6.0.0 and GLUT to version 2.3.1.0. --- .../haskell/GLUT/{2.3.0.0.nix => 2.3.1.0.nix} | 10 +++------ .../OpenGL/{2.5.0.0.nix => 2.6.0.0.nix} | 5 +++-- pkgs/top-level/haskell-packages.nix | 22 ++++++++----------- 3 files changed, 15 insertions(+), 22 deletions(-) rename pkgs/development/libraries/haskell/GLUT/{2.3.0.0.nix => 2.3.1.0.nix} (50%) rename pkgs/development/libraries/haskell/OpenGL/{2.5.0.0.nix => 2.6.0.0.nix} (82%) diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix similarity index 50% rename from pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix rename to pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix index 4c50197a6d7..d65dfa15c6f 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix @@ -1,17 +1,13 @@ { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL -, OpenGLRaw, StateVar, Tensor, fetchurl +, OpenGLRaw, StateVar, Tensor }: cabal.mkDerivation (self: { pname = "GLUT"; - version = "2.3.0.0"; - sha256 = "10rh57w3lx8fs0xy24lqilv5a5sgq57kshydja41r6fq9wdvwp99"; + version = "2.3.1.0"; + sha256 = "1ijx636py7gpm79r0qjsv8f4pw3m1cgz80gnn3qghs3lw0l8f1ci"; buildDepends = [ OpenGL OpenGLRaw StateVar Tensor ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; - patches = [ - (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/e962ebb7bed7e61e4591ae67f86199d557c7d54c.patch"; sha256 = "0s9xrkz1pkbkhsjzwbj4ayynmvzp5cckkl2lrizcjwcnqv83srmq"; }) - (fetchurl { url = "https://github.com/haskell-opengl/GLUT/commit/fced812bc726c208064a2c48e411f4d609444abc.patch"; sha256 = "1kc7ic70lq43v8ikbcgbs5f2l4wzaz9vylhkmp38q26zs6qzbv07"; }) - ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; diff --git a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix similarity index 82% rename from pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix rename to pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix index 9d8c1bb29ae..6ea45f6d08c 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix @@ -4,10 +4,11 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.5.0.0"; - sha256 = "1kpakn5i4aka67mqcpfq9jpl38h409x63zd14y35abpm6h3x8m3j"; + version = "2.6.0.0"; + sha256 = "0rbdx73gcjx4ksqdjishlnn1ibxj21cqg5pxphy8bsphlygzc76l"; buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; extraLibraries = [ libX11 mesa ]; + noHaddock = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 312ab37ebfe..45308dc66e4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -123,14 +123,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); async = self.async_2_0_1_4; # 7.6 ok cgi = self.cgi_3001_1_8_3; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok - GLUT = self.GLUT_2_3_0_0; # 7.6 ok + GLUT = self.GLUT_2_3_1_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok html = self.html_1_0_1_2; # 7.6 ok HTTP = self.HTTP_4000_2_6; # 7.6 ok HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_0_1; # 7.6 ok - OpenGL = self.OpenGL_2_5_0_0; # 7.6 ok + OpenGL = self.OpenGL_2_6_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_1_1; # 7.6 ok @@ -828,8 +828,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { - GLUT = self.GLUT23; - OpenGL = self.OpenGL25; + OpenGL = self.OpenGL_2_6_0_0; + GLUT = self.GLUT_2_3_1_0; }; glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; @@ -842,12 +842,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT_2_2_2_1 = callPackage ../development/libraries/haskell/GLUT/2.2.2.1.nix { OpenGL = self.OpenGL_2_4_0_2; }; - GLUT_2_3_0_0 = callPackage ../development/libraries/haskell/GLUT/2.3.0.0.nix { - OpenGL = self.OpenGL_2_5_0_0; + GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { + OpenGL = self.OpenGL_2_6_0_0; }; - GLUT22 = self.GLUT_2_2_2_1; - GLUT23 = self.GLUT_2_3_0_0; - GLUT = self.GLUT_2_3_0_0; + GLUT = self.GLUT_2_3_1_0; gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs) gtk; @@ -1236,10 +1234,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; - OpenGL_2_5_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.5.0.0.nix {}; - OpenGL24 = self.OpenGL_2_4_0_2; - OpenGL25 = self.OpenGL_2_5_0_0; - OpenGL = self.OpenGL_2_5_0_0; + OpenGL_2_6_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.0.nix {}; + OpenGL = self.OpenGL_2_6_0_0; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; -- GitLab From 860929e68bc26553efad645339c1aca94a853b1b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 16:25:21 +0100 Subject: [PATCH 1357/5607] haskell-gloss: jailbreak to fix build with recent versions of OpenGL --- pkgs/development/libraries/haskell/gloss/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 8fe5080b1ac..6aa82a78a7c 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "1.7.6.5"; sha256 = "0s02vbcyfqzlmjw68kp3arn3vvmldh04460gm050vbc6rqpc8dkv"; buildDepends = [ bmp GLUT OpenGL ]; + jailbreak = true; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; -- GitLab From ae8a3386e4fb9a7b789befb0a81f090ed5068197 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Nov 2012 16:58:54 +0100 Subject: [PATCH 1358/5607] Email::Sender: Update to 0.120002 --- 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 0604ae46e4f..1cb58cfc4e2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1439,10 +1439,10 @@ rec { }; EmailSender = buildPerlPackage rec { - name = "Email-Sender-0.110001"; + name = "Email-Sender-0.120002"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "0z4nl7aizbailraqwkkqhx6k3hdz67wxszjfhd5yg2vn06ybsjwj"; + sha256 = "1cp735ndmh76xzijsm1hd0yh0m9yj34jc8akjhidkn677h2021dc"; }; buildInputs = [ TestMore ]; propagatedBuildInputs = -- GitLab From a1c54023ceede337c0de03342ea9ee98a188c1a8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 5 Nov 2012 20:38:51 +0100 Subject: [PATCH 1359/5607] linux-3.0: upgrade to 3.0.51 --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index ad69486622e..a1e26a6d695 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -230,7 +230,7 @@ in import ./generic.nix ( rec { - version = "3.0.49"; + version = "3.0.51"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -238,7 +238,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0h24c0mhxznnlqgqq9yf12ad5g1ya33qjjcahzhaafb7kwvjkqyx"; + sha256 = "0pd33513l02fxp8nikfdwrxcm6rf7l2b6mfwhhkxkwh5gzszaa1m"; }; config = configWithPlatform stdenv.platform; -- GitLab From 97c5b934021121864bfb4072b6778584b24cc548 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 5 Nov 2012 20:39:29 +0100 Subject: [PATCH 1360/5607] linux-3.4: kernel 3.4.18, contains fix for recent ext4 corruption --- 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 af1c8c2d512..8c413c3db31 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.16"; + version = "3.4.18"; 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 = "1dg8zy33vri71yv6zavyfyr5dg2wl4xz5ll8gqa4kjlq8hn8d5s2"; + sha256 = "196m681612k6xq62bf9ryii0vzmj23z605s0xc35x0cqhhx1wq16"; }; config = configWithPlatform stdenv.platform; -- GitLab From b56a899320f65060d09aceac72d4b4764a7af785 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 5 Nov 2012 20:39:57 +0100 Subject: [PATCH 1361/5607] linux-3.6: upgrade to 3.6.6, contains fix for recent ext4 corruption --- pkgs/os-specific/linux/kernel/linux-3.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.6.nix b/pkgs/os-specific/linux/kernel/linux-3.6.nix index 02a509e7df2..b395050c061 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.6.nix @@ -244,7 +244,7 @@ in import ./generic.nix ( rec { - version = "3.6.4"; + version = "3.6.6"; testing = false; preConfigure = '' @@ -253,7 +253,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0y64hd9cdrg9fpkwsww8s7dvq7z55k55a5pd06kkr1kwgjxqnj4a"; + sha256 = "0fdkfxsfrr5by8l51hr5s7x0294pdb5fr58f923wsd64z1m1x283"; }; config = configWithPlatform stdenv.platform; -- GitLab From 31ca4356fbe6640710426ab1cf542026743371f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 20:36:17 +0100 Subject: [PATCH 1362/5607] boost: update to version 1.52.0 --- .../libraries/boost/1.52-headers.nix | 26 ++++++ pkgs/development/libraries/boost/1.52.nix | 86 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/boost/1.52-headers.nix create mode 100644 pkgs/development/libraries/boost/1.52.nix diff --git a/pkgs/development/libraries/boost/1.52-headers.nix b/pkgs/development/libraries/boost/1.52-headers.nix new file mode 100644 index 00000000000..b89273fdd30 --- /dev/null +++ b/pkgs/development/libraries/boost/1.52-headers.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "boost-1.52.0-headers"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/include + tar xf $src -C $out/include --strip-components=1 ./boost_1_52_0/boost + ''; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/boost/1.52.nix b/pkgs/development/libraries/boost/1.52.nix new file mode 100644 index 00000000000..0de11aaed87 --- /dev/null +++ b/pkgs/development/libraries/boost/1.52.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.52.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2"; + sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + 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 9cc10a68968..bb9359fd25c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3331,11 +3331,13 @@ let boost147 = callPackage ../development/libraries/boost/1.47.nix { }; boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost151 = callPackage ../development/libraries/boost/1.51.nix { }; - boost = boost151; + boost152 = callPackage ../development/libraries/boost/1.52.nix { }; + boost = boost152; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; - boostHeaders = boostHeaders151; + boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; + boostHeaders = boostHeaders152; botan = callPackage ../development/libraries/botan { }; -- GitLab From 11094a79607d37c08378f3b441b276a2ba93bf95 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 5 Nov 2012 22:31:30 +0100 Subject: [PATCH 1363/5607] pinentry: update to version 0.8.2 --- pkgs/tools/security/pinentry/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 524a582fcb0..ba4ce8a3e22 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.0"; + name = "pinentry-0.8.2"; src = fetchurl { - url = "mirror://gnupg/pinentry/${name}.tar.gz"; - sha256 = "06phs3gbs6gf0z9g28z3jgsw312dhhpdgzrx4hhps53xrbwpyv22"; + url = "mirror://gnupg/pinentry/${name}.tar.bz2"; + sha256 = "1c9r99ck8072y7nkirddg3p372xadl95y65hyc1m6wn5mavbg12h"; }; buildInputs = let opt = stdenv.lib.optional; in [] @@ -27,14 +27,13 @@ stdenv.mkDerivation rec { buildNativeInputs = [ pkgconfig ]; meta = { + homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG's interface to passphrase input"; + license = "GPLv2+"; longDescription = '' Pinentry provides a console and a GTK+ GUI that allows users to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; - - homepage = http://gnupg.org/aegypten2/; - license = "GPLv2+"; }; } -- GitLab From bb3b603ea70926816fdd8a803bccdcec846ff30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 6 Nov 2012 00:16:13 +0100 Subject: [PATCH 1364/5607] mips linux: Adding a patch to fix an ext3 bug in 3.5 and 3.6 I made it apply to all Mips, although the bug works only for n32 and o32 ABIs. We don't support any n64 by now. --- .../linux/kernel/mips-ext3-n32.patch | 17 +++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/mips-ext3-n32.patch diff --git a/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch new file mode 100644 index 00000000000..fcb6f9177c7 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch @@ -0,0 +1,17 @@ +Dirty patch that makes ext3 work again on 3.5 and 3.6 kernels, +on mips n32. + +http://www.linux-mips.org/archives/linux-mips/2012-11/msg00030.html + +diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c +index 92490e9..bf63d7b 100644 +--- a/fs/ext3/dir.c ++++ b/fs/ext3/dir.c +@@ -228,6 +228,7 @@ out: + + static inline int is_32bit_api(void) + { ++ return 1; + #ifdef CONFIG_COMPAT + return is_compat_task(); + #else diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4fb7563c9a1..0699f09c505 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -262,6 +262,11 @@ rec { patch = ./mips-fpu-sigill.patch; }; + mips_ext3_n32 = + { name = "mips-ext3-n32"; + patch = ./mips-ext3-n32.patch; + }; + guruplug_defconfig = { # Default configuration for the GuruPlug. From # . diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb9359fd25c..49f0918faff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5871,6 +5871,7 @@ let ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 ]; }; @@ -5883,6 +5884,7 @@ let ] ++ lib.optionals (platform.kernelArch == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 ]; }; -- GitLab From 2658eccaea9163e8a1ad5f1977db549bc388605d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 6 Nov 2012 11:23:34 +0100 Subject: [PATCH 1365/5607] zip: Add extra source URL --- pkgs/tools/archivers/zip/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index c7bddfd6de2..2e3f111aba4 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -6,7 +6,10 @@ stdenv.mkDerivation { name = "zip-3.0"; src = fetchurl { - url = ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz; + urls = [ + ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz + http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; -- GitLab From 43c9c791e03aaa4a481e17ec1c214b1f3c5b4114 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Tue, 6 Nov 2012 11:23:48 +0100 Subject: [PATCH 1366/5607] file: Add extra source URL --- pkgs/tools/misc/file/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 01a674fe227..38fb0b78cb1 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "file-5.04"; src = fetchurl { - url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz; + urls = [ + ftp://ftp.astron.com/pub/file/file-5.04.tar.gz + http://pkgs.fedoraproject.org/repo/pkgs/file/file-5.04.tar.gz/accade81ff1cc774904b47c72c8aeea0/file-5.04.tar.gz + ]; sha256 = "0316lj3jxmp2g8azv0iykmmwjsnjanq93bklccwb6k77jiwnx7jc"; }; -- GitLab From 3751271d25d655e7af5113141f95e8f6bcbd903f Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Tue, 6 Nov 2012 11:51:27 +0100 Subject: [PATCH 1367/5607] Update Haskell Platform 2012.4.0.0 Cabal file to final version. (Typos only.) --- .../haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal index 23af64e4489..23d1f7a0a7d 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal +++ b/pkgs/development/libraries/haskell/haskell-platform/haskell-platform-2012.4.0.0.cabal @@ -108,6 +108,6 @@ library -- hscolour ==1.19 -- ??? -- haddock ==2.11.0 -- need to use the one shipped with ghc --- N.B.: The begin/end comment annocations are used to build the source +-- N.B.: The begin/end comment annotations are used to build the source -- installer: Packages that are part of the core are checked at build time. -- Source of packages that are part of the platform are included in the tarball. -- GitLab From 9322bee98823df6abcf989e6c0749711b30de56e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 6 Nov 2012 13:01:44 +0100 Subject: [PATCH 1368/5607] Use systemd instead of udev, and don't use consolekit --- pkgs/desktops/kde-4.7/kde-workspace.nix | 4 ++-- pkgs/desktops/kde-4.8/kde-workspace.nix | 4 ++-- pkgs/development/libraries/polkit/default.nix | 2 +- pkgs/os-specific/linux/upower/default.nix | 2 +- pkgs/top-level/all-packages.nix | 10 ++++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/kde-4.7/kde-workspace.nix b/pkgs/desktops/kde-4.7/kde-workspace.nix index 8116f4bb6b5..1ece3f49076 100644 --- a/pkgs/desktops/kde-4.7/kde-workspace.nix +++ b/pkgs/desktops/kde-4.7/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies , lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate -, consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi +, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi , pykde4, libjpeg, pkgconfig, libXft, libXxf86misc }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi ]; buildNativeInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/kde-4.8/kde-workspace.nix b/pkgs/desktops/kde-4.8/kde-workspace.nix index 31937d4f1d5..1a86eacb336 100644 --- a/pkgs/desktops/kde-4.8/kde-workspace.nix +++ b/pkgs/desktops/kde-4.8/kde-workspace.nix @@ -1,6 +1,6 @@ { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, - consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, + xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, pykde4, libjpeg, pkgconfig, libXft, libXxf86misc, kactivities }: @@ -12,7 +12,7 @@ kde { xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394 - libusb python libqalculate consolekit kdepimlibs pam prison akonadi + libusb python libqalculate kdepimlibs pam prison akonadi kactivities ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 88daab5ff92..788b6d6d32b 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext , gobjectIntrospection -, useSystemd ? false, systemd ? null }: +, useSystemd ? true, systemd }: let diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 2f870e5d999..6ae4c22f48a 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils -, useSystemd ? false, systemd ? null +, useSystemd ? true, systemd }: assert stdenv.isLinux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f0918faff..749f3f24711 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5095,12 +5095,11 @@ let zeromq2 = callPackage ../development/libraries/zeromq/2.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; - ### DEVELOPMENT / LIBRARIES / JAVA + ### DEVELOPMENT / LIBRARIES / JAVA atermjava = callPackage ../development/libraries/java/aterm { stdenv = overrideInStdenv stdenv [gnumake380]; - }; commonsFileUpload = callPackage ../development/libraries/java/jakarta-commons/file-upload { }; @@ -5169,6 +5168,7 @@ let jquery_ui = callPackage ../development/libraries/javascript/jquery-ui { }; + ### DEVELOPMENT / PERL MODULES buildPerlPackage = import ../development/perl-modules/generic perl; @@ -6241,7 +6241,7 @@ let udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev173 = callPackage ../os-specific/linux/udev/173.nix { }; - udev = pkgs.udev173; + udev = pkgs.systemd; udisks = callPackage ../os-specific/linux/udisks { }; @@ -7667,7 +7667,9 @@ let dropbox = callPackage ../applications/networking/dropbox { }; - slim = callPackage ../applications/display-managers/slim { }; + slim = callPackage ../applications/display-managers/slim { + consolekit = null; + }; sndBase = builderDefsPackage (import ../applications/audio/snd) { inherit fetchurl stdenv stringsWithDeps lib fftw; -- GitLab From 629420841bffb675e93688028cdcf81a4841f897 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 11:44:37 +0100 Subject: [PATCH 1369/5607] haskell-OpenGL: add version 2.6.0.1 --- .../haskell/OpenGL/{2.6.0.0.nix => 2.6.0.1.nix} | 5 ++--- pkgs/top-level/haskell-packages.nix | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/development/libraries/haskell/OpenGL/{2.6.0.0.nix => 2.6.0.1.nix} (82%) diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix similarity index 82% rename from pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix rename to pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix index 6ea45f6d08c..318bdf19748 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix @@ -4,11 +4,10 @@ cabal.mkDerivation (self: { pname = "OpenGL"; - version = "2.6.0.0"; - sha256 = "0rbdx73gcjx4ksqdjishlnn1ibxj21cqg5pxphy8bsphlygzc76l"; + version = "2.6.0.1"; + sha256 = "1fpabhpjfl1bj0dhlj2sg8zsn3l6py4zw1arplwmqalz3xbkkgdi"; buildDepends = [ GLURaw ObjectName OpenGLRaw StateVar Tensor ]; extraLibraries = [ libX11 mesa ]; - noHaddock = true; meta = { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 45308dc66e4..a2d57d4e4cc 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); HUnit = self.HUnit_1_2_5_1; # 7.6 ok mtl = self.mtl_2_1_2; # 7.6 ok network = self.network_2_4_0_1; # 7.6 ok - OpenGL = self.OpenGL_2_6_0_0; # 7.6 ok + OpenGL = self.OpenGL_2_6_0_1; # 7.6 ok parallel = self.parallel_3_2_0_3; # 7.6 ok parsec = self.parsec_3_1_3; # 7.6 ok QuickCheck = self.QuickCheck_2_5_1_1; # 7.6 ok @@ -828,7 +828,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {}; gloss = callPackage ../development/libraries/haskell/gloss { - OpenGL = self.OpenGL_2_6_0_0; + OpenGL = self.OpenGL_2_6_0_1; GLUT = self.GLUT_2_3_1_0; }; @@ -843,7 +843,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL = self.OpenGL_2_4_0_2; }; GLUT_2_3_1_0 = callPackage ../development/libraries/haskell/GLUT/2.3.1.0.nix { - OpenGL = self.OpenGL_2_6_0_0; + OpenGL = self.OpenGL_2_6_0_1; }; GLUT = self.GLUT_2_3_1_0; @@ -1234,8 +1234,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); OpenGL_2_2_3_0 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.0.nix {}; OpenGL_2_2_3_1 = callPackage ../development/libraries/haskell/OpenGL/2.2.3.1.nix {}; OpenGL_2_4_0_2 = callPackage ../development/libraries/haskell/OpenGL/2.4.0.2.nix {}; - OpenGL_2_6_0_0 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.0.nix {}; - OpenGL = self.OpenGL_2_6_0_0; + OpenGL_2_6_0_1 = callPackage ../development/libraries/haskell/OpenGL/2.6.0.1.nix {}; + OpenGL = self.OpenGL_2_6_0_1; OpenGLRaw = callPackage ../development/libraries/haskell/OpenGLRaw {}; -- GitLab From 713976591b25e85f978cc52024f177e0204b8621 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 1370/5607] haskell-conduit: update to version 0.5.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 6da1b8db34d..d6c7ccd2cce 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.7"; - sha256 = "14bn755f25cin0wv775na85ngfx8ack31s15982zkqfva88xg48i"; + version = "0.5.3"; + sha256 = "1gqxfvgdlv0sn145v232rcfddds1sgw9yazwi7hhqjdsgdyk3x5m"; buildDepends = [ liftedBase monadControl resourcet text transformers transformersBase void -- GitLab From 730b5c828ff977ac38347ec5fd3954148b126d67 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 1371/5607] haskell-hinotify: update to version 0.3.4 --- pkgs/development/libraries/haskell/hinotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix index 3767fe635f0..0d3392b4e59 100644 --- a/pkgs/development/libraries/haskell/hinotify/default.nix +++ b/pkgs/development/libraries/haskell/hinotify/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hinotify"; - version = "0.3.3"; - sha256 = "0z8pd5zva25zii5kkh807kdkn4j9w9z74f2dw4kyflwidn0063fr"; + version = "0.3.4"; + sha256 = "05iqy4llf42k20a4hdc7p3hx30v030ljwi469ps8xxx36c9c5kmf"; meta = { homepage = "https://github.com/kolmodin/hinotify.git"; description = "Haskell binding to inotify"; -- GitLab From b759abeb39586d1584249857c47795fae017e5eb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 1372/5607] haskell-lrucache: update to version 1.1.1.2 --- pkgs/development/libraries/haskell/lrucache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix index 2a93ee4af33..337603258aa 100644 --- a/pkgs/development/libraries/haskell/lrucache/default.nix +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "lrucache"; - version = "1.1.1.1"; - sha256 = "0w310wsvin5hw3awpicnzddyifcq0844h52jwjcqnin81l2lqrfw"; + version = "1.1.1.2"; + sha256 = "1s4yrjfmndsrxbfrn8xcxyif65nsdx4b34ki3ajznrsvsl1cc137"; meta = { homepage = "http://github.com/chowells79/lrucache"; description = "a simple, pure LRU cache"; -- GitLab From 47945f80b8d252e843e9123017e3ab3b4afd053f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 1373/5607] haskell-resourcet: update to version 0.4.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 95e051a3eec..fe62434d99b 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.4.0.2"; - sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2"; + version = "0.4.1"; + sha256 = "1s9j9nrqnq2qrc3c10cjqxrxajh9qayqzh8j73zwpy5kqkma80sp"; buildDepends = [ liftedBase monadControl mtl transformers transformersBase ]; -- GitLab From 7d11823819d19e17696d3ea4c7e219886e6fa9d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:30:44 +0100 Subject: [PATCH 1374/5607] haskell-semigroupoids: update to version 3.0.0.1 --- 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 4ffc3c2badc..c2e8deefbad 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroupoids"; - version = "3.0"; - sha256 = "0wsax14ck363nby0xrhcpvdzf0pzspayl7gsm0br0lr6ipmpcrag"; + version = "3.0.0.1"; + sha256 = "0ilqmpywiwp9m1k8lrw0mxb0pzc9l8bs2hgzrp8k5iln1yq1fh6i"; buildDepends = [ comonad contravariant semigroups transformers ]; meta = { homepage = "http://github.com/ekmett/semigroupoids"; -- GitLab From 0ae5d8fd0541b974e63600b7e3a4181354837caa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 13:38:34 +0100 Subject: [PATCH 1375/5607] haskell: drop noHaddock from some packages which build fine in their respective latest version --- pkgs/development/libraries/haskell/filestore/default.nix | 1 - pkgs/development/libraries/haskell/ghc-events/default.nix | 1 - pkgs/development/libraries/haskell/srcloc/default.nix | 1 - pkgs/development/tools/haskell/BNFC-meta/default.nix | 1 - pkgs/development/tools/haskell/alex-meta/default.nix | 1 - 5 files changed, 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 887d06e2b07..f56db649fc7 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -11,7 +11,6 @@ cabal.mkDerivation (self: { buildDepends = [ Diff filepath HUnit mtl parsec split time utf8String xml ]; - noHaddock = 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 4cba5ed74e9..7eb49668e3c 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -7,7 +7,6 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ binary mtl ]; - noHaddock = true; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index aa2331cfac3..c867a353cd6 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.3.0"; sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz"; buildDepends = [ syb ]; - noHaddock = true; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Data types for managing source code locations"; diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index e18a63cd86c..d39544342b3 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.4.0.1"; sha256 = "0x31a25njbgd3r8shh7rrqa9qq66iqjhh82k538p9bd2hblg30ka"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; - noHaddock = true; meta = { description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index e28b37aafc6..5bb298e739a 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.3.0.5"; sha256 = "0f41q5l6z1dcpfx8rxacv4f544zcw7pgvq935mnzzha9fvsxqzk4"; buildDepends = [ haskellSrcMeta QuickCheck ]; - noHaddock = true; meta = { description = "Quasi-quoter for Alex lexers"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From ce2e93a236bfb50a8faba375129e86ef70a5272f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:07:38 +0100 Subject: [PATCH 1376/5607] Update default Haskell environment to Haskell Platform 2012.4.0.0. The most significant change brought by this update is that we now use GHC version 7.4.2 by default. --- pkgs/top-level/all-packages.nix | 15 +++++++-------- pkgs/top-level/haskell-defaults.nix | 11 +---------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49f0918faff..974eb3da9b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2319,9 +2319,9 @@ let # particularly in connection with Hydra builds for all these packages. # So we enable it for selected versions only. - # Current default version: 7.4.1. - haskellPackages = haskellPackages_ghc741; - # Current Haskell platform. + # Current default version: 7.4.2. + haskellPackages = haskellPackages_ghc742; + # Current Haskell Platform: 2012.4.0.0 haskellPlatform = haskellPackages.haskellPlatform; haskellPackages_ghc6104 = recurseIntoAttrs (haskell.packages_ghc6104); @@ -2338,11 +2338,10 @@ let # The following three lines achieve that: the first two make Hydra build explicit # profiling and non-profiling versions; the final respects the user-configured # default setting. - haskellPackages_ghc741_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); - haskellPackages_ghc741_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); - haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741.highPrio); - haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742); - haskellPackages_ghc742_pedantic = haskell.packages_ghc742_pedantic; + haskellPackages_ghc741 = recurseIntoAttrs (haskell.packages_ghc741); + haskellPackages_ghc742_no_profiling = recurseIntoAttrs (haskell.packages_ghc741.noProfiling); + haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc741.profiling); + haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = recurseIntoAttrs (haskell.packages_ghc761); # 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 b4489fe72e5..aa43203fe53 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -22,18 +22,12 @@ extensibleExceptions = self.extensibleExceptions_0_1_1_4; }; - ghc742Prefs_pedantic = + ghc742Prefs = self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; binary = null; # now a core package }; - # until the Haskell Platform for 7.4.2 is released, this works fine/better; - # mainly because the Haskell Platform 2012.4.0.0 release candidate mandates - # vector 0.10 and primitive 0.5, which at this time aren't supported widely - # by other packages - ghc742Prefs = ghc741Prefs; - ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; @@ -273,9 +267,6 @@ prefFun = ghc742Prefs; }; - packages_ghc742_pedantic = - packages_ghc742.override { prefFun = ghc742Prefs_pedantic; }; - packages_ghc761 = packages { ghcPath = ../development/compilers/ghc/7.6.1.nix; ghcBinary = ghc704Binary; -- GitLab From 6b40f836c78298a1c0e4932b05e286a1a55fe864 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:22:26 +0100 Subject: [PATCH 1377/5607] Fix Agda build. Agda won't build with recent versions of QuickCheck --- 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 a2d57d4e4cc..2de6a2b573f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -429,6 +429,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; + QuickCheck = self.QuickCheck_2_4_2; }; accelerate = callPackage ../development/libraries/haskell/accelerate {}; -- GitLab From f20b21ad1e0f3b164942d5d2de4a870b05fd08e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:22:46 +0100 Subject: [PATCH 1378/5607] Fix haskell-testpack build. Testpack won't build with recent versions of QuickCheck --- pkgs/top-level/haskell-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2de6a2b573f..663039b64ff 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1571,7 +1571,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); testFrameworkThPrime = callPackage ../development/libraries/haskell/test-framework-th-prime {}; - testpack = callPackage ../development/libraries/haskell/testpack {}; + testpack = callPackage ../development/libraries/haskell/testpack { + QuickCheck = self.QuickCheck_2_4_2; + }; texmath = callPackage ../development/libraries/haskell/texmath {}; -- GitLab From 4ab06e5c24de4c0cabbdc9dfc11f81eae912f94f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 6 Nov 2012 18:31:54 +0100 Subject: [PATCH 1379/5607] Fix git-annex build. git-annex depends on 'testpack', which doesn't compile with Haskell Platform 2012.4.0.0. The testpack library appears to be unmaintained, so there is probably no quick solution for this issue. For the time being, we compile git-annex with GHC 7.4.1. --- .../version-management/git-and-tools/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e12d4157ec2..98468e32bac 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -44,12 +44,11 @@ rec { gitAnnex = lib.makeOverridable (import ./git-annex) { inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh; - inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP + inherit (haskellPackages_ghc741) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl - network pcreLight QuickCheck SHA stm utf8String networkInfo dbus - clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet - httpTypes networkMulticast text time transformers transformersBase wai - waiLogger warp yesod yesodDefault yesodStatic testpack; + network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault + extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers + transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck; }; qgit = import ./qgit { -- GitLab From 67bde8453f1ac559f289dc6b1ff6250082572415 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 6 Nov 2012 22:35:51 +0400 Subject: [PATCH 1380/5607] Update Julia and compensat for their specification of /bin/bash as SHELL --- 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 a01aa3aded4..4fd31d573ce 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { pname = "julia"; - date = "20120922"; + date = "20121106"; name = "${pname}-git-${date}"; grisu_ver = "1.1.1"; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; - rev = "e1ba1ebf09da42a5bd7f4ed18f1595ae06032b4c"; - sha256 = "187e67a7c6bf44469e0e0dda41072ac8f3a40380ea9364ed07a4cadc08965663"; + rev = "8f4d073881beb42c9f272b9327efa0a5715bd31c"; + sha256 = "2df2ba800bd4fd9b0297a0b8cff53174a7c05ffbc889a7df5830a014fed8c433"; }; buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib @@ -92,14 +92,14 @@ stdenv.mkDerivation rec { sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile - export makeFlags="$makeFlags PREFIX=$out" + export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell}" export dontPatchELF=1 ''; preBuild = '' - make -C test/unicode all - make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" + make -C test/unicode all SHELL="${stdenv.shell}" + make -C extras glpk_h.jl GLPK_PREFIX="$GLPK_PREFIX" SHELL="${stdenv.shell}" ''; postInstall = '' -- GitLab From 577995f592130ec458b2e70963db40ae9f5ba84d Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 7 Nov 2012 00:53:19 +0100 Subject: [PATCH 1381/5607] updating: flake8, alot, turses --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed352306c20..05a530c35ab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -61,13 +61,13 @@ let pythonPackages = python.modules // rec { alot = buildPythonPackage rec { - rev = "27c91058c49d8755d2813d5b78094f40f36ec905"; + rev = "5ed59825ffaeaacea90ea10be4b932c60428ed8e"; name = "alot-0.3.3_${rev}"; src = fetchurl { url = "https://github.com/pazz/alot/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "67e1033aa91818b7fa4c3911430a4da0f73aca92c3e3832c010038cbf263eec2"; + sha256 = "1b724d47bf766ba3ca7cb6d27c7bb597dbc67dcae1347c5a0f01f80c2246ca07"; }; doCheck = false; @@ -705,11 +705,11 @@ let pythonPackages = python.modules // rec { flake8 = buildPythonPackage (rec { - name = "flake8-1.4"; + name = "flake8-1.5"; src = fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - md5 = "64acc2c905178f6d6817d88574407fb5"; + md5 = "525be5c7fcaf85f6819c77752cb2ee72"; }; doCheck = false; @@ -1458,7 +1458,7 @@ let pythonPackages = python.modules // rec { sha256 = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21"; }; - propagatedBuildInputs = [ httplib2 ]; + propagatedBuildInputs = [ httplib2 ]; doCheck = false; meta = { @@ -2774,7 +2774,7 @@ let pythonPackages = python.modules // rec { }; turses = buildPythonPackage (rec { - name = "turses-0.2.5"; + name = "turses-0.2.8"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz"; -- GitLab From 8c4f5d02aa0967d70237dfdd2a12c9e37da4d3fd Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Wed, 7 Nov 2012 14:43:39 +0100 Subject: [PATCH 1382/5607] Updating ghc HEAD snapshot. --- pkgs/development/compilers/ghc/head.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 5487b00cef2..67f2b4f5c7e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20120912"; + version = "7.7.20121106"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "0dilndcfs1nhs48nhi361bpffmbbyjaq1i6qnzn24vg34wckyrjg"; + sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263"; }; buildInputs = [ ghc perl gmp ncurses ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { 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" + DYNAMIC_BY_DEFAULT = NO ''; preConfigure = '' -- GitLab From 7afafe0b6dd019851ae0919e11fcee9d035e5698 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 7 Nov 2012 16:03:37 +0100 Subject: [PATCH 1383/5607] dmenu: Add option config.dmenu.enableXft for enabling xft font support (turned off by default). --- pkgs/applications/misc/dmenu/default.nix | 13 +++++++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index eae0b0ff233..048514ad4aa 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, libX11, libXinerama}: +{stdenv, fetchurl, libX11, libXinerama, enableXft, libXft, zlib}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "dmenu-4.5"; @@ -8,7 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08"; }; - buildInputs = [ libX11 libXinerama ]; + xftPatch = fetchurl { + url = "http://tools.suckless.org/dmenu/patches/${name}-xft.diff"; + sha256 = "efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f"; + }; + + buildInputs = [ libX11 libXinerama ] ++ optionals enableXft [zlib libXft]; + + patches = optional enableXft xftPatch; preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 974eb3da9b6..8ac83442fdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6700,7 +6700,9 @@ let djview = callPackage ../applications/graphics/djview { }; djview4 = pkgs.djview; - dmenu = callPackage ../applications/misc/dmenu { }; + dmenu = callPackage ../applications/misc/dmenu { + enableXft = config.dmenu.enableXft or false; + }; dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { inherit libpng libtiff libjpeg imagemagick librsvg -- GitLab From 3afa95bfbae56f914b40527500b2b010ba9c3b90 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 7 Nov 2012 21:10:39 +0100 Subject: [PATCH 1384/5607] Added androidenv - the Android SDK, their additions and two functions that build and emulate Android Apps --- pkgs/development/androidenv/addon.xml | 893 +++++++++++++++++ pkgs/development/androidenv/addons.nix | 186 ++++ pkgs/development/androidenv/androidsdk.nix | 153 +++ pkgs/development/androidenv/build-app.nix | 41 + pkgs/development/androidenv/default.nix | 57 ++ pkgs/development/androidenv/emulate-app.nix | 87 ++ .../examples/deployment/default.nix | 13 + .../deployment/emulate-myfirstapp/default.nix | 10 + .../deployment/myfirstapp/default.nix | 13 + .../androidenv/examples/deployment/result | 1 + .../examples/src/myfirstapp/.classpath | 8 + .../examples/src/myfirstapp/.project | 33 + .../.settings/org.eclipse.jdt.core.prefs | 4 + .../src/myfirstapp/AndroidManifest.xml | 32 + .../examples/src/myfirstapp/README.txt | 6 + .../examples/src/myfirstapp/ant.properties | 17 + .../examples/src/myfirstapp/build.xml | 92 ++ .../src/myfirstapp/ic_launcher-web.png | Bin 0 -> 37099 bytes .../src/myfirstapp/proguard-project.txt | 20 + .../src/myfirstapp/project.properties | 14 + .../res/drawable-hdpi/ic_action_search.png | Bin 0 -> 3120 bytes .../res/drawable-hdpi/ic_launcher.png | Bin 0 -> 3014 bytes .../res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1504 bytes .../res/drawable-mdpi/ic_action_search.png | Bin 0 -> 3030 bytes .../res/drawable-mdpi/ic_launcher.png | Bin 0 -> 1969 bytes .../res/drawable-xhdpi/ic_action_search.png | Bin 0 -> 3199 bytes .../res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 4006 bytes .../res/layout/activity_display_message.xml | 14 + .../myfirstapp/res/layout/activity_main.xml | 19 + .../res/menu/activity_display_message.xml | 6 + .../src/myfirstapp/res/menu/activity_main.xml | 6 + .../src/myfirstapp/res/values-v11/styles.xml | 5 + .../src/myfirstapp/res/values-v14/styles.xml | 5 + .../src/myfirstapp/res/values/strings.xml | 11 + .../src/myfirstapp/res/values/styles.xml | 5 + .../my/first/app/DisplayMessageActivity.java | 26 + .../example/my/first/app/MainActivity.java | 35 + .../development/androidenv/generate-addons.sh | 3 + .../androidenv/generate-addons.xsl | 38 + .../androidenv/generate-platforms.sh | 4 + .../androidenv/generate-platforms.xsl | 38 + .../androidenv/generate-sysimages.sh | 3 + .../androidenv/generate-sysimages.xsl | 36 + .../development/androidenv/platform-tools.nix | 41 + .../androidenv/platforms-linux.nix | 198 ++++ .../androidenv/platforms-macosx.nix | 198 ++++ pkgs/development/androidenv/repository-7.xml | 928 ++++++++++++++++++ pkgs/development/androidenv/support.nix | 17 + pkgs/development/androidenv/sysimages.nix | 42 + pkgs/top-level/all-packages.nix | 5 + 50 files changed, 3363 insertions(+) create mode 100644 pkgs/development/androidenv/addon.xml create mode 100644 pkgs/development/androidenv/addons.nix create mode 100644 pkgs/development/androidenv/androidsdk.nix create mode 100644 pkgs/development/androidenv/build-app.nix create mode 100644 pkgs/development/androidenv/default.nix create mode 100644 pkgs/development/androidenv/emulate-app.nix create mode 100644 pkgs/development/androidenv/examples/deployment/default.nix create mode 100644 pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix create mode 100644 pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix create mode 120000 pkgs/development/androidenv/examples/deployment/result create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.classpath create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.project create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/README.txt create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/ant.properties create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/build.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/project.properties create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-ldpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_action_search.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_display_message.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/menu/activity_display_message.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/menu/activity_main.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values-v11/styles.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values-v14/styles.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values/strings.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/res/values/styles.xml create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/src/com/example/my/first/app/DisplayMessageActivity.java create mode 100644 pkgs/development/androidenv/examples/src/myfirstapp/src/com/example/my/first/app/MainActivity.java create mode 100755 pkgs/development/androidenv/generate-addons.sh create mode 100644 pkgs/development/androidenv/generate-addons.xsl create mode 100755 pkgs/development/androidenv/generate-platforms.sh create mode 100644 pkgs/development/androidenv/generate-platforms.xsl create mode 100755 pkgs/development/androidenv/generate-sysimages.sh create mode 100644 pkgs/development/androidenv/generate-sysimages.xsl create mode 100644 pkgs/development/androidenv/platform-tools.nix create mode 100644 pkgs/development/androidenv/platforms-linux.nix create mode 100644 pkgs/development/androidenv/platforms-macosx.nix create mode 100644 pkgs/development/androidenv/repository-7.xml create mode 100644 pkgs/development/androidenv/support.nix create mode 100644 pkgs/development/androidenv/sysimages.nix diff --git a/pkgs/development/androidenv/addon.xml b/pkgs/development/androidenv/addon.xml new file mode 100644 index 00000000000..7b0f69128a6 --- /dev/null +++ b/pkgs/development/androidenv/addon.xml @@ -0,0 +1,893 @@ + + + + + This is the Android Software Development Kit License Agreement. + +1. Introduction + +1.1 The Android Software Development Kit (referred to in this License Agreement as the "SDK" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the SDK. + +1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. + +2. Accepting this License Agreement + +2.1 In order to use the SDK, you must first agree to this License Agreement. You may not use the SDK if you do not accept this License Agreement. + +2.2 You can accept this License Agreement by: + +(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or + +(B) by actually using the SDK. In this case, you agree that use of the SDK constitutes acceptance of the Licensing Agreement from that point onwards. + +2.3 You may not use the SDK and may not accept the Licensing Agreement if you are a person barred from receiving the SDK under the laws of the United States or other countries including the country in which you are resident or from which you use the SDK. + +2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the SDK on behalf of your employer or other entity. + +3. SDK License from Google + +3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the SDK solely to develop applications to run on the Android platform. + +3.2 You agree that Google or third parties own all legal right, title and interest in and to the SDK, including any Intellectual Property Rights that subsist in the SDK. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. + +3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the SDK or any part of the SDK. Except to the extent required by applicable third party licenses, you may not load any part of the SDK onto a mobile handset or any other hardware device except a personal computer, combine any part of the SDK with other software, or distribute any software or device incorporating a part of the SDK. + +3.4 Use, reproduction and distribution of components of the SDK licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. + +3.5 You agree that the form and nature of the SDK that Google provides may change without prior notice to you and that future versions of the SDK may be incompatible with applications developed on previous versions of the SDK. You agree that Google may stop (permanently or temporarily) providing the SDK (or any features within the SDK) to you or to users generally at Google's sole discretion, without prior notice to you. + +3.6 Nothing in this License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. + +3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the SDK. + +4. Use of the SDK by You + +4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the SDK, including any intellectual property rights that subsist in those applications. + +4.2 You agree to use the SDK and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). + +4.3 You agree that if you use the SDK to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you permission to do so. + +4.4 You agree that you will not engage in any activity with the SDK, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google or any mobile communications carrier. + +4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Android platform and/or applications for the Android platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. + +4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. + +5. Your Developer Credentials + +5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. + +6. Privacy and Information + +6.1 In order to continually innovate and improve the SDK, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the SDK are being used and how they are being used. Before any of this information is collected, the SDK will notify you and seek your consent. If you withhold consent, the information will not be collected. + +6.2 The data collected is examined in the aggregate to improve the SDK and is maintained in accordance with Google's Privacy Policy. + +7. Third Party Applications for the Android Platform + +7.1 If you use the SDK to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. + +7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. + +7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. + +8. Using Android APIs + +8.1 Google Data APIs + +8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. + +8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + +9. Terminating this License Agreement + +9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. + +9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the SDK and any relevant developer credentials. + +9.3 Google may at any time, terminate this License Agreement with you if: + +(A) you have breached any provision of this License Agreement; or + +(B) Google is required to do so by law; or + +(C) the partner with whom Google offered certain parts of SDK (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the SDK to you; or + +(D) Google decides to no longer providing the SDK or certain parts of the SDK to users in the country in which you are resident or from which you use the service, or the provision of the SDK or certain SDK services to you by Google is, in Google's sole discretion, no longer commercially viable. + +9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. + +10. DISCLAIMER OF WARRANTIES + +10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE SDK IS AT YOUR SOLE RISK AND THAT THE SDK IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. + +10.2 YOUR USE OF THE SDK AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE SDK IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. + +10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + +11. LIMITATION OF LIABILITY + +11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. + +12. Indemnification + +12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the SDK, (b) any application you develop on the SDK that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. + +13. Changes to the License Agreement + +13.1 Google may make changes to the License Agreement as it distributes new versions of the SDK. When these changes are made, Google will make a new version of the License Agreement available on the website where the SDK is made available. + +14. General Legal Terms + +14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the SDK (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the SDK. + +14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. + +14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. + +14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. + +14.5 EXPORT RESTRICTIONS. THE SDK IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE SDK. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. + +14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. + +14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. + +April 10, 2009 + + + Terms and Conditions + +This is the Google TV Add-on for the Android Software Development Kit License Agreement. + +1. Introduction + +1.1 The Google TV Add-on for the Android Software Development Kit (referred to in this License Agreement as the "Google TV Add-on" and specifically including the Android system files, packaged APIs, and Google APIs add-ons) is licensed to you subject to the terms of this License Agreement. This License Agreement forms a legally binding contract between you and Google in relation to your use of the Google TV Add-on. + +1.2 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. + +2. Accepting this License Agreement + +2.1 In order to use the Google TV Add-on, you must first agree to this License Agreement. You may not use the Google TV Add-on if you do not accept this License Agreement. + +2.2 You can accept this License Agreement by: + +(A) clicking to accept or agree to this License Agreement, where this option is made available to you; or + +(B) by actually using the Google TV Add-on. In this case, you agree that use of the Google TV Add-on constitutes acceptance of the License Agreement from that point onwards. + +2.3 You may not use the Google TV Add-on and may not accept the Licensing Agreement if you are a person barred from receiving the Google TV Add-on under the laws of the United States or other countries including the country in which you are resident or from which you use the Google TV Add-on. + +2.4 If you are agreeing to be bound by this License Agreement on behalf of your employer or other entity, you represent and warrant that you have full legal authority to bind your employer or such entity to this License Agreement. If you do not have the requisite authority, you may not accept the Licensing Agreement or use the Google TV Add-on on behalf of your employer or other entity. + +3. Google TV Add-on License from Google + +3.1 Subject to the terms of this License Agreement, Google grants you a limited, worldwide, royalty-free, non- assignable and non-exclusive license to use the Google TV Add-on solely to develop applications to run on the Google TV platform. + +3.2 You agree that Google or third parties own all legal right, title and interest in and to the Google TV Add-on, including any Intellectual Property Rights that subsist in the Google TV Add-on. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. + +3.3 Except to the extent required by applicable third party licenses, you may not copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Google TV Add-on or any part of the Google TV Add-on. Except to the extent required by applicable third party licenses, you may not load any part of the Google TV Add-on onto a mobile handset, television, or any other hardware device except a personal computer, combine any part of the Google TV Add-on with other software, or distribute any software or device incorporating a part of the Google TV Add-on. + +3.4 Use, reproduction and distribution of components of the Google TV Add-on licensed under an open source software license are governed solely by the terms of that open source software license and not this License Agreement. + +3.5 You agree that the form and nature of the Google TV Add-on that Google provides may change without prior notice to you and that future versions of the Google TV Add-on may be incompatible with applications developed on previous versions of the Google TV Add-on. You agree that Google may stop (permanently or temporarily) providing the Google TV Add-on (or any features within the Google TV Add-on) to you or to users generally at Google's sole discretion, without prior notice to you. + +3.6 Nothing in this License Agreement gives you a right to use any of Google's or it’s licensors’ trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. + +3.7 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Google TV Add-on. + +4. Use of the Google TV Add-on by You + +4.1 Google agrees that it obtains no right, title or interest from you (or your licensors) under this License Agreement in or to any software applications that you develop using the Google TV Add-on, including any intellectual property rights that subsist in those applications. + +4.2 You agree to use the Google TV Add-on and write applications only for purposes that are permitted by (a) this License Agreement and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). + +4.3 You agree that if you use the Google TV Add-on to develop applications for general public users, you will protect the privacy and legal rights of those users. If the users provide you with user names, passwords, or other login information or personal information, your must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If the user provides your application with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, the user has given you explicit permission to do so. + +4.4 You agree that you will not engage in any activity with the Google TV Add-on, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of any third party including, but not limited to, Google, Multichannel Video Program Distributors or any mobile communications carrier. + +4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through the Google TV platform and/or applications for the Google TV platform, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. + +4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under this License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. + +5. Your Developer Credentials + +5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. + +6. Privacy and Information + +6.1 In order to continually innovate and improve the Google TV Add-on, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Google TV Add-on are being used and how they are being used. Before any of this information is collected, the Google TV Add-on will notify you and seek your consent. If you withhold consent, the information will not be collected. + +6.2 The data collected is examined in the aggregate to improve the Google TV Add-on and is maintained in accordance with Google's Privacy Policy. + +7. Third Party Applications for the Google TV Platform + +7.1 If you use the Google TV Add-on to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. + +7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. + +7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. In that case, this License Agreement does not affect your legal relationship with these third parties. + +8. Using Google TV APIs + +8.1 If you use any Google TV API to retrieve data from Google, you acknowledge that the data (“Google TV API Contentâ€) may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. Some portions of the Google TV API Content are licensed to Google by third parties, including but not limited to Tribune Media Services + +8.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. + +8.3 Except as explicitly permitted in Section 3 (Google TV Add-on License from Google), you must: + +(a) not modify nor format the Google TV API Content except to the extent reasonably and technically necessary to optimize the display such Google TV API Content in your application; + +(b) not edit the Google TV API Content in a manner that renders the Google TV API Content inaccurate of alters its inherent meaning (provided that displaying excerpts will not violate the foregoing); or + +(c) not create any commercial audience measurement tool or service using the Google TV API Content + +9. Terminating this License Agreement + +9.1 This License Agreement will continue to apply until terminated by either you or Google as set out below. + +9.2 If you want to terminate this License Agreement, you may do so by ceasing your use of the Google TV Add-on and any relevant developer credentials. + +9.3 Google may at any time, terminate this License Agreement with you if: + +(A) you have breached any provision of this License Agreement; or + +(B) Google is required to do so by law; or + +(C) the partner with whom Google offered certain parts of Google TV Add-on (such as APIs) to you has terminated its relationship with Google or ceased to offer certain parts of the Google TV Add-on to you; or + +(D) Google decides to no longer providing the Google TV Add-on or certain parts of the Google TV Add-on to users in the country in which you are resident or from which you use the service, or the provision of the Google TV Add-on or certain Google TV Add-on services to you by Google is, in Google's sole discretion, no longer commercially viable. + +9.4 When this License Agreement comes to an end, all of the legal rights, obligations and liabilities that you and Google have benefited from, been subject to (or which have accrued over time whilst this License Agreement has been in force) or which are expressed to continue indefinitely, shall be unaffected by this cessation, and the provisions of paragraph 14.7 shall continue to apply to such rights, obligations and liabilities indefinitely. + +10. DISCLAIMER OF WARRANTIES + +10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE GOOGLE TV ADD-ON IS AT YOUR SOLE RISK AND THAT THE GOOGLE TV ADD-ON IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. + +10.2 YOUR USE OF THE GOOGLE TV ADD-ON AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE GOOGLE TV ADD-ON IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. + +10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + +11. LIMITATION OF LIABILITY + +11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. + +12. Indemnification + +12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from (a) your use of the Google TV Add-on, (b) any application you develop on the Google TV Add-on that infringes any copyright, trademark, trade secret, trade dress, patent or other intellectual property right of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you with this License Agreement. + +13. Changes to the License Agreement + +13.1 Google may make changes to the License Agreement as it distributes new versions of the Google TV Add-on. + +14. General Legal Terms + +14.1 This License Agreement constitute the whole legal agreement between you and Google and govern your use of the Google TV Add-on (excluding any services which Google may provide to you under a separate written agreement), and completely replace any prior agreements between you and Google in relation to the Google TV Add-on. + +14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in this License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. + +14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of this License Agreement is invalid, then that provision will be removed from this License Agreement without affecting the rest of this License Agreement. The remaining provisions of this License Agreement will continue to be valid and enforceable. + +14.4 You acknowledge and agree that Google’s API data licensors and each member of the group of companies of which Google is the parent shall be third party beneficiaries to this License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of this License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to this License Agreement. + +14.5 EXPORT RESTRICTIONS. THE GOOGLE TV ADD-ON IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE GOOGLE TV ADD-ON. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. + +14.6 The rights granted in this License Agreement may not be assigned or transferred by either you or Google without the prior written approval of the other party. Neither you nor Google shall be permitted to delegate their responsibilities or obligations under this License Agreement without the prior written approval of the other party. + +14.7 This License Agreement, and your relationship with Google under this License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from this License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. + + +August 15, 2011 + + + + + + google + Google Inc. + google_apis + Google APIs + 3 + 03 + Android + Google APIs + http://developer.android.com/ + + + + 34908058 + 1f92abf3a76be66ae8032257fc7620acbd2b2e3a + google_apis-3-r03.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 4 + 2 + Android + Google APIs, revision 2 + http://developer.android.com/ + + + + 42435735 + 9b6e86d8568558de4d606a7debc4f6049608dbd0 + google_apis-4_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 5 + 01 + Android + Google APIs, revision 1 + http://developer.android.com/ + + + + + 49123776 + 46eaeb56b645ee7ffa24ede8fa17f3df70db0503 + google_apis-5_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 6 + 1 + Android + Google APIs, revision 1 + http://developer.android.com/ + + + + + 53382941 + 5ff545d96e031e09580a6cf55713015c7d4936b2 + google_apis-6_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 7 + 1 + Android + Google APIs, revision 1 + http://developer.android.com/ + + + + 53691339 + 2e7f91e0fe34fef7f58aeced973c6ae52361b5ac + google_apis-7_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 8 + 2 + Android + Google APIs, API 8, revision 2 + http://developer.android.com/ + + + + 59505020 + 3079958e7ec87222cac1e6b27bc471b27bf2c352 + google_apis-8_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 9 + 2 + Android + Google APIs, API 9, revision 2 + http://developer.android.com/ + + + + 63401546 + 78664645a1e9accea4430814f8694291a7f1ea5d + google_apis-9_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + + google + Google Inc. + google_apis + Google APIs + 10 + 2 + Android + Google APIs, API 10, revision 2 + http://developer.android.com/ + + + + 65781578 + cc0711857c881fa7534f90cf8cc09b8fe985484d + google_apis-10_r02.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 11 + 1 + Android + Google APIs, API 11, revision 1 + http://developer.android.com/ + + + + 83477179 + 5eab5e81addee9f3576d456d205208314b5146a5 + google_apis-11_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 12 + 1 + Android + Google APIs, API 12, revision 1 + http://developer.android.com/ + + + + 86099835 + e9999f4fa978812174dfeceec0721c793a636e5d + google_apis-12_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + + google + Google Inc. + google_apis + Google APIs + 13 + 1 + Android + Google APIs, API 13, revision 1 + http://developer.android.com/ + + + + 88615525 + 3b153edd211c27dc736c893c658418a4f9041417 + google_apis-13_r01.zip + + + + + com.google.android.maps + API for Google Maps. + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 14 + 2 + + + + com.google.android.maps + + + com.android.future.usb.accessory + + + + + 106533714 + f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39 + google_apis-14_r02.zip + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 15 + 2 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 106612472 + 6757c12788da0ea00c2ab58e54cb438b9f2bcf66 + google_apis-15_r02.zip + + + + + + + + google + Google Inc. + google_apis + Google APIs + Android + Google APIs + 16 + 3 + + + com.google.android.maps + + + com.android.future.usb.accessory + + + com.google.android.media.effects + + + + + 127278413 + 63467dd32f471e3e81e33e9772c22f33235aa3b3 + google_apis-16_r03.zip + + + + + + + + + google + Google Inc. + google_tv_addon + Google TV Addon + 12 + 2 + Android + Google TV, API 12, preview release + http://developer.android.com/ + + + + 78266751 + 92128a12e7e8b0fb5bac59153d7779b717e7b840 + google_tv-12_r02.zip + + + + + + + + + + 10 + Android + android + Android Support Library + support + compatibility + + + 1161015 + 7c62e542d46ac3bdb89e1b90503d6afae557cf7d + support_r10.zip + + + + + + + + google + Google Inc. + Google Play Licensing Library + play_licensing + market_licensing + 2 + Google Play Licensing client library + http://developer.android.com/guide/publishing/licensing.html + + + 75109 + 355e8dc304a92a5616db235af8ee7bd554356254 + market_licensing-r02.zip + + + + + + + google + Google Inc. + Google Play APK Expansion Library + play_apk_expansion + market_apk_expansion + 2 + Google Play APK Expansion library + http://developer.android.com/guide/market/expansion-files.html + + + 111636 + 47fa8c691fcc8cf815e7ebbf140f12e94495f73b + market_apk_expansion-r02.zip + + + + + + + google + Google Inc. + Google Play services + google_play_services + 1 + Google Play Services client library and sample code + https://developers.google.com/android/google-play-services/index + + + + 363692 + b1808a7d5f91a3ed42839b950fd254c60e9328f1 + google_play_services_1013.zip + + + + + + + google + Google Inc. + Google USB Driver + usb_driver + 7 + USB Driver for Windows, revision 7 + http://developer.android.com/ + + + + 8681704 + 147c339fde22f98ae41b15349a8303d39a2cf6e5 + usb_driver_r07-windows.zip + + + + + + google + Google Inc. + Google Play Billing Library + play_billing + market_billing + 2 + Google Play Billing sample code + http://developer.android.com/guide/market/billing/index.html + + + 55191 + 3c84c05c60a9cabb578cebce0515860be7ad23d2 + market_billing_r02.zip + + + + + + + google + Google Inc. + Google AdMob Ads SDK + admob_ads_sdk + 8 + AdMob Ads SDK + https://developers.google.com/mobile-ads-sdk/docs/ + + + 545547 + 031476aa5a491239d2624e8de8c9e46e40d93e3f + https://dl-ssl.google.com/googleadmobadssdk/googleadmobadssdkandroid-6.2.1.zip + + + + + + + google + Google Inc. + Google Analytics SDK + analytics_sdk + 2 + Analytics SDK + http://code.google.com/mobile/analytics/ + + + 53055 + 328bcdc6c241879ebb04d6edc6fec1052a171004 + https://dl.google.com/gaformobileapps/GoogleAnalyticsAndroid_1.4.2.zip + + + + + + + google + Google Inc. + Google Web Driver + webdriver + 2 + WebDriver + http://selenium.googlecode.com + + + 4055193 + 13f3a3b2670a5fc04a7342861644be9a01b07e38 + webdriver_r02.zip + + + + + + + google + Google Inc. + Google Cloud Messaging for Android Library + gcm + 3 + Google Cloud Messaging for Android library and sample code + https://developers.google.com/android/gcm/index + + + 5901400 + ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf + gcm_r03.zip + + + + + \ No newline at end of file diff --git a/pkgs/development/androidenv/addons.nix b/pkgs/development/androidenv/addons.nix new file mode 100644 index 00000000000..b995b4301e9 --- /dev/null +++ b/pkgs/development/androidenv/addons.nix @@ -0,0 +1,186 @@ + +{stdenv, fetchurl, unzip}: + +let + buildGoogleApis = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + google_apis_3 = buildGoogleApis { + name = "google_apis-3"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-3-r03.zip; + sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; + }; + meta = { + description = "Android + Google APIs"; + url = http://developer.android.com/; + }; + }; + + google_apis_4 = buildGoogleApis { + name = "google_apis-4"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-4_r02.zip; + sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; + }; + meta = { + description = "Android + Google APIs, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_5 = buildGoogleApis { + name = "google_apis-5"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-5_r01.zip; + sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; + }; + meta = { + description = "Android + Google APIs, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_6 = buildGoogleApis { + name = "google_apis-6"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-6_r01.zip; + sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; + }; + meta = { + description = "Android + Google APIs, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_7 = buildGoogleApis { + name = "google_apis-7"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-7_r01.zip; + sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; + }; + meta = { + description = "Android + Google APIs, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_8 = buildGoogleApis { + name = "google_apis-8"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-8_r02.zip; + sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; + }; + meta = { + description = "Android + Google APIs, API 8, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_9 = buildGoogleApis { + name = "google_apis-9"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-9_r02.zip; + sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; + }; + meta = { + description = "Android + Google APIs, API 9, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_10 = buildGoogleApis { + name = "google_apis-10"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-10_r02.zip; + sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; + }; + meta = { + description = "Android + Google APIs, API 10, revision 2"; + url = http://developer.android.com/; + }; + }; + + google_apis_11 = buildGoogleApis { + name = "google_apis-11"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-11_r01.zip; + sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; + }; + meta = { + description = "Android + Google APIs, API 11, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_12 = buildGoogleApis { + name = "google_apis-12"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-12_r01.zip; + sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; + }; + meta = { + description = "Android + Google APIs, API 12, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_13 = buildGoogleApis { + name = "google_apis-13"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-13_r01.zip; + sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; + }; + meta = { + description = "Android + Google APIs, API 13, revision 1"; + url = http://developer.android.com/; + }; + }; + + google_apis_14 = buildGoogleApis { + name = "google_apis-14"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-14_r02.zip; + sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_15 = buildGoogleApis { + name = "google_apis-15"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-15_r02.zip; + sha1 = "6757c12788da0ea00c2ab58e54cb438b9f2bcf66"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + + google_apis_16 = buildGoogleApis { + name = "google_apis-16"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/google_apis-16_r03.zip; + sha1 = "63467dd32f471e3e81e33e9772c22f33235aa3b3"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + +} + diff --git a/pkgs/development/androidenv/androidsdk.nix b/pkgs/development/androidenv/androidsdk.nix new file mode 100644 index 00000000000..5ea05749a0e --- /dev/null +++ b/pkgs/development/androidenv/androidsdk.nix @@ -0,0 +1,153 @@ +{ stdenv, stdenv_32bit, fetchurl, unzip, shebangfix, makeWrapper +, platformTools, support, platforms, sysimages, addons +, zlib_32bit +, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit +, libX11, libXext, libXrender +, freetype, fontconfig, gtk, atk +}: +{platformVersions, useGoogleAPIs}: + +stdenv.mkDerivation { + name = "android-sdk-linux-20.0.3"; + + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + then fetchurl { + url = http://dl.google.com/android/android-sdk_r20.0.3-linux.tgz; + sha256 = "0xfb41xsjaf7n6b9gsrxm24jwg2fi1hzn73y69rlqm55bw1vxhc1"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://dl.google.com/android/android-sdk_r20.0.3-macosx.zip; + sha256 = "0eecaa04950d5c540f36ab4183a4cbaef3ae6a7434467bfc32febaeb796a8ff2"; + } + else throw "platform not ${stdenv.system} supported!"; + + buildCommand = '' + mkdir -p $out + cd $out + unpackFile $src; + + cd android-sdk-*/tools + + ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") + '' + # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++ + + for i in dmtracedump emulator emulator-arm emulator-x86 hprof-conv mksdcard sqlite3 + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + done + + # These tools also need zlib in addition to libstdc++ + + for i in etc1tool zipalign + do + patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i + done + + # The emulators need additional libraries, which are not in the RPATH => let's wrap them + + for i in emulator emulator-arm emulator-x86 + do + wrapProgram `pwd`/$i \ + --prefix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib + done + ''} + + # These are shell scripts with a reference to #!/bin/bash, which must be patched + + for i in ddms draw9patch monkeyrunner monitor lint traceview + do + shebangfix $i + done + + ${if stdenv.system == "i686-linux" then + '' + # The monitor requires some more patching + + cd lib/monitor-x86 + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 monitor + patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so + + wrapProgram `pwd`/monitor \ + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib + + cd ../.. + '' + else if stdenv.system == "x86_64-linux" then + '' + # The monitor requires some more patching + + cd lib/monitor-x86_64 + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 monitor + patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so + + wrapProgram `pwd`/monitor \ + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib + + cd ../.. + '' + else ""} + + # Symlink the other sub packages + + cd .. + ln -s ${platformTools}/platform-tools + ln -s ${support}/support + + # Symlink required Google API add-ons + + mkdir -p add-ons + cd add-ons + + ${if useGoogleAPIs then + stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("google_apis_"+platformVersion) addons) then + let + googleApis = builtins.getAttr ("google_apis_"+platformVersion) addons; + in + "ln -s ${googleApis}/* addon-google_apis-${platformVersion}" + else "") platformVersions + else ""} + + cd .. + + # Symlink required platforms + + mkdir -p platforms + cd platforms + + ${stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("platform_"+platformVersion) platforms) then + let + platform = builtins.getAttr ("platform_"+platformVersion) platforms; + in + "ln -s ${platform}/* android-${platformVersion}" + else "" + ) platformVersions} + + cd .. + + # Symlink required system images + + mkdir -p system-images + cd system-images + + ${stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("sysimg_"+platformVersion) sysimages) then + let + sysimg = builtins.getAttr ("sysimg_"+platformVersion) sysimages; + in + '' + mkdir -p android-${platformVersion} + cd android-${platformVersion} + ln -s ${sysimg}/* + cd .. + '' + else "" + ) platformVersions} + ''; + + buildInputs = [ shebangfix unzip makeWrapper ]; +} diff --git a/pkgs/development/androidenv/build-app.nix b/pkgs/development/androidenv/build-app.nix new file mode 100644 index 00000000000..c35f7175e3d --- /dev/null +++ b/pkgs/development/androidenv/build-app.nix @@ -0,0 +1,41 @@ +{ stdenv, androidsdk, jdk, ant }: +{ name, src, platformVersions ? [ "8" ], useGoogleAPIs ? false +, release ? false, keyStore ? null, keyAlias ? null, keyStorePassword ? null, keyAliasPassword ? null +}: + +assert release -> keyStore != null && keyAlias != null && keyStorePassword != null && keyAliasPassword != null; + +let + platformName = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then "linux" + else if stdenv.system == "x86_64-darwin" then "macosx" + else throw "Platform: ${stdenv.system} is not supported!"; + + androidsdkComposition = androidsdk { inherit platformVersions useGoogleAPIs; }; +in +stdenv.mkDerivation { + inherit name src; + + ANDROID_HOME = "${androidsdkComposition}/android-sdk-${platformName}"; + + buildInputs = [ jdk ant ]; + + buildPhase = '' + ${stdenv.lib.optionalString release '' + + # Provide key singing attributes + ( echo "key.store=${keyStore}" + echo "key.alias=${keyAlias}" + echo "key.store.password=${keyStorePassword}" + echo "key.alias.password=${keyAliasPassword}" + ) >> ant.properties + ''} + + export ANDROID_SDK_HOME=`pwd` # Key files cannot be stored in the user's home directory. This overrides it. + ant ${if release then "release" else "debug"} + ''; + + installPhase = '' + mkdir -p $out + mv bin/*-${if release then "release" else "debug"}.apk $out + ''; +} diff --git a/pkgs/development/androidenv/default.nix b/pkgs/development/androidenv/default.nix new file mode 100644 index 00000000000..6240e264b99 --- /dev/null +++ b/pkgs/development/androidenv/default.nix @@ -0,0 +1,57 @@ +{pkgs, pkgs_i686}: + +rec { + platformTools = import ./platform-tools.nix { + inherit (pkgs) stdenv fetchurl unzip shebangfix; + inherit (pkgs_i686) zlib ncurses; + stdenv_32bit = pkgs_i686.stdenv; + }; + + support = import ./support.nix { + inherit (pkgs) stdenv fetchurl unzip; + }; + + platforms = if (pkgs.stdenv.system == "i686-linux" || pkgs.stdenv.system == "x86_64-linux") + then import ./platforms-linux.nix { + inherit (pkgs) stdenv fetchurl unzip; + } + else if pkgs.stdenv.system == "x86_64-darwin" + then import ./platforms-macosx.nix { + inherit (pkgs) stdenv fetchurl unzip; + } + else throw "Platform: ${pkgs.stdenv.system} not supported!"; + + sysimages = import ./sysimages.nix { + inherit (pkgs) stdenv fetchurl unzip; + }; + + addons = import ./addons.nix { + inherit (pkgs) stdenv fetchurl unzip; + }; + + androidsdk = import ./androidsdk.nix { + inherit (pkgs) stdenv fetchurl unzip shebangfix makeWrapper; + inherit (pkgs) freetype fontconfig gtk atk; + inherit (pkgs.xorg) libX11 libXext libXrender; + + inherit platformTools support platforms sysimages addons; + + stdenv_32bit = pkgs_i686.stdenv; + zlib_32bit = pkgs_i686.zlib; + libX11_32bit = pkgs_i686.xorg.libX11; + libxcb_32bit = pkgs_i686.xorg.libxcb; + libXau_32bit = pkgs_i686.xorg.libXau; + libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; + libXext_32bit = pkgs_i686.xorg.libXext; + }; + + buildApp = import ./build-app.nix { + inherit (pkgs) stdenv jdk ant; + inherit androidsdk; + }; + + emulateApp = import ./emulate-app.nix { + inherit (pkgs) stdenv; + inherit androidsdk; + }; +} diff --git a/pkgs/development/androidenv/emulate-app.nix b/pkgs/development/androidenv/emulate-app.nix new file mode 100644 index 00000000000..df821f300d6 --- /dev/null +++ b/pkgs/development/androidenv/emulate-app.nix @@ -0,0 +1,87 @@ +{stdenv, androidsdk}: +{name, app, platformVersion ? "8", useGoogleAPIs ? false, package, activity}: + +let + androidsdkComposition = androidsdk { inherit useGoogleAPIs; platformVersions = [ platformVersion ]; }; +in +stdenv.mkDerivation { + inherit name; + + buildCommand = '' + mkdir -p $out/bin + + cat > $out/bin/run-test-emulator << "EOF" + #!/bin/sh -e + + # We need a TMPDIR + if [ "$TMPDIR" = "" ] + then + export TMPDIR=/tmp + fi + + # Store the virtual devices somewhere else, instead of polluting a user's HOME directory + export ANDROID_SDK_HOME=$(mktemp -d $TMPDIR/nix-android-vm-XXXX) + + # We have to look for a free TCP port + + echo "Looking for a free TCP port in range 5554-5584" + + for i in $(seq 5554 2 5584) + do + if [ -z "$(${androidsdkComposition}/android-sdk-*/platform-tools/adb devices | grep emulator-$i)" ] + then + port=$i + break + fi + done + + if [ -z "$port" ] + then + echo "Unfortunately, the emulator port space is exhausted!" + exit 1 + else + echo "We have a free TCP port: $port" + fi + + export ANDROID_SERIAL="emulator-$port" + + # Create a virtual android device + ${androidsdkComposition}/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} + + # Launch the emulator + ${androidsdkComposition}/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port & + + # Wait until the device has completely booted + + echo "Waiting until the emulator has booted the device and the package manager is ready..." + + ${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device + + echo "Device state has been reached" + + while [ -z "$(${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] + do + sleep 5 + done + + echo "dev.bootcomplete property is 1" + + #while [ -z "$(${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] + #do + #sleep 5 + #done + + #echo "sys.boot_completed property is 1" + + echo "ready" + + # Install the App through the debugger + ${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port install ${app}/*.apk + + # Start the application + ${androidsdkComposition}/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/.${activity} + EOF + + chmod +x $out/bin/run-test-emulator + ''; +} diff --git a/pkgs/development/androidenv/examples/deployment/default.nix b/pkgs/development/androidenv/examples/deployment/default.nix new file mode 100644 index 00000000000..7ef5b1b108c --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/default.nix @@ -0,0 +1,13 @@ +let + pkgs = import {}; +in +rec { + myfirstapp = import ./myfirstapp { + inherit (pkgs) androidenv; + }; + + emulate_myfirstapp = import ./emulate-myfirstapp { + inherit (pkgs) androidenv; + inherit myfirstapp; + }; +} diff --git a/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix b/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix new file mode 100644 index 00000000000..6631e380f6f --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/emulate-myfirstapp/default.nix @@ -0,0 +1,10 @@ +{androidenv, myfirstapp}: + +androidenv.emulateApp { + name = "MyFirstApp"; + app = myfirstapp; + platformVersion = "16"; + useGoogleAPIs = true; + package = "com.example.my.first.app"; + activity = "MainActivity"; +} diff --git a/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix b/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix new file mode 100644 index 00000000000..75f1f1de7b6 --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/myfirstapp/default.nix @@ -0,0 +1,13 @@ +{androidenv}: + +androidenv.buildApp { + name = "MyFirstApp"; + src = ../../src/myfirstapp; + platformVersions = [ "16" ]; + useGoogleAPIs = true; + /*release = true; + keyStore = /home/sander/keystore; + keyAlias = "sander"; + keyStorePassword = "foobar"; + keyAliasPassword = "foobar";*/ +} diff --git a/pkgs/development/androidenv/examples/deployment/result b/pkgs/development/androidenv/examples/deployment/result new file mode 120000 index 00000000000..40f0d34dd64 --- /dev/null +++ b/pkgs/development/androidenv/examples/deployment/result @@ -0,0 +1 @@ +/nix/store/25fv9x71ljmm6vz36cj61bxmcydc5iwr-MyFirstApp \ No newline at end of file diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.classpath b/pkgs/development/androidenv/examples/src/myfirstapp/.classpath new file mode 100644 index 00000000000..a4763d1eece --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.project b/pkgs/development/androidenv/examples/src/myfirstapp/.project new file mode 100644 index 00000000000..c066df34ea1 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/.project @@ -0,0 +1,33 @@ + + + My First App + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs b/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..f77b31c2d2c --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml b/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml new file mode 100644 index 00000000000..12e1877a5a5 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/AndroidManifest.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/README.txt b/pkgs/development/androidenv/examples/src/myfirstapp/README.txt new file mode 100644 index 00000000000..26263c11aca --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/README.txt @@ -0,0 +1,6 @@ +This is the example application taken from the Goole Android development +introduction: "Building Your First App": + +http://developer.android.com/training/basics/firstapp/index.html + + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties b/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties new file mode 100644 index 00000000000..b0971e891ef --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/ant.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked into Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/build.xml b/pkgs/development/androidenv/examples/src/myfirstapp/build.xml new file mode 100644 index 00000000000..924742adaaa --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/build.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png b/pkgs/development/androidenv/examples/src/myfirstapp/ic_launcher-web.png new file mode 100644 index 0000000000000000000000000000000000000000..c37372acb9ce85afcef436b349984adb8735347b GIT binary patch literal 37099 zcmcfog;$i__XiALGedVM(x4!S(v2V?NC<)o(kb1gq%cEBDIL-wVbCERBOu)!!q7-} zGc)hS{rx@fdj5iEE!V=e<~rx>Iy*jlpYWIJN~A>eL;wJgswgYG1^_7dUnoF;2mU$s z8oLAl1fZfIr{y)X?MLWkWLfwA%`J->1#bmFA3nqTc<&yK!ZQU0o`{H^ zyk`k=RHbKY2no!y)0jS2=N1 zbR~6WJd?SyjV?a(4LymXlc&Iu`~Tt}*&qCnl>d%e(e08ECy)^)INJ&hLf8Gq7~zrK z{7`;pNjfIRI^rbs#kDfcE{dF-HW-brbHIjN2$9@UBcXY4LuYXAvu2rq!CR*ePn~Es zqBo_6+JoLPr+*CHzF&zp>S!^?)I<)(^Tc$K&{p6Q!f*+0wl-rZXHi}ea^AVJCTP$b z>W5+ksL98@XwRq2qy0R3lX$3+QBhH|PnZW`R`rG@_;XHYY{NG17BeZ}cyQ69y|xy! zYu|Hl;~Y50k+l>%n+-oc@fz!0p)~%NF34;ID?wn{N-;(r{deVzMRtL_`_^gVBb`hg z9UV_noXM>d%p}FC!oBjliO)p>?#0n;u{wU>{h+vfv{boljT{Wj;!@3a=>j0F7_2<+3LNh3n7hgD}0${ESLF@a^lPC%OLsB#t%AkLo(09g~ax`;RZHs#03SaAMYQ&T!SeO?)!%mvhAN?h$& z$ob-7ev8vw{lQGJ>+^fD-z%oPm<0NkBhI4^jFu%?j{Lh#H7a2@=J!GY{>4C=#9?N3 z*7=iSF7C#=8C9dcQ5)H--2;*Zy`dM86_)t4B;dYNFONOv4-0?(Y`#N)g9&wVd(IL| z>Lt4Wc|or`j>(i?7PL#wVRF2nQd_YnVylr;ZQBTjL9!r7AS;1A0XF+<^h}Azr?dj5 zg^UD&x5Qb8MW76Y0B>WU0v$P$v&BIO6Ry?@{@TrK~k2)?sG~bbk*Z3^F|9Mfb zP3RjwOmPsY)Y&NW0$BveQMB{Vot_QW?yy{*&N{>2NQPyNlC7+LpvZLjsUzw`9r37s z`SA4g`_d;;Gw%vfc5+9uo)(e$7On^IAN#$ItI`)}ehN4_rWx)?^c@asZwZA@o|BwQ zby&Bp_vM;q(+#p_{t@sa4PGlkV)}?c{>3N`!80A z#-rDEZ%6XrY+~Ce|B_5y{cA!cJOW#(crQ`> z2bBDeKyjDj*Z7H4i@`D1qtF0kZ&Oo~^tXAAt!ov%pW*9|BF*Z)_3+gcopg(&4n$TQFCIz-Klh+g96B?GI28b5u{!~U-d-PqIfBcW> zW47zHndbT(_>R4aWPNV#vIcljTDg`MH1aGzaUA3B2zY-`eM#McxUTNw)Jd#g^;MnQ zOnTxUt~xN;eq^{aLAofTNj*C1$c|aq@L2=0SY+`1nXe7+*#GXcR5jXM|1%hwg$+;5 zzVvh0XV2qV;wI;iYVZm<;7+T6qECo!Orv$URYo@z`%+j3H|V!mRhkxZAQa9${^&(c z!t=#19)DJvs+(ug=BW#FdK+K1bbKrVIWF(mwR)xYvGqAd zK3B0;L(lJD5wrW;kKO&{tIdkA)^}!|diB3_P2_`$q74vM0u-v_d~ zC&c(c!Q1$-AG;{f5Ve2zzK{6pyl#t%fq~F^4QgNE=B6s1qV_GxXS|8^GV<#id((W8 z&L63uVJJ5Ltn;R~m%wV^S`7M3XfdU;GTKuXey1-tc$*rOhihx;=9MSP@9diq@1(qk z@Rpn?eXi4ZbFke^+C1Z{jjh>7*M~>r#&0^6CZ#@pIJZ%|n{DW_^*HNqg8(a^aImGE zf!0GQ!f+c@s8Jz~7ye(Tvs^FEj_r9)q%7zl4TxHXr)nyjW!`U&X`WpAcWH|l`jMdu z=Z+=s+5R}-eDehE_C_|GO7kjL^}2ajjUYO3eN+B*p&tuVY{I4gOWrbbZiFXv4{ttJ zpy8CT%q)hL;ED+D>Utot=;B3rS~>eG$N4ns`=)-2RbA*k2RV%LmGSQP<3c32ow?Ax zMm8^<{ek}!@ALzc(b{7AJFtAltQzT5@I;x*Q*l(V@cu)M$&V`~r2Z+jt+^vZ>pWII zsEGEnz&-qV7`$Y^H`gHW(8^uGFPhR9568Aq(krwA2g*$fMj@et!R<}dvvU(T`lQq@ zbkad`?tIv0H~gEW0e`;X_E3QTl}}5(UZ%!yjnN=7vBw@+*sLUMGl3tsdG%{nHXxHS zInvV(A&XcJ!jW51IFDSD&h3!Vl&qqv-dfSfd!va${e(V0=E@tm8wkO1KleX)GFv4a zgKS6~X4`*-2O7j@t9rQDB7F15H|bI)b!Xd9tv+pa#|`86k{>EK*jspyy7T|=)@7G< zdQ3E|Af@bInS=wVJw9#U)#gY)W|#m&65f8)qEVaVqy{Up0(69Jyw_Ii(juMF!}nWI z*owJemW_osPh7{R&Sc-e^sg9+uZj9_p_t(AU)ERLA!=Q%Fz$}9eC9!dv%j0tf!`nU zbeo)&;BD3@dYaoeF+juGdfm^%Xy8cET{kkuFYRmAWcyk4I?x{|nn}OEXvBEboHG;v z!vQ&=2qJ=4y^;8@=2EF zko+R2Co#^xp=mG$UBDOm*4H_>pS}FI@fvg8*9V@clH*LV$WpW$=U?@|$LMU2Op~kX z3j4I(cCz#|bWE1-{}So9@{$3MkH@Xs-9WzLsjvUv@+zOqZ3~glp11e5DXw4yfu{8) za};F!`B&u5&dx1D8R`w&?_jM(p1;I?NG+EugnU)pEi$)Gi<4OG0(_=hSyM+P~ z<6rxPgLgbgr~1_h_5|l`lW++Fmzo&n`aj&2<0fi}{zxw3q;T#Ff(s zgkk?X8Hv|cPiKxkRsbD%O`^R73mF{^k)DlN6+k5fC)T+}sTRq4l%hsRr}D zK9=0++F_SXsa}s_a5`vQj%(v{I8%TpwCf~`Dp=tVy)?n@&!jpLqlPoPJCrU`A z&^&j^z`($nKWZE8n3`JUUi~EQb>^;Sb%;mQ$*bh9VU8X(>gRtCwH%d+B;SrOJ`bN; z0vfNxVacSdVb|YJ9_?YcGz&g(QH3W=?MzTj-UGt0dGDn!tnPlys_Iz#&7gDU$n<%} zeWz@J8=1nthMt3Nld=-v=Usa?oYd6RpoV8>?H}!FI=G~v=o4GC&&Se5jjoj+Q4X?Y zs^UPMMU))sTq&%f10i=UKuwo<^~l&4%g{&CO#ht7+D@EMeqJyUI{sMa-CIo;Mr#s4I+7&vo0h4bdYq)GZY-#jXuUJW0$3%X*pq7!oFIbXmMTcupixc_obNZt5)gH z!h5SSWTQyaHS#vb_FB6$3twE1cR3w<(k6XYKZcY|-Lg$*5|{7T-elM}vw{({KCZ!# zTm8LEOhftZHF>Jvi=DEoF@VQ=Y<1>bd>S{dt4dz>%kv9A7-K0t?izi6*Oq|8ahg3$ z$l_q>&wBLq__G+&KpeB!gqFHt^4LpCCMG8M*3Qnae&bPNqig$Xm6U0!#H`{&x5nsq zeYFcBy-&c@DNO5%ic0Nt#;!bOo|X1bN?_$P8S^PtWeOVQi@lM5p=%l7ogMMmwU`MA z^VxXv22z(y{6QI?%Dhll#Bfn1j5HMIGv4pS|5z`$o-8qv1nY&9shyV_QTdh`l6NPI z|G6JC^d`t`488j8yg7?|r|KE#g>7{nEi$Kza1&A}IK9SPSr%N+&dluY?CeC&?(qM< zTbnKNQ?&T*8y~zsS?|0k5bM`b&s)?`%(40{PlAAS5pnm51RU}EvJ`BFd#IGdmX$bF zb%KvikG5y5t`#+P-#^!6?E0`wTG)7K=%>6*lKwvgoWZ0c&5{-?>j0|v6`gsjpn9}<@FAy^f^&y#CLv57j) z9526nyi>Ux@M>nfrul5qS7)d(H9Uo%fx#%0-b82_T}4%sIAO0}r_$F=53{BCDR8FT^JDT{MHfH6H38&E z+?%jq&WrubBz8_`L%_c3x%Hvy_fee2PTm}gQX><02O7hO$_PIQPPyk& zi$N27bL@wSDmztwwJPb?SIUxo^K;CvG6r>%S_Nd{`sS$-naMImXT8U3VLr~=^mq$J zPoqaz!PRodqubVfXDrQc|3s*cY*g*6UA^j6cuY;I&M$j$N=1Jivtrur8+eAh7ir`R z9lI*c&=YUyIOe(4vvvo$CL6efiasy2Y5^U;i5=hTv7{feJNvEaG9#($BNJcPL)9Aj zyqxzj3a?Lj@E5jQ=|pASS%ZMU6O2Q@KmSabc_j;la^7mj4&}wTJ|C&SvKt?1kdyK9 zo4r@alKJ00jM-^;FXLaUX(dM5OEXwR1Ipy#^1+ba$jjy3&&DEhNGh3w1gPK$S!D6i$nETWH3d$%v+mSYavM-PKu*Q5_R z!Q=i~8^4^&?Z7!O{}PY_1ot6Dw=z-mzkDTRT{;$v7%I1dfgs=>{10}{6UCIK#xc8d{g!Vl zqPHzA$j!F=(~?G98zT-YwaX-4OW!o*?FN`N(|{BnL_s>D#k&K$?|rmp6!Sd4e&U0A=;#cdO_*F-v42O*uE8h~&)a=N)R5F7a(cr|HGUKbAqwloD^P1F1Nm`k^pdtbr@V;zHMg)=Cn1yL>p_W z(ha&v{p+~AXXm;vUTUAVJ38OW!-uG(C*JHIj?MD%^>t+V>bq>4QX#_rg(v?HpNhV% z_t3IF1>$U!5UCd~6fXyu`5vIEY)5%KS}qunB!blm2WuK}6M{taE$#PZ^foBJ0oGP8 zUXb=eg8lxqR8)+dlEP(`*o)IKteEw3kl-Y?=WYbhq<8IkJaKN%DJVMWdRP%<1~u4N zOG`_ccY)`*ziD5<;|l{DFXHq5OcJ1s7d0g%sBAkepiAPaC#;B3NbqVqR-SGN-dgvHMMuhGu&j}r!K0p_!hZewRrU3c1k@>C zhR0FohXcPfsNG65{v(x{AQa#G-Y5DLL$_Z@z7+(JDG`;4AfNXS#GFqg-%b?i-IvF6;2X zUmkH^SG=@91o~L$5=H_Ii>*a3LuOGF@W{?{H0CL1Sc|~nB&}NaUawz|bvph7m69*r^m$PX?iPJ%F@(yw#y{~Yy`@s1~t2iPYALt`2~uYunoG`yvB{^ zufNq^(;?%X`S0nbbZ~x+tNSq8a;Sl&f}d` zZ*K!#5u%LlSedwY+z0+9EhB8vPJ|KEa?!wBaTvnL3hi9KQ4kLTCb{vOn14j4oIa~x zQqN6ZZ!g_di6i6mfh_EXmm_Q2>>%Q4u8PY=%<*$<2nbN_x$GYxYg!i%if?8pKSMwt z9cPg#f;%uznYb2n^c*6d>#FT86+;^p1%H>wJUTsn(Ky=9qC3v?1yy`Byc5lS)OVjE zAK-K(=_7%n^uC z?toMJB3(ShfruT?@lp~R$qt5t2I@a7h)EentQSR`g+G;fi&)WN1YfMS=z@A5)W-Up ztci=?T@d7T*m)FHE}d066~45mdfXGSTYGJqk`@JLPgyq)&`GGZR8dl!Mo9j;g{Wk- zew+pkzbk?k5fOQ^qHxfu5o{@goubuRmX*R$i8Bv4vs;JwKt=}CJbtnQ|9y-}#dyqI z)7-gZlBoVIUi|~*({AI{GZ`mWa!IU8+~4jx$*&`H@2zOSs~%P9*SG8OdmG<$uBCJr zKKSJ916Qo_JIPz5#d~J1M64AuEXdbm9TxqpsDn;H}rCVQe0k&jNxu9r@ed+Q`zKiIRt9YB)rmC=4hH6Sr0dv zYiVxwuh9I%^6LrrbzM^{-@3~pxk{X#SFe87Cgt zYW@n=`%i2y?{}%Yi(LXFHlHxvS zi+rUHKC{a#@EF6}jkQX+kVUQ1+{l1FIiLzcZ$?jQ!G%=$fqjuCiYDA({)P_(D3rP# zKeneN7mQ;+ixQUsAu88DBi@vNEJL-!^x>VRTQ0P!5VGfJjZCSFt!@j!81f%jdid)C z(O`))jkpzK>XMu@XQJmHC1W-65kOU7KCqsL8J_k|2gMXezC>QM84e=9{xg_3_Bss+ z&=aOAX&%RiP?UY7OH{^LQGn^~?RD-B9cu}|Eq?Xp>e~fqg;!(5FNfGb?CJ%-F|y6y!|1}E>37*(m z{5fp@0Mqf6nc0wCg^Z!};rmZwnFGWcfI9_18j$pP`n@B6B|zhJt!eKs<}kHC`N8hG zZChp&t7FIaa0|RZWSo2kn{jai$wbh@;=2_3f@|nsza0pwT$Wizgq4ik`$fLBzb()F zP>%+YxI=wS1>T2Wk62XV+Ioq<)UHey-?b(Ec35%;(1*V0ULr+uBc3r}jr+dM%DlXz z+*7>up{F$-p9cKA>F)k|VN=DQFMSOFp#Rmjrx!e=WEnNk(E`UDWm$7lg)29YW5m3u zZt}SfK{O}>f@Ek$sS&UCyUzP@oBa)}Kq}O++lC-dKKmmhR%X<@xf@$hrcTI;341_E#mfTXYG3*i* z?a2qrBEK6+fX^Yw{xmU-2?nSHO;>pfqf7!lwoZWc4$tB_C{(syXPVP45K)ZVO>88E ziqqH>m$xjZrln!OMAyI@gEPJKIf`@7WK`mEYZ$Uy<72#-6(Nc=K&nuIvn78g)ZOI@ zC2@MTWrDpdJn)i=yIF*=EU8T$T>Y&Ow_-!F+TmHP#Gby{Kg$gWqcBHc{wb z)z!_ZrN7{xu}#yAvG%%HP8GKVuV>)~#f)d1hho4`e}M6-uBnq6oNU~y4~4~?2_2oB zlAkZx)>V#_k|4bJW7#F>ueEbjoeXzwgW3KC5gRc;8c4H|s^FeI+=$+rDqlYN(1eEZ z?%*ms-u*CxjboRHs79g;Hj{Rx$bsx9V7qHH1(&vI78}s9gJr>C(-vGMj!~r5={m5L*_JH-u!3@k5l1#C`&j`u64deM)}5B7CiKpSW;Bc`R+yYU zj@`W#tQ7vbT0yd(fxkzsme!-OS12s=w`a!PA84>U`o~RWJUu~S?A_@Uq+KGIycMBi zZdt0-gjn3{XZr+yG0|h^;b3F6?!y17lW{kp_%5>oyUJRy#zcq~4J!%;*iZ@+&g9wO zssz~HUCErLSZCJpr>GSif`Q{}RPx`ZyU71G-)G*r{wY|7Zhu(ALA(%QKSVLvv75h+(?3XOymq)+UdHty>RB!8JbFr{N4>$ zpCSwe!8AkxRUoU$2UG%AVMR6Aq@<+D@^}f9GZr~^$$tlkWlzzRL4325k6Uvs0?EXQ zq-Q0T-OgFZ4h&#T(3?6YK}S^1SU<0?A*2Y9t0Z!5{67rqDGnBp>{mlSxtjrQ*!Jp< zNk3XlSXioa7S2+Q8!uQF@xPBfwJt52B;`)TEFsx%VCPT@c~Hm4*D`yJN9y5!-Wtzi zuFC2;d24jez5k=+?d^-}i3jACnlykuZhub&8$u7!REKt+DqC!}5bU09iK?3+KARO} zA!h|S?8z!Q>=81MmrC$tBD`fo1G4CG)fr{Et&g!_rLeKO#QI5TQ^##-yWqsIcmH+! z>OuCTF$E%PMF*tf?u>|RoA*Jtr~jek=*cI&{*L6UI)gZE>oNA~e6j#>?IHmKz(aZo z?>oJTV)tMGPq-tjHdzrQP9-k9oCP}$+jtO(U3aU~K0IxCgwbC8!or=452(b|t$tKB zJX}s>X716e0OscAdUMR`ll;^sMd@Lrzt7kCBU!M6aEv?HLsC5gm+rS3DU*Xo(E+-3 zbo`{GK}j2_isspJsaT4;Okb7MIEBT;S_aly<__8{nJ=u&$p6QDC9%&6*d=1_K?}p4 zwq;w^7cj-e;<8=}U?gbFZ^bIJBagAWwI6;MbnsXKvT+u>-V{l1zTs8VAglnP-Bkf%la?);i8`P{kOh_(jy?idT=0qiRJAIxb(N|IwH$2nhF&k$BOjK`OtGLrj& zi_awEA)p#)hybFQ+zPfnz%*MBs3N8Bv_cwXU_ERxTf4iw=9gJFADt2cYujPZHNzlC zSxdmiAjt~Z_ztgc=K7|OW<(LGII4yf0$5c>n5E<;qnW>xJ^#r0Tiyo&Zn#s@u>1H+ zKLRa`eWRlz(>9I83{$Chw~F3yE(nwv&;c`ek-cYD$i8W;{7FX`cKyUBEg7@NG8?Gk zZS5O;b3O^+po@p-klRulKzOec#-w0$2H<>6$0KLv<;nbLl+1qMTxpYyH9ts090ak` z0}P4VWOUQ<@AUwBlbDIg$(EjD>;eP{yOB$kF5n^qL)`rW$$k$jA{=O##zwRF9S>)n zTzts*A0yx<@x8#%V;kd+)P=?eFxm~Q5e>F4Szy_x0ILVRIYm|)G!bt-8XSpc5|AJn zdiU7bYDeEMYchSH0dxb%4Ny`{!Ww5d;*U*w0L4ozo8Aca$^WyzY-R$)ry>C&y|f}I zTYZe>ocF)l*<2K+y{!D2MP-A$Sk zAQc{1`|GONo!xdD9B1tR)E+~w2iP!Ik<%xWj{A9-- zA9){gP$RN7i@>8mre#d%SjQrLwB+XZT=i2gDgQB9uPbZt{^m8ofOJ*ytgt7&P+3^c z#~}rq+>%&)i9fgb-LLnQBRLx{Hw$G5@q*N_mG~eT_&9+0ml;}M`wbnSe}1`Dip81v zZl7n~0TJrNM*Z%R_x8RJO2?wy+g~>=MSWW>dM5SmzngUiAopPij?HC6r?@3!8S0<~ zj2RF6WS2rYL&#oW-%ucLxGZ!jq5;Nm#`R`U0u)yh1OzXFMIYNT4t>WmEW^J$UbptuVFI8rtx9`l(&Mt#)2m;&?=BS=7 zFCHD{M+{_#4=LJMba==boI)&$u`*ZNm6PE7&x0#@QDFB8rd;5G4&Tu}a8E_>TVrk4 zeGnWvd^z8#C~I@?63C8K{|D>R$MW&;`2Afz0M|@l&zNrpQrd6dSbHDOO^aY>3oVs! zR!$D25;$^maa}}HUjh~V*sNO1-lW%KkB3f_x6OgF^c!DNcYok+x>9>H1pG8u(P{%$ zHg1e4+JcMtSO5AoPCP6B?g^DI`MDET?o<7L;a2q?8f&MS9C|1X{cp+BM>}AVKZZRM z8^>zY9t}wHZS3x9SBDm1_ZYz08MjHin=87O6hCocVQileddPnak!8q++t~D(72QD#-D5x7V0}x8CF&6CgUn;P~crT=el0shsX$%-}12e^#7RT9YtE@pK;svu-Vp20p zX(}dEI(uLr!6# zY8})4coqNIHpH~#SGOa5zW=3JH=`x>9+Y=O@I%;GtEf^5cg94H%{>HgdW3<;GzEB{ zXn1_uU4T5?{r&8!M+1tops9AWXyN2#Kj~=mq6O1K_Nt2S-~S2BQT)@Dq=Qjh**SHQPL9@2V2ebQ+!9^A!lZ0igi81 zc$M&gHrQtowRkMQfrUPWzauSEs8bqL0j)2rs7+dqu%uK29$z^4SQ$h267Ymt5MXfYE9q5V`y<|t(_{ihg|*)miSSwxCB1G^K!r>7nQ z96;EjypAvrip#BAjOJut_MVEHme*RV6P?Zw+pIiS4u+iXvkG9tQ8lU_iO>@R)U%|~ zd>I)T=>RRH_O0!BxUbyZo9m<$YHhz1O(|KgiMUCSg*tp!q{A)3C4sg-O^FY*s0QF%dUg$yEJ((3MD2c z{^=kCL;*6s)*r?x!&Hgkk8B9Q^5)-u&+8hgR}2ZVffv|V8ysN|sH|j8PJI${<}iWH z^lhXfY=KiaQ_H|$76)z~1(3-sZ5aPJW?#8eX#2nQ`a7)5UlEd% zF*L+o7{EgZY>Ptn!J-2bH!-2TNU+ca^#cq^Kx&nbTJQ6w7~Xz4t(3XOMhzq@LU8Hr zLRAn&)WDz&_PSIYDt?$eLy?qK{FV*@*0rnTNp-8;`c43&O0p6pC&wchrwiPBo&?r+l=HUwK3uH&mZdsr`c1){j&zd9b3inzfRl%f9#|EYXVzIGN4KLOkB6HbtyN7J8dq(-tWoVb~oXYmsdtclH8y|FDM}@Z?pia)L@h?%Kht40Y zZ^0*WFi(81j>y*sh2ye(P2kNrAEKHr)WBhbAD%W<^V6dunZLdpSTZ!2r?1g(fRPG{ z2q7z@M%GIL!kLX=3k=T(_)I2h^XdW|m$_f!;X>7RH{{*D#}V*f6KR_B6&+{N_~%mc z=sk}scl#?$pA%fC17&vY3BzDd56&zxbf+78dJWd_PFWdE-sUYcwB*^+IzKiAq(SG4 z&&t>Pxs&IgKK&6R_RRw;Gs@6uVt}5AXI$h&`Oz*;*JJ4S19wtVQn?ZcGn46~JD0$K ziG!bkDI>d#{%$PodKlr`(*2>eY{NH?eaNzxtK4yS;qM`*Zjp+BX%TKn$Wzr~DWc@} zIQ!d`gVMQmb$WF4E~NWixtvK!b;Yj?KEv)MhRIrjGb}S~+@zH4FDb_Z*ZP}-|29q( zDtM1=!$GJ8eqz>KntKb76}qu4KEDmsZ+hOh_F>bCz+UZg6d?}}&r|B`VTeOOjoq+> z6RyWU7=Sfkc>6q-^%R)*(x0~>>J6qk`(A)8cebdbDZ8R-?1~f?>_gz_&kR0Tz%LSp zp1<-_Th#r`qn7dbq(;(Xn*#L7)Y-4vU)U?2S(TO6MAW3RU5^mF4MP$cCkzfS{lSwh zV(6TB_4XKg;|-{91f~Ru9v3;y)uzYotH*U&>q{XAV-%MX8!ZDrK+7bh#q<(C*yuE( zt;0**KEZ@hjwDbY{(624x>l*=J%is1#~9yUxWgX-0feb%2uVLC>3csiU89j*g}l_& zJ-=rJD6v!;+;eM)^ne*Q_3@lJZCBE~5K?3h^FJ^)P{Zg;T<(c-&=ff4UJTl_ZsQT~ z{HnMkt4)p=85yB_2VwN93ef~He}^=1hCSfRm)dcs193JW@ZTMj z%A)~3(_3a9u;3*9apLS25hUlA#6+I0?QIKyzXuVrRIoqywnlKTOrF98%rX8NtbXa2 zmgdAMPoq74dM)qP?>6|odGy;>FPz_~eM(9UWagIsPhW_x6OT&);n1skv)}6vA3hWv z!4ntLEqt~G7SoPGqzGd~;TLa<9GcqNe}ak>k^$u{Ao}d2yZYuuW$uOX(lxSnv4VFV zqr_k(X=?Lh7uO}Qq&!IgCJ05q1l17IEnwoHJp-)c@#Ch>GnRjRl$~+|LB)ST-@`Ej zFwC@xA9wa_S_TOK=2F6LMLr?-Is$+M+=@$Bq>bbsP>2IGqyV;3`6VU1T>z_?EDw{& z`!V93TR0y)ZB69C=`BCR8HQ9s|0EKV-eLM2O1Oq~2cwT_&JS&2SPuzcs4ja=rs z7rZDVqocV}k#xXk-j}7Il-le{5C7Jv0*Gm=K88D0onHSayrUmF-{7cPpWtq0laZN0 zFDrEZq2oc#{HOP)nmNVw9s0b$)F0gaie6rZ8pl~t0UC$^&_&8T&zKPYNUHiF?DHfv zsha`TvmcC49vdzD?^8#M4t<*)4&R-<#WU48w=+DMmd}PpOKQXc+4)0SkLn@*L$`qK zcaX-N>e&(-2Zviu&_15jK(55sHJX4+Nb|$mJfV`!ESy+pUVQW~!+fFRNMn4=-5+@LEf;_75WO ze}k;U-`oJP6URhcV7LLXjk~QO5u~<4{CB1w4mO8Cn|SrYtIq3e=$&}($J4*sV1D#N zn-q}#3Qx`uMV2-m_RMuWG{pnza227}zZ4wq00`*uyF_bO!3OAo zn?lqT514?E(Qp&gPbsnmD9W>rWb+fW_J^^iUq`(iMS(+StDjRoo$bt~p68z7SrWAB zgEwcq2ZH>485*c_paM<+W>olHdEfywa=OIp!!JW)k)w{fM97@5L6*f|!7i*rC(#`( zSw+WPwTyEZjmb$&>qT@wd;*kD{?S_h6-(8d$tgCqE5MB&urR=RHxh_TYz*QePt;0? zRxHw{T=u_#gF;%4VJ7z$#c#R?<|4n-`Bt7*@-r$-zq4-wOcz@}mZm}xeII3$baCG0 zH5VI#Q#w3g>w*!C|BDjE(o&YdaM^sx| z>m>~X?4kYd{vAJY&p|^093B_Nv{I(j-|TEaYjfBSkrpn?k;KCKmT7P568PO_%_Pzr zOEMsIAOrde5g=|w%d?p9Q_SBtyf-NyVAR!hJN~PE3ZppvlbTuk*Mvz+3@b#lR$X=a zFDd)sGyX!WPXMx!YAOzbTn885X;#n&!Ta%oQg@>5X^OCg)k#a~#Qp^fz)TF8PE0d5 zxl+3u{hIYL)|L5uO2<4DSUA!q0m!;YfFvG+>I4Yl7sLdi8nKgt3z#{)v(7h3VWbSs z*dM7bORcGSs?q<#zVZ600|f~5SK90))M2SLgA_f&` zuXx+iD4U4yw-z=;Nufw^X0GSx#4M4}Q~*)-aG|8;H8s}vC)CX&O4Zp5)oCwB&_nSZ zO+5hu+CRYkYzlD!mR=IT2G_xFVeNXIsD+0U+NU4`IBC-szGb5}6IqD;yYiw7M3yCV zsIj9wL&~3!b$RhMa7oZIMz|r!PHqN(+o&EC1u4)w2zuT3&~>|$e=Z_IW(l^xXolV? zUKCMIKzy_oOT@TBRs99SJ()))>JbX3&~btvA5~*wP_Wbb!J=N^lWi7pRN(_6z`O82iLf)dQS`zDwNr6uD#x6EWfS zP9HhHF=JDLmsv!~1&^Gg|No(+m=V|(#H+O#{we_iUbA#S-fKpY^2haGZQqM$YuoCC z%DQVHKYrxBi1wJ}%2fgcBL0Qty;+cWMGY@3npdQNE*E_rNZuwm;;uFTQ3##~50b4{ z1&~Ic5%b`DW(@;9ecrckp%6qQLZrddalbeJ&nX`+0yQ3((xQWV{)Z|z5ph3QIbjl$B>FT1-=grRLD!1m$L$tfKU zI=|I9B{tu$AIDH@<@G4Uv5JI4k(OKwe^q~H%{kvn|1SpAtxBQCk@Y6Z7y|s4hh<25 z?lNdsK?mwd{(*H}Mh}4WM_wRSAG;8=|E-{|09=gZ*(R`?Z9V4?dNgBbt&qN7vv~^a zFxs;fgr)FpW~BQdC#o5O{7ffgT(K#bJvRYqIhioP{wOSr2NMLsk555_GlZu(FO>-S zV(lG14rJjr*on7LeQ60DVWeaaAxswjZHGb?o#_2s+t|FQ6PXZgS%C^>qt>7q7Q{zc)8pd|V z!!P4wJ-R=DS9&sHH~D<(+JuNWSC zjPlWRHP`>qe=F6F2#BhB3h*mpJ7wMy0n#}KdEN1x*v9&LeGm+2-#aU0DX96P@s%lH zckvEGtKD>zCKPBBp!i`x%Q{RKNlWAsxTq(`*L|OcDe;eQM4v)rmY&Y6v~?<2^Mj?s zO}x21^V7bF68NAnxsbjX1Uf1L&~5HG!+pm)A{i_@qnMVCF4&o)g@7{Gdg}ShK?l-l ze@B-Bb5^q6o8Y?5^vX6zjz|FDmu~@Q#Dy^Yy%kIIBvPZ~&SVdc3JFRv)nvf`@pD{| z=2Sm&3t%(@S+V&DEU=>GnM%ROex1=+k2h};tE#HPCb!<$lhOfGcjn5girhIZzz00j z+mG)Ph#O_ahiD*=cPMR%@@r)fQ=~3u1{1fxaOqQgUPnbNMVr!e==9dVomsc!w+Ed9 zh|mOsrB=?5A#Ee`=pm8GR0uLBl=YM zKmAM_3V1ZXI<;cFNhI5i+| zNVv^yDhQwf?HL!*^nT6SXN%ccDEieeFS;gVUuPDPa*3%}M1UzofIp4}XQ1JS)nqU- z5>kM-ef-ynIB1XkJMaErD;vU<%$V&@RUTU^YzpC;Yp)h(A3`by=Cq$waY% zE&jHwDN3SaeTdS}BS0t!*f(rqN6_;xei*xqKh)M#=&=84cd|`0FWCt9BBxd>dCUv& zJ0Nm$hF(7b&Z|nwLpM?zOiEw~@?}v(dAbt7ez66yEO;(G^F$vHVo_Pb<6@xYgO$rY4VipUw+j1~jxf%hfBR9JB8l6&Ld zWS04TC(PN;^+@L1>LH5|(_}#I27NNXO{W7acyS(I+)OFd9v-^cIymIrk;=Bt6 zHKt!ere*5e2Q$B~2TsGrTrVQ>1DYej`ILu?>CTl0Z-m+B>%p+^qkA+M3Zg^+!s7y~K0Vb@~4zK?l1)teKMls$n5Fx(7m4ic49T3rzA`@;9S#8M$u%b9IsCHO< zV48^sQ8ri#`QVd@1Hpq={bj?BK?CSbUZ3Ex-bMD#c74@pIav0byZxd&o$1xZs83e0 zkg6B_0meJ&nMfq?6huF@e?bOF01tOqIye}&y}4-@1zqEcA?m#A@rwB~!D(k!>1hx6 zQVQ(X3J}oBnSzaM|1%x@#3v<2kFP2z_lV~ilHv}z!}@6cf1G3 zUJY(dmfk7B9dPcm3xBBLH)ht!yFD=LfV_Fyku?*;y%kY7EH_o_7T%kQpGe_f`?AE7 zbF5P2M_-{+zX#pcR_Q1UGc|ky`s`Xw!58A0ldulvo`z)hX@K@$*e#+&`-oZQ1$16gX08_)!7! zwui0%Sh;OVO*Ud>O70Ry^#1LEj>=*aSILk-Iwiw%-gj}9yo=`CN>0x z%tU{|F&rDTaPyUYlJ814I4AY5pj$&4mTIF0m=c@5coCV9kWi&J2V)fi#Q8^wP3IfE z3nTMorL&^rfnY)FlqRJ9u4bS4D^n}D$g3&$IyC}9rBf^(k=0M%2^d#qZ& z^iyI#J&>6Q9>Skqh*poGlO1f2PV!!vsAxv-CEv3lmCXGdB2Z&z^4i!wqN_#h?ES&= zIvN~PB5av6yb5_Pwdb`9z9`lTXY0OtIp3BHApWmaG)jVjT`0T&L|Lha^1@--8A~owL2}5L2`aV+=iSev>s6$U z?!3-8pyg4hL$ZFbprB@5juUkiZ^Jo4eS&lTXgElb!H34To__B!mCBwwE{|D%&66$R z?5bfb;=i>1QR6q!_;$BY48P?wPZWf8NWCx`AQL4zuUn3m!EE1tq|H7&hFA+R-GErf9-wZKKH5n zzOL(xZbk|#C-|1%lRG@odl{gYOs%jy3?i$xGGiD{m-q)ggE?IrKl6q+!eS$j$6Zn(#gfZ{+em`>&hU6vGl^GXSMg1P?1%K zp`n4nKXqjwBXQB`BP$#$#V9i@VQ`N9!l#PDKE+Zz zmQSOfW3NrSiF6*Y1b*#trBt@L{9n4P_?Q*Ts{(Ig%5FDNl zyHLCREzig0XnSr6KoK>KjN*Q~d4C+WJE(n!DFN9s`bCJ5{7!<<`s}wGFa2 zm-2}mT@C@`evL>mPDsjGa{O$m%iMtE6X42ddFV%RcbE;~7$7Wf{{H>DFIF{|f`9)! z&`9t~75veJA7WEBe06_1X zUV8t~>Nbi{c!|*y6J%z)b4_KR))udewn7NFU2Fak`lMgl(YQ$tu_8l)cD#DJ2 zp?C==^nmor2_N{}_g<7n(kom~XEX?*eFn_jzIeHgz?SZst%hP6iwK?mw=X~-RV(ko zNtoj8bSQ45#E#t1wu}NxPPk0(<}CWd;mLfPQkffpFiuJgJ|q6}M0Gl6#d5sScZ4FTdAT|D9FDK0n3M z7Be!`ZZkCm+wYO|O}#8**C95Q6j*;wXhGLuU*&qm$^a0Gp1?iJJoT{V@Vw+}ov?*@Ac0YmE894#bfdkc6hbvZ6&|Fw9BZ3Jfo)e;PGy9M zs3!$vb#FBz(2g1!8UenL#?bVEe6&*hBkAm?^{JMSSW08KuaDQ3-vJcBZvecS z*8c55)^FWD^mBL*DP|9CGovAp;F`D&ITSRJ@7O~d!6E9GCmpl=pE+)V;7q^8K=&e9 zG6HhrQK+rJ0fR7;r-%1rIqK&^6Ni`9S&<$atIaO2)@ULKud2;V9q8KJwGJ&F`#pz) z?0wQhQV77CxRE8>3t5`BNXVQNW8+WmMetXutUyd>4zg6v;ki zJfzHaxiY&{5lQeViGoEp|3|>@B1@!IKveCrTn@J^ zXKfR0?fsbei21>OE*&hsGKUerkz;AuZF@cMIjUo+_pg=NDl$$SP#`a?ux z5|&A1dr+TSGaA2Mfvkj(Q=VbTyBSQ7Wn^EVznuJ!W%tlbCkCPEHIq%KMLE&3T}7X%iBvrd~oe?E7k3Hpa8I{%h5#01ZN zQh&$>^QZhBC~ljeQ)AZJ5$JxYhai))q`A}O5dQl@wGo-d9Ou7a#h?p4B#s$0OiQw# z6wxcSqb$z>q5s1;8L7%})HMC~eM8KOzX1g@8!lTrH6OayaK>i8xF+qT!rKPdtDH+p z$v6=0sX>I2%!;{4Ab$2}WEt*CAr)>Mc?&<=qMe{rUJF6FW?w|cBQ<`>`Kme{b>5-eVd2M9@lf==>QT= zo^!*kt;!2cv;qRX0`Ie7O|L2UKN=!tT=18v)KVtKLpQ)#|c76|(&Dfxd+ z_uzoE;Y7rL2hdD!sCHfF3`p-wnUg(A7dkW1IOd#64l46IQ_3sn`bW|X43wfGum6b- z?mEmEt-RBeCr`@vI>tMb0{2zOq=Xez2h~Q8NsM|FLuNX*+?gA)O}R69)rZsXovxeJ z_^|0Ke}_^TsUH}&zY}pm|IjxsC@v1xy`~B&N@;!>@H&q5e6q?~)!%ly-7;Us5}(jh z-?(GP!^6{OQDpZ-538FN`|b=K?mMNC=nqgf2uUWxUv|^f73w_McJm>tJ||t=lnQqd z4%pBJYe_$^o-_>^!1U3uw7dd3G6RD>ZF^3z*U~ZmMq_G2)y5*ld&T)opl44=@%58T zqnaFQvzk=_Y*$#)!Mk&1hBblshH);!HUJVR0969cqkA_k3jf7Ds6~BTW7ejIv@fCm z!$?vI_epiLljK`EXV9l>G)|}j60&cjn7Y;P=&sJkjbw^;8`XUd~%DIO5jKBE(#zlZ8%Bt1CqppXO$VG z5OIdXy+KoN2i`}#@f67Ii*+yZVgd9M!a_kBJOB0UO4KZ*_?x7) zSF&NRgSVU}@eQ?hJ{0zSaRcmnN%ToY$|qHaV~2!8Ii|kd#-87Ab(oGQ8VHmCv)fxq zA_q?1erCJ%8MNv}N`j<1f>4u1LYi3hj%S5 zMh))(>VLNLUM=BSwV9*P0ez?2P0FJUT&37;lFa7D6kbY6Ra5o~Z|o{dqoY_42`34v zG%RzTs)rQoAV??0y-g$vE=mOu7z$s*nhHT6}>01PNDBxlwZ>dTLJ^#cM2) z06ciUD{14eVdKb%VJ;Ov_?dlpdw(rX+J?JWB&mm_Do7SjY!%A8E~W=BD=v1vEp{d@ zXT%QtibJyF=_zea;QXBCF*;uy@(5{`AZgnp{GLtpyW7fuhN^0ytA~fCEVrKEc`GO= znM!_~m|}tx17Feu(*_P$rja6CUmv65geDy=A>kI_6x{pg`Cl4CG8WLe(wb9iL(;9$ zh1Tedsc5?`TzSJS$hY1ei&`TCE59cICHp8QjDQEyyWxAx;^@#uAyP8l`?2! zy?e_5fl@25bZLTQ)}FCWs%wQ*u2Oie7BnYby?*_L1VA;wpH+^c;z{Chq-0xM>GcVc z*B2t9)e$2K5NKieL=@UDr~`90JmZd};n=euN&D{QrB;&;(&!=`Zf|nrYp68@6(B=9 z|NB+{Gk2l{D@nP{bp91X^rU#aLn*qmO>fVxUnvH?!ShP{|BHr;MCtYY9|Vg%Tf#Ib&FXyD;Y&5JIdGO+wxXQwTS zT(Ce{J~A^CH8C+cM-yDmAAM%{u{8uBi3I4W6bWW|#J@nCO5u%hW=s@=pLtuj&- z4desTyw*<|?nh3~0&?-;(SvXozW)YodJWHhDv@^@{C24WecD0Xh>DoTCkbG>>3%6d z!AVmubSrFod)q`E7DImKz1glOG7&_TqGS`%TEc68+kLzZu?>LQ6>TX9sOpE)E2xv< zF25SEp50J~0dS|>xw}A-?dkHq(+8qT>W6NW&0xu(>4}8zKIuj8DtbbiwDwBkEI?3p z{=$WS$9pS33kn{F>*Ls44DP-(v+zXg~3hA?h)Umcq3LqUg%sGHt8<5XZ-o%t-CVOPFLB{VC7re z_lnu<+vBeRxoUlwDe~nS&Ym`-F=_D$Inrul1Of7#Lz+|wi8 zByJhwE4xKS?Nl5r#I7WaxI`=2fYXyp&QR4pw6~wsaYz|Uz9ue3x|sCy zXd}=f6dDKpCNcR1oKjHHg2=+(nVFveoRk_4165C21?~F&YhhQ?q_d^o8DE|(>O&yF#06{Ck9!;_jzdQVY% zaj&^o>XP|krn~t>nP4)}vG4IG_wckg2AoKBh2+03Z+CqYP=bFGZtQVSdo{Xv9h)i* zPR1DGoV(9O-8WqLa;Fq-+4=ETHi$&l7O8sIY?!(-CJPiPz*P;yv>o@OuIt_JmB8N6?-l3HW0_ z(*RK%GSvGC%Vy^D>P8WOBi;NyJ~9=!%cq`zEI+U*J6$OmRpN|OH{7J0KKQ~X}Y3c9&W&xH-K6bI@4_W1e0yD8~6{lBDvlPA?mQC$a~!c2!iOX3aQ)Zs(R zkNxQEwXm#%8%;N0nq$P2huo)JHJ`Al9hd#VrFG8DFzDNJaMi;;(_PbSJsr`S1zJ7* zyI3u@Er+DhU^YJZdcK4L1nk{HpLX#UXqG0zD1g8*-Ucy3diY02dkat6?o-_;s> zrsw2pPcxDqa-^c~xa>ON@4!&0TWz7)pptJ-VpyQNEy6oAvsE?8BodNr9pr#7G*RSetFfdWW=sgVy<%W8$Wu@0T8176I)lmG{MO z=*=Jv7b6WYQ@4@bLf}SUHNpPrP8qx;usd%#38b0|R{e+YykUmdT3KxFsU=}S!lS*P zp|vEpyxhV*w^atob$)RF2fN9<&-$yII_dDtRW?zSH9+Lr5dq&v-k&PfHs} z`bz3QkjkB}@USeG(-vh!&II#774Xi2_q%Vq3;`dD|1e6rXY(cZp(K$55bN5nW0zR? z?;mch4j1Xh7(g6p#=OmII4CbWGN8=Xo|q7{Z=R>T)XK>OBdltrq@AOwm%|=}ZCt>M z)>!-CkGAbo^(QIY#(rB{hpb1btd6hYLDs+KR26VcaeOwq-$zm5=(oJI&a=@qimmcR zkTW`0kG(uB|4WPkCZ(?YLWh0WZ%GtGbJiXgX()Ky%jNELQ&6`EVfF0L4^H;iP72Z_ z(#3hlA1dj%-+Jnuext(Lbrb*7H|fxH>vY?}S!;(DDZWmoJHlJXX-R zROK-a1C2S4S>%SIO@EHR+yDEsOG6E^+c3v-)SQl4W_ya`)IFiiFJLOW%9ufO{o4fN zqNeBO>0>XJM?J%3VT^c0O|ws{75x=1jMc;=#q!$&qW^lZkxnEWyG?k(79%HISbUsF zKZ;kiB}gbVDW6(FO+BZAuY_Xry*cEgJywT!P4o0`zqF^~W_Oaj(-)2&d(QJw_0R1o zieP2x7-+Uz@FEjy`C7)YyOu(kRCW-(mXG!ISqb^C*=&WEbc^v^FheV{V>Yx6wIuln zEZl!U*(F&KhdkXUeN%A+Y^%5Ov|@gQ!z}BL*b8QbFT%2o%CwhPR(=9X$E}n|zH`*y zVd4+w-?h<>-ugYt5w0_%Uf0nssAerYhM&Ai^gkyNmz$+7)W?isAbQfbG_t zLZoA`Lk~i`vuf@9AXzVzglSHw(vIDO#U{w&qvpn1HnF?kS-=kh}fNj?mi z;q%M;Uo#Ib9M3EIF#7NuINWFbiL&P-ETm(u+k{^`xQ~)BmIuRh&W5I#oRciae_q-9 z?Nh)u6Z>F*G2w@GD(tjVOIWpsikenE1*bhBH#fJQ?(P(O&KPp0l5dRjNM}j;q$MIV z>i(;&Tb!I<&PO*V=AEv0qcD;}5q))J5JKYSN&N z4$myy{ticx8b&stwGm-$C+@&bLHNO;;0+SP(dvAY?8@6GrgM?e5vL+ny@;~Wod3Ki zM#d>ofkfEZDQZ96*+&H!V2D0YZTY#cx+1xsJw~2h#Poq zccPbKXN}x!lQNZxB}aLDc%}s6%0Qp;9{Vd=q4f_!j(ufJ;6bO2*HRz_WRR-I$AqDP`%ouo9Y^FvrA!ify|FE9qW@#Z*MP zl!}cuDi_@}hH@gMMw82~oSoUdI^*S@N0ZIiWFHEY0kMn0tZR{fM-%y1Ktt`}iLSKKsv zgo<22kYSixV9_3M_BdFr-)0@9+2(+eQwfKKe}8|!mjr9MaP()6ksQQ0&i-91stYFB zn9|&E-}PVWTcR@SgwwP#NrvfC;*m#S`Ni#nBvfNPug^luEC6M33ln23(71CJtBn7- z?FTRPj9L1^|15zWxUy=>bJC0=Zgqm-n#QwdQ=J9a&Q9(A#;L})%6+=L1m~L#PdOc* zuC8~9{xE&NagjdJ>Qc@}3=@4=Oe1OBe4dneWbN$IMW|GXRi9fZhH#2I^$;=*JTD#OvVWl_D@$fO1^>PG;vXC7)3j}!;wApALml{s8(IxsJXAViPjoBejwL- z@+5Pf9)uw>dBvhvxz>!vS@eyLYZ^w`0Ut=sQ)H}gK!|+pVaelvQFrCR)y0tz_?8{? zj@9Nvu2fQQ$%2i^`|>TPuSF0_TLt5pR{#d&`MXI%^v~?)6|45>PuH$q9RjG?>W+Cu zs5>JJcl*@b?Lq&0FC^f9(f)YF@-w|BH~MlTe)WK{LyVJ@d$_}x^LaX+R|tcW+ivT}5v!Job^t!kM2VM6cIm*U@- z`~Zb*kv~-M^4E7DV5J$3ubF^aHKS~9Tg@QA|R*XGJj|dO!Hk?SJFXFbugNgVb}Srf`TI*HFhY|`V*pN8nXClh?-M} zv$yQ)6c?k?;UwC+GhT3*8@4t}k6}hdACEm;(jT8ta0W!_OV41va0cU>KR)rw{pVd7?u4# z($4x0+bk@;{b+l2AaZ+aA?4QRw2RcD?`ofrzqnJL$7e3p260(N#6ldzx(KR3J*MLO zuFQV(Xzkx7SaArm72WT{}l^+=TVrHz8@-OsM?Ug7Aos<-pBpl+RWZ=#gZphz-Fm?5-dF=H#j z0?o=pyIRKU3?wVtA_stMp+@abj4>Sg>!9qd?wP`+{`c43Kp~}braVB&d-=lnD# zx|BE~M)>#rI7C|c^4ZDbf~q}XW+;ig879F6n;Mba&jLah7o4j1^svS>Vmjortw^eA zlA(oKjBS2f5}!r}B}}J3_=V=j`+;-~2$#WHxxKTIT?|KO6mE4*(EC@)!p{)C5xmub z3_7lFIJwB45yeI-VflJ2N+Uz>JB9rK)AYS969FbRUfg*>enHJ5Q(QGM1&V{&z<@AQ zirrspw>8fQI~bhk6mhjtH7AF~#i(vS>h4M~?+|+3ln`#xeWouR(+a!WtzBG2A@MdL>!T zlh{pEhYlB*oG=MLF;S*(GG8}+;CODzH8wCH{XEs*X5VPw;uj$3c4JNFGhgP;D3II8 zDls(}xS-2#b6IXXL_*1;BTt!D{1GYs$m6NtLno%$Z{E>#1}U=-j0n5dH#u)QfihML;Z2|3x<%mTrIQ z5rnDi=9q{g1ZO^FCQv$%7AEH&GZUN~woWqnD#sb>i)*r(ta(bFT3Pb=y-l9cR7xdq z<5?zSvR9_lV`EWEkcQ@yxHs5_b}g( z*hl4oZSUzZ6t_v~Q47+(LrcI)e<)3%vNFu@a*L&BStm30%^VR$Jl0B`#2Xt<$19?H zT`_3NDA-pOTw@pu`gA_diT?qM_yL)#tLthB3NlYXWKnMi^8;l#+KHM8Q6PMEU^{`Z z_Ou#DSSxn=e3@d@C3)F1rMZ(U?BY~KpL4@Yc!zH3>FHVRQL~>B-yb@|tyMVG&NB-< z=6(?W;GtwdA>QC*wIZXlX2HFTO4v1T@1)=C9^SiaB13QO_mh$hcDBYMqTFW2I|iyA z4{~l!!v&z|R~0(K^hT9U#Ms9BHc%*z`*XAW`oqa4;qIVXX2*In%5x3uG<*b%y7og=q8V+k~yI@e>pqsnL?0;iZbZkj;$Etj)YRj{VCn#HmWRT9l8x zj}MdC&Pvy@^>QuEH`s1TUB@lE2=_=$kw0k%;3`qu-~%yc{NuXR)9wpRLKD4y^FRiT z(EDo#^Yd&nBkz4>ry|r-yGtYLlH3h83#w(;g1e+gh5B6jPp48XJ5fF|KC(V?J~w?T z?T+j=d}?auqcTa?&che&0vV}tRBVKQN-@2`07Z9>KceOU6cWa(a+7L^+fltQeu}1d+qnm1q9P( zEdE+BiKZ}*zVju$TKF$OL@Ee{?L{J)$y?K~T{Wkj3boIQmWYc2^HiTv;p(YtOo8a& zq~O}yO;TFB3ydfJj3J^PZlvPxC{nCh=W*U814ymZgI$OXtz4B=M{KiByzHw4I_lOd zH1Q?wU;ezH&LDK#NE+TA;?VJV$zSy+^Ko|)-Tzxk>F@Q8GQ!qw*MRaU!{=_Yc%SWm z=xC7J;HUeD`=K0jUUnm=>wc0oO3H+7^JiMOP4T<@)OoZ$vCuP+Nod!e});yW~8|$cJ?axqs$k(K-n?-Bv)%p##v#+5rTny){ZNE^4sG;`sWT z!T1{U1Y6XGuM5t1<>+;fjpWG3QrsX93SIqYa*MHjWd$W=H{my^eH`fYHsWpG+pf18 z?x#fYWtp7yuJ5Q)iu7gZ3ngrKaBy%DFW)B({{vJ><9*}ZAGY#x#Y=YgE9Ev~_YeG- z9NQWHS31LG5@SwYiIPVXr-aQG*L>YvRtI2ti+>?bW=$1MRX(Xj8=m!n4pz7e5l1Ay zn#^Tj$Z3ndVWIc^>(^)viG|pjD~z!$>L@EiHqjfD+NPExot_QFwF`2nudw07zuqV-avV#zY9UW|aXMg?-_3pU$~zQR7ad)2oiVv5wq zopLYAx80}yhbA0SBT8+1=Xa6bov4%3FoYyRSRtuWZZ>^@#BIkpF553z z?VD?RWA;Yx%l4x5j=m_Z${44ZeHRWm4p`q^fP^cnZ>}G#U#LH*rz|@@knH`5_mp_O z8l)xQzCpZm_;R5rPN*9Jsu16U*dCDcy@mHHu0{BA8Y|jsHmo$qHpys7Xl+yt7PB7* z*($nwU82hWq5Pk5_ETFBHIk~tUef|#BeohgCH9(fgQRChhNSg+C6)dBq+&Tz_6f@z zEBOHZG_Q)@`KKpiO1H`N8D$_^uBlh@zX=YL*ql!L-WJwHwz~6#$m)4Lpmn!h@l7}n(UZMG^@rNpW_yWkdtq> z(zj|e;;c?L7-i;l)AtS+R@E(;lvBHHMn4gnQP#fKeT2b7PI*^II5x`eG?dwH^D|T< z12g&a-+ec{^momkI(LN1QkAbjdtb{2U@kml5<7ADpA+QFB93vP1pTLY8bll~2?s3M zz(%>1h62r4I|pCnRUxKf-5^%Id z7*#Tua1Q*Wb9aa-I>AoC5y5%EUBMf{jPCD9?kf9fD25Z>(zvS+_{mupJ28s;S-$uD z^6EA;m~d(Mc3Gv2CyRFSI172@sh+-&aUQKS19ITN9CLi=!}d@Do8=euqTQ6s#iNxQwLcCs79)mu ze<&-8ls{t%k1k&G?`K%w&j^@Mm9YxI7}X=qCsp0a5VBjrSE-_R82)QU+ihY>L{MH( zS23{9gTqIf#KDi^n+2OCx#Js53xQk||8CTtKV_CLmM};6^IY|y;4X2>SVwn~jJoxQ zeuWd|x*f;n1LxzuUrw_6U(3MQSl4^hhtx+IZj(lFTAKwQ38(I;k4IOorAe6UWQgpI zlC6EfESq$##^5U#xwzoF2`^&DZVJg$nag3+Q$G=kdWh7(I08ObeFS~3`PeZX9G|TD zoyg+v|3y7~w&pKo(x$;u#w#B*;6++zGuC&0(v9XcHfl$Lue(cQ2=D2^cQ2Xtjy;@f zO2c-lrH0q<5Y8t+dw8B|l0zL}GFN}iXR_@JFPaoz5u!>Ki#)4TmmF>Ip9y-9JiEQ> zpU^qT%JGOFs2}x#klloN@@^&?YFGtf`9qsy$A-zS2|v|?dgW3ousoI?S94~aCQRyp znZ%+b8Jf56Fymuy8ac6|vn}BF8JS$c1~2}GoWvA)(}f0Lp0Y=?vo;pgNpj}2emn>d zA=uO*eE5AbE|E%kj`RhNSmZUC@;xG}Zj~D_MbNFk#>(k4wrwc73Q4;U{r#An?yr%Nf0mK)8=|v$8H86j#sW<^bd8UyELFaE&+N~TK;l|n4-tt**P#9-4cP`_#;cIY>i3v1 z^uBaz!sOK<_F;jLKlctbdf%+RJ_#sJI7+914fKZLY>G`H34_)x2&InC=*5}I6>a+E7 z9xEssQz|hbwl-g7H`3*uG_4HQ{FSiNTX=E=g&9Q>1)c&yX(ph5YzUl+*XKFMED6Pj z{!s{rn!I$C&tptCn$ou8f{#6Z9y{Tc_rGO$_mRuw?347h-9fpV(O`+MNcC0y{}e`< zM2V+FP?`OLqd`fJD4{XynB`_-u0HXJDq!TlDYx}J9oqaGZ52DAG$@H6gxWr-8se6H zb%l}wEFLDF75IBAZIiu|qm!WHlRJ|q`z!AI_}9NqHHd0I8DOjN7~h+x$L|8N-r8R; ze-mx%e9GRtXr_Dr%jkUcd@$|(wufDfWPwBccT>CFze%GwHd&6v4#f{852X)f4{shS z9M&L*7l8NuHfF;8F+9m-n>)BRW*&%HQIAvi6^P?6>-?BO(V7i$rvl@UV6v37wB^xz zdh7ohi!zC=amM$oF^n(*tBRs@`Hrd9XwsKK3tUA&Eq#fF*j}IVIDhmKQ?e|WJ!^c= zYlC{w@ylCX_YZ`c+-fM47-~fBcJ4cI&N}X0K4SSMLbbWUfTh>JvtgRLZ@ZVrz4=^a zBSoEpV%Pv`!_s#V);sus`>Z#Y3h=Q(J*byEai2Ig$^IKVHZ}cYcdA0`lP`p@Yi#hA zC-vns$G>nD{nf?z25G8D>AJX$kMi($Q7^*C49Nv zeAOpz=T!*B*0&lkV67C;<7-m`DHqQfX5c<%9W-;@+s?Z-61&P&-YhBVGc*z7@Ymm< z0>VK51C%B)CZM|!G9!eCxjI*Gwq&FwLvaE0z^= z3BmM}U!TDNA!xm=2H#tFiyk2CM8j}WhbgpwtQBp*fIkx&hk1!BXgYb``SlZ}v#e|;ws5~m@Y zht~$@1yX%S<&y?*N3x$$bx37$sCTfQaPg^X7K>pZE|zj@ak8^=(7{=K!tA8>E55QN zR3y1OTz4i##obidHAigZ)zh<)85N$3V6DZK-9@9V%5@e4#rKFfnYuf5`s5Gel0NJ^ ztos;VT$uSSmvm=afE^xGddJ4Qg3Y29_mc9Tze=f=m~sgAwy*WV0cW993hjd(*tA|< zIUm*@oWe%=ztyG@e*SfeUf$5(^E>1_Oh-OC){INy+0-39Dt*~GxTbPerkW_$@fsCQ zm+Vwp<(Ez6z|FNDqit_`qMBS-bC7Clto`c_wOUCme zr?DcaQSVyaZIMdfS71@Grx$s64rc=UV){5RP*wu8?dR^k>Y_lP@2#YiC&YhWYpeft zVGppBEi!<*}i+hsD{HUfW z-;ue6U|1=o_uQaT6{o}zLSkS|z6osbLuduuxkQYD@+UPshCaF5b2&;E9gAZGjYK?u z0!~Z*PW}3UUHU`NXc@kiE)E zCDQqU*-9FtK9gzIbW|_Xcnc*pM0pLJMo`7W5G-n^rx#uNPJ9c1?U1E6sIIOtK>LPv zaY%VlWbw>OyvJHlfN5|X3meV2q;M>Un2n#Ly65Wl*f4|w26oUVhu#@}hpfvpV&i2GoGgG z{Mok0$;!3b`4U%hF?98Oa`&}@dX&LRlrG8#=0oPAc59LCnCb9b)Hdqc-Ti~8vI(#x zhh9vh#qGchS3X0|SL}(bl_B#6Cv!Ob&F@KLUy?Z|L2iq;I z_v)M$;JUCLvfpa8kJ_~SjyezWCv=!Du)_~k17Db8ifN9o_&b(pS03Vzswo`4-l+df z&*T8HdSiW)yy_1${?gslCjqv8F*U>spXw1Vgr5U>I;Tv>!8I_Y%b|~nH|O$<2x+xR z4Zc*<0)6C*UeF3Y9Disf{Nw2c!OD8DcDnOh=&FM>wwIzY0oFZ+X*{p;4sKg)qCFcG zJul#U`eXCJ?sUD65dk%0=6gbPsQQYwJw4?^2mCTOQO-TTKC?q%A5|vm z(--+&DxDy*UgOuAwC5La80H4`)4*<=yGsQ>a2%gv+{;_6ZM7onyZX$#ax$mrhdm^n zid8i1c7TB;Kx|8nblxUh8&6_B5)Mm08m=K4bg%io{OaVoyirS|#M{Dp{4sSI14p;VBNBw#rr*jmq~ z8!KER1wR3OLWCD+euw+`n`aJV#_hPBZ@xkAc(eMkg~6W~Os1df7v4;>m3osY=R8eY zpoF=l!kIG-_si{!@L<}wH1Y50xY_6X2O%4;femv!%eFp7&GebY;?5>jG@-3wJZN92!&tmF|IU2e}J}~Gj=17BMBT| z($&f^d5l+mhKjih#8_#>nUcHRxwqb9MST`F*N@!%a@LzGjTWkuShhqeJt}k~A0K8U z9Hal~qEsG#L?%}aV+cq&8OWDf=dOcSm4kw^MH7EzL|ay*Y&6G&lXszIYX3F1{KZ`u z)Vmf!1_iOXF#PyHh)1jG$PC=i-5t2dm1V+@bw>P?sv=L1Erv>uBj*Fhm4`KRihExO z)IZLBh4&Ogdjyd#WU-Xpvw5npE9bHY)}u9dh$Cn>zph&|D`eugRL(s5qktdtp_iLq zRh;LYtz3$NmW{gyB4w{ON_Y3(*Q0U<&iwCjfjy?39@{87wh{gZzeXs;tgt>sP{O(; z>+W8a6?WAw%Apya5S^riRY+oUp`2kTy}gXIV~IvYjpnC9w7X;tTVr0vq5olnM^EO- zsViFkKtzV&v+t?G9t*q#8ukY&emmch={?-Y+Y)*;ROgn%joO9eJeFH^h;vl=zLDzF z5u-=kWeq)~`QLz2yUA}hA2D?2r$e6^Uf>*#j^vYnHJT! z;#cM3d9cYqq2X4Ww4R4(lpuf_5|7Vn$QBHEoq-93yBR1~kTbZI+#X}`Bbd@ND&$Qh zohZf(x=en5L&s|6aB%PjgkJj8`|QabAaLbr=<4Hh0G*mXtwgC_1tyZyJe7dN;Y5R^Hh?K z-YTcHV-;6DkYXLzqFyn|y@^`eYbbZNA-ro3oeDCKoP!!#{@w`jmX|1$8QaGT7rjb8X+zDCJg;FZtZv1Krs>OpS~pXLY=M_k$6$^T{?q?`pZn ziZ)w+?drf4umt!|6OveF1tZ>N4dA93?yePxixwNP?D@xOV#k=Z-%E0UJ{0+6M42Id<`69n#h zDF3^#2VyK#tD{pxZOdlvqlLIIhmwFROPrC)$r~@cW#rPMhnXA7?aXI;3$&3BdCc`N zr7Q9KZm}p`JmW!WLO)`C&*nA$gAFF)l3&(xL?~Kl;$oF5515Y|$_MK|`;QLvmWW9b z<2p=@``2j~OI2d{hZI7aX*7|LC)?B~+^?oD?1@(T{^_9No2UBl`U|q zQH9Wq!=+NC^b_iUAzn*=<70^M`SuG`YCrw;LWr3YKTmnOHsltKxTsn>0)5p-j^?Nn zAWd|Y+sb-+%68<&LcD=c!{E;~#haNUegn2)F`~ z9vHKY-CfPbT%f;}1EfBx&p`vBBMg^M)!w1Q^+(M<`;L^c?UqZTf_$fV%JzKk5IiY2 zMJ5wkR0s|V(|M_(W>yD9ojOcv!C%RXm9UKPm+*flOwdR)x!uy4nF5}+2|3*yAP8f7C;__*GK2OAMgJMW^ zh@y@6flI>v7hAtT#gElIYF|z&$Y06hpQ&75-_aqIC`{wOGy-qwe8kG+t89pzjG{<3 z{=ToWD`pX@v4E^7S#9)Xke|w9cm0gFm>e`PfO=dkFkV^K;etSz(lyjn9xI=BV;W=m zMrALy`PHr6eRZ>u?T2}CV;fx>H5CWbQ9AK%nHwQcOWiBe&zypK%&8&KiP)S&5X zK%E{vHLvo=ZZaro&16Ofh}l_qo(fS`eQKdujDevMY*AEV`jE9CZP7?hx}kQAolxI6 zyq)23x2|9IL|5^eR-4LkZf=C)+iELa!h`J)Z?W#mJnfUA%Atm#HkIr})X3VN>iC4y z1-{Xv;_?V!8nvJFaIq?QZ=16bM^p6kkADWJhqkdwA@0>b*8j?&;s-4z)7A8lS!!Z} zobo2(>}Vp7Gmere-izdk=N`}^~PQN-s&B< z)6b#1Ztw7UYa!m}y)SqVXzpnGl9ES*F$;FI6JUALO#j5FMH0N@m zIV_Re%K9DwH;*QF^0>$Lj#ct59zC&3; zrNfpiJqAygXxqsyJxFluBb(1Iplv5c%mueodU^Evs*D-f8k1)?O?=s&oXM865Oy`-?vxsMT&$^y% zJY#$=`dsI^)ANYmy)|h^ZoXz#du-*^XpA>oT7sz7*qvzssvkXY*qh|Y5A02ZZ31$D zdT|@e?5CG((fpBZe*;gdd6=s1D{IxxF5$lVRKjsgR^nMbT*7Png@nV1q=fIWtAzKy zy@b<*!VZ>)ETx|R02xzi*fJbc*MP55rMV4)>JAkqnvr$W$uph7J=X?n0 z_aCLOhUQxN(oZjEUl^dX3z2Fxe6Cec`qUy@YJl4=LJ?DqQS`6g+H7DPtqxEOtPWHR zst!^Nt_}vS`BqWi*qE?o;xWDl*?-<@OA7reS$p+(g<`A4R1q8UpHtGoT?a8dSNSf# zwVS=lIN8|8e@72ndM@$Ja;E;AiO=Fl~>aWhvWTDa<1@1 zG6e>_dcA=%8(F_-LiA zEs;}2p-`W3Q$u&}%OQ2Zuk&?SH2KmOa^D2ZSIXCx~9stTQj?T4<6JN0ff5A?vXJ7QiUDkx?@E$huB)O|@J>vZMT} zVq{-Ef9XD1bFwZ0D8moms8a<@C<{)4uGi)f0+k* zK+)7Rk?!B`LtB=Cr)tpC5hjzb!KscV^K^EVx@TghhX4KJ>3ZD4)5Y1v-Nj>vDZ$2? zJLIcB70Tuq(56Dzy({_4d6MCC)+t_}JI7oF9{C{(JqNmkwZQVyjih}$FIztod`5l* zl8OSRQmT!u^?y(ZGZey<3K|EFJo-j;^D8Ue*}G*25!`ayIk-P@g@t6lNCDT^s}D@Q z4TJn93z~U~Y-g+!y_yEX^|PNoGxgcJ?cH>_fNMkPRJJ$BONQ&s$8@Z#2o&FnPC2r<9&`T;7t;QzD4 z%*oEhF<(}%3RiqYvE=bUkoet^QJU^^iLcz+iOfzxjShGo{xZ|m9EIc}*pCap7QRun zve3CYjh3z*4T8xPnxYz_WM*t!C8+PN41>k90?e81KQ(ypFD?|&ewz;yNX!?|>ic@- zs`7||I606UDoDFB47UeeV3NWH4-^bNo%XpuwPuo*JVw zWiSx3;OOTu=+{t(#^?GTHK zaj$6j?&*1SH8OYYB;&NOhrkEUkD-Xj3phh)t=a=7zCD<29b~!m5;ExZ$*fDK+`=1_ zd@>mS$WxrlKQg-t}cL`N}ucQ)BB-+uJ@9fNZ!XqL49+xx&JQWhXp(d(gbya z9>I#>u0Wn~l;oVx~mA|4TzKQ$P0Z4aqJ>{}<>EEb&0-*osLaiV_gqQfSYj)#&^0*(j-@D{i z?~kOM&6P`h?>$s|hGO-^Bd^y1q(o5w?B9811CcqhUmb4dNDeY;20lAXUnv5K+!I!T zX}2IB#(%%^R9TCg?*w3KjmVb%pVF@VAL{Il8#88HhK9(b=p&P%jcFr7G2`+w!mxBh zhOO)*w=iK`wq|Ist?83Ht4K6S#Y$Vk4BggcTUxnBMrLv;47m)$%zk?H{eJ&}?|Gfy z&g*r~d7kIIpZ724c|X4}({^P@42|U!x!I~zvM2dAXv{J2pWAELg z`OeY)`N6RL(cm7RkHAT+&*WaP7NMy{&i!dY-pevqh8y=OA3`n>Xhi1cjEq%gWlxO6W)V+r1bBHi*h{_h= z(sNTi=SKRJkNeYFT4_pOHe}PCn^%|>kEZ0tLiOjPAU~a-)zv~9v$*_rJ}_-yUVlDt z{`&k#3ag*X`1&5J`oqfmLz7eLj&qaVimijcrHQQgXZ>lVaUD^jWnvDnWx>sp-)9Bd zXO;rWr|{}XXQGJ(l3qougFnere>k+MLlZNZ&FsY-siAKC3aKv$*pQ}S=(M0UwUk|a z5XX(82Ls%rUy)y(3J;`!3Zy!e7Ourx3Wel;gx21c?pfqNc>)re8v({J(DEAD5-YuRATIyP*m#ZDyOoq_){v+ac=uld_$30Ms5#|NJk$TvB_^~)t z?@K)4x&7~tGj8GWMN`DWz1t6tbfwhI0 zSijryEcuEsRv5d#Dy-8*EXk7Gm%NtDBp?&EBp7ohm#Sn5E9k3BZM<8yBkt-!K5J`f zH7b10&h>iV|GDrWcEHFr4ln~iG>M8SKo=+YDZbGpdjmy^raLCXTcdZMK3}e(;b^C` z6rM3a6JD5C@#ZyjbVyU_LPKj*AIR3jvdy-D~?zX4^cvt8+Q9C z>T3%uRYMr>d=%j&KV4m}L;6s}aD=JZ8AYW5s1rr>_vb!LK!3s<)|O}N%yGk}Kwt!! zt7clzFOFL0r~U^T^MebAw11C3K6-p}Q^m|usO;9H4vn^Z%#$#t`PQ!q+))c_Q;RPUyt`r=yQ4Lm?T}7Syu+);uF^eR09pXGP$jhW`dVm){Tzd zzf75$*ttH^Yx^Y^qG3|59!9u(YX-Z_-;@N)6r6kMdPEPJP>O1~XE3YhPZFqvo2(^dCKJfml9j`oFR zg}&iyG>^$gy8^4%cx#;&{AwBNud zL)(@+K14LISoPr~|5s)83M7<@t#@~;V}uUmptAcnXiJB_$Q$KzpG@}E%v^hF9OpS( zshK>KX+Lu$h+2mq`&yK57w9cOAwye94-^c|$RLr#Qc}U*t!}x=)+JU9$_)ItMY4c3 zi{+ygysJ=cYs17&iDmXm=8ZF7gLdR;3t)CYY=P1OBqWxGHoc`Rl^v7_d-2DKq0ymE zBf95j`-Zu(jr`Ii{{AeX+ah$JbDpZkVKvM;K%!}_Uuxa7Jz46qHUAS-0r#rQmojVL zP~alQF(BhuCaxg3#YCv87c&@XbMK)1kNPgzMO^&XrGZt&^c|<6-Tv>HyF-q;Qe?U7 Tg=wXY0yNxQD9#TYgIWIq5)D5s literal 0 HcmV?d00001 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt b/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt new file mode 100644 index 00000000000..f2fe1559a21 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/project.properties b/pkgs/development/androidenv/examples/src/myfirstapp/project.properties new file mode 100644 index 00000000000..9b84a6b4bf9 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-16 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-hdpi/ic_action_search.png new file mode 100644 index 0000000000000000000000000000000000000000..67de12decbd60613f6716de113daae46dc7d6ff9 GIT binary patch literal 3120 zcmb7`_dnZ<7sfwI?Y&32lp3i$Ym-Owisc6jDJBpey zY8RK@E0osA*ZmW|=kdVE<1PlS`5306=f$4T0Rf>xBwN1$m+Tg`p6Luzw)R)BBMJ06bg3*dk%J zJKWkQ%ST|dMD$xTlnocHunjl`&6zF^5}{)?O%y4b=d$i%Gc=?U7%WVrOie|<P69u`2(!9jSoeFE<`DS(?~6?+c)tv9RS6%DF#{qZ;_9ezmY&@*#+l1QJ`Zf z@WJVK%xKY^fL>TCxCGEMqCjJE#BG5>D!^sL-EAGXD+9Plyx5uo(3sQQa01o!h4$R2_@=&;^2~gJz;0de@4FD}8Aa9)*Ck0T2 z11^K2qR)WXT!7Q)5U%y_?Hbl?&=slN1}&VJx?z+ftxNz794;#)Nr3X)=2UgP=9;G` z+Z~$Arx>No@|`pa0EOvXSKpE@o)MU92n5wsEb{}I-A-!qO*gmo%gymhe?0(L4UU|+ zl$LAcM{81}{VqS;I-v4$W+;4elH%FGqSpiz?kvDb{{OKtEP9QbpWocrm^1AKJGu_T zBQBBM5Ag7dN53Pr&QFfNcdUs;Dc+AVraJxJJ$htbd}I6#U98*UR+{m7GXwctaO!3+ z)D4FKajsjl2c#P0y(B3X-%J9(k?OlONq)GtB7H`wv!Vjj`RGuDr^}Sxcc=ViCc%mb z#;=_Kz+o$@>zgDkCE6=ybv%UpQ}@ES@D_mfguV#?0A~X+S=ex+?f@+S7!*c<>huMU zx_G7W)Hk}WFLp7UyQs#3#d^EJtYG?w=o^79QdQAl$@sB4L6D2wH$6dRytP++hCj1x zx7`qpp4_-okuDP|_7pMUp+rvWn`Y@M zCJHvmFkw3r!9(r9Yw8J3MlI=@gMec6d3>9(!rQ0@Ywd50O%Pm}8h@>J z?_ORvMTG=}iL~epdm4uvYj`50S51sP38E;0dwmUB{|Pq9K4~=h*hX|mx;$UmgkLmc zXyKu61C9DyY2n+0aT}P8o(-i9fen#EM|zB#UcjeQ+cim>VINbzP1a52O=^!EMSZ)E zc{WRBMKCs%GzV~X5!R;GI-!h1`AMGoSPVDRtho9^<`lmdkJpKJ?T_FVwxvuV%j~c4 z$&nr7AK5=Bk3txk;<;i55|NU8`Mfl|NWKu>+8px|zNr+x0hqj+!d}jHE=w-T4gtb~ zo^z!S(`TAyif0Od|`R7kT ztvMHhttr|S8T*qwN&f6}P(wA~uXloqT z$X56k3ly~)gmgYGJ;*8Oa7GuHqe_=U+qeJRh>*L0UHJVeJvL@UP&YD)Q4<*nyjp!K z0Vpj&xdGz8){y%>dXQq*OxNty*mT^4*2ih1S4J!^z5AWk#n%1${rW$OQ;Um;n_28y z9OT(p;7X)QG|e^52gXLnK8(%es^n`c%qni@Z|BeEuQab!ee`&CN!!-Cf;QngZ&*#WhWDBBzAIIcRuHQwWYe~&oV#2)yn42- zxj3Za#PuhS&M%$7_vH*VQ5?+c|`Ef;V&A z-N+v^Uuj&oTvK`?871Np;^6VRss4!w{t1O_m5_-=NYIMGAA>A|<$R=qm3pm=sR~G^ zLe@uXL9Io(MYmtp(|&Xsfk8kYncYyA1=XlNe$=sYzE4V6!>lo^hx6pf4c_+;Eh2Ou z#g%fG%d$&rWa*hFTHbm4k3K7?jQi!SLynMJsq~@Ug5AiQaucc(iE|JqkdWn}3CJSs z&EM&5DxqS1O2yKfxLAqu*KOuZ=1ch+1>AX0h5Zz@HQE(o-lV?{09S}uWMGlI$Su#O zBUK)84VQh7Q<~+3GHHf<8(&vlx0j*Ef=hnD93*E!Gz~}(xM$~B(y)3~Wx?&S{n5r@ z;%l{cKi`x0*}K_S-(ZX5&EPVEh^_W2AN2;UfKVd+I@k5v@%N~!w7w)`L4MO#mHY7Q zn#gwXFbm%(=dR)Ct|kiKJqA1a&A5oY#o7J)RtP!!l_u9e@fZOeuB7A|P9je>*NZvH z#b=uW38>-D+{L$_%PV_v563+xJ$JU2WeOabvnsN;vY8(<%`bdrTDkXm|M-_7Q7(H- zlGqx9h2TDRYJF+*C>89= z+ELh9OnXjyoI%eTPjqXNDt1n@&iw9ITlxj;4^U20UeJg#V`p*SrUfUpVK!+qxA%;h z2mb1~#QY4AVNzwXd-bk=P1N5YbYtg)ZskOXNn_#Z%kZjInyJ5@3L*vNe872!c}DrR zd1sDpjxAQBIukRy%VFon#J^bHDQnq>nv!5c-U~a?QyIv^@t2rPOhlyY??o5l2Wkesru*``TwI{XrR*g)LmfPaDK)oMKO+YR2;y3Cle8fbmjnpcB! z^2Hs5wKs)(p6mz|s1cTq+C%^4CeKV4sB15^lfqCZeJ95&+)I&x5*LJ#*7*>LgX%V` zwg*Rg`}*^crG#l+$IHdJpNlVi@F9hyiACcR>bRKk%k<+k7RdFq+_aH+rue;rJ38v> zYr26KJLjd4@rUE$1w5A@E=Ov3xaA^Gr}t(F6FCz_*@xK~oqo@YFLv>Je6_^>?tY<; zp=U}8&PVso_PatBLj-?*Tw$@=crN@xlI-=n{@C_w=~)I}Mh2ORGKX~Tt|UXe%A3OO zCN>rT5Oxay&@lk;n|$Rv0Py50nC`j&fJP1g@Sxs2=rg+7Rk~{qGbI22waNO!`0AW3 z*v8TpVB!~7(z9^z3_`!kD`~`!)^-dPUk%An1AUmuz<%aZLyRzEEaivu#DCh!Q@^@X ztKB{ZZ@sHL$c$ggU5YImWFbd);Z}9R^C(;j9#0H($16IMMD>zHdatq8p3)5-@QG1E zx5M$B#q*umIGEQY@(s~gT6+#< zIKe0D92#%U!6;#2^<8JYNV!}F=HXuiz2lo|V6L8%>=olYV6ea|PC@DmyEZMr#->!= z8dA^ZejO3$41n|w^;_3e+n;L8dqH|ft-Z?Do|FenEG2CRfN{EcHc zhih;x?!mo~ao>^B)YP<$g3Rde@4rLA6L%Z#g$&4o%;8K{Kut}}lNycY00pFWBt@mS zkT07JWYg7d@@DB>@^Y@4Ja@W-%%>fn_>SZMpyy9C>B*fwix63AjDfL+4Ow}4d7O)h6vo1s7+bc)96NSwv`VGg zWHcIe_QX(L$k&vZUleF0ks{O~2eZ$CCypqL4IQA1oVfW;Lqo&LzP>({<5FtuwUD>U zwO%2{v9G2x@pcdY(t|G03Azm_Ge?db32tj^OSf1CE1KWhPhQGV`-B`@{|S|Uwxyrf zphG9<1|5gQ2%kTHenwYUSDn>r9i-eBje5@5`jQ-b`*ifSo|h!(1|6ZRKaF@md3kvh zjZfP6Ty{DoXTG1vu_r0DK`$5@Kv(GO50V0^s;U;#0Ir*loOA6)66I%dY#lSUpsn8- zN!=GOUR>x)k^+j0i(jAvY5B-OZ1b~R&5)2|>xiGe;fa~-NYVm>FGvbFd-m-2>3Z(q zBL}Yh-3z)QCCAqPRH@_i5h4i~fW@mM#mC2wYi(^+@EK&ZJnFF`Wk8Ot3wbu1;RY69 z@)kdVN~JQ*Y&P=_Xr{l`vf{h4AqV}}=Q@eWDxA{+%Z(d1(tyq5Ah4{gYz@tM1P6m* zmJ>O)jyTL&119SJ<2(u`w{PD*rGqwS8Tk53I$06~o9L=C0BpeM_R^}ZuHH`*LBTQQh%wf-28_Te)vJx9 z%w`H1W?TDI(Iabu60Y~SBnTLR6_`cOo}{Ft*&2<;CTM9 zbptc7yNr8|A3y#EHC!%*qV)MdEuAAFC=Gz zUX(x(FatX{a7IvYU0q$Xm`5|1xvvz+dx@cbZ58>H37CN$90+=^goK3oDwRs~b1FP( zkTXFs=kH2-?gs2MiG5DUn+0ZMWNe@=Pqe@fuXf9tpbxHeNg@c?DF^QhMb@LUv$GF( zcXx{xn9-=0H9^&I!jLZ4E1k$f<-7-+F>OAY#7g;pkL7- z(IRmh0Md@i%F3JIf{&mHSFT)X<9o*Cto`#=AMf-=5zS~F@C!K@=k=0%9mc*Jy^`gi z+E`OlqXidy1ch9?cCAP1?hAFlmHb$s5%qgr7kfpOgCBu z^Rfl>ctfwnC*(9yxsK!hoPKvzC=+VH4i3NtFF{pRRXtLSw0+A~2|wBRWnm`=#+wb# zzg{iu9ON9b?ik#b3GCoNh@gq3rKK7vZvLL>N&81m0>?%98glin$t&bs)tboS{J}F8 zfvYEO0ocKT&=L#D$;oMu5-9Rz_}6iJ2((>^WzR3I&`9? zrN!fcx=jP*FBe^xV_`!Q6}_ZFZ6qDku-d{VeBwKfM|3Go8Wm68)0^#wv^5~zF(oo5uy7d-vw4+ z26ks9SFUJ3Y0{*pva+&tp1S+t)PNP3f!$Tn9*;ailarJGT~}8}Ts?Ze9~v+MD=@PZ z!{v6Epp`3EE};>n#T{eaqPK9R&bKSHTt^|x+sg#<%4v)Q`DRW1sMTtx9!=3@<~B}7irlk?bX#$MNuh>w=WzY_#COLcywnc8kf!tt{QwjbumK~mO47GMH4VDx0S>loU@cJ10#Tvk>_ZnkU5t1^EcKhH^3^G=@` z8_5Z<028n=jP7p(rhR-^SXlU;l+Rn294;miUp0|=r`m@fNmS?8b5*3gs+#QEx33kL zfXy54lwtaX&RP80^04)ZeX~-AAxTtM=nUPLZry%Afu(=smDOv* z-b?DAwf7u}$ZQ-QB!L{ND|CkLz`(rLD6hWE!q)24NlV{)|M9h-8fGTtlkgMuRDm`b zlhelO2wkBwbO#28#rtpkFu~I%E?6Er{oNg1Gj^UL&wimGbF*4xM-Fs?ZqO0BLTBji zD{>r3dMqSr$?~ajTiU<(aXOiOu!=-{-7JqKhb2XIflkm3Izm_I>}zuDNqPvm%c#() zQID>B(4Ev>?9`oeP z1&^-yd(PwU#G9ZrJjm?B)g=7*P0z_<0SQryyLkFhIm?8hi0z5=L%yOF< z6T)9wHg(0u!s%~s?tS8Kd&o0ekC7iF<&ilDE|Bn}H6$WKN#!lq# zc69CCyO*S;rJ)8)3JMBHd3iZkcBrkbB}%1|>-ZbTa1PhtTHJ$sAp^1?6SCPDli8So zBZf%}V9Exu={}wIS+qwkTD0hmjT<-a-@JKq?zU~){u3V`-$p@q&`uH(61a}PaSZ2h z4X(vKxEC^*tm#a45F2aw{x2csMS|Hgrzy;U;+Ov+?GX%gH0{r`9?gzLuxn9&M{lMR+_y2NNU6Zc2w4>EKZm`1Z16Aar-gg|D%Nr(ZL zAz2hA8)l4lN=EoFY&a&$*QoL(ZJ{GDVSM$ImbUccdY*dUt}SgT@cP4>oV2~~Ip=xq zx#ymH-Y#4Ae;+L^El-S%jUCf!wGyMzs4$z&3a8WQfZ#jk@N9H+^aJSrS3JTL3dMed z!En=Nvsnq8%{QO}UD&`DK13nX*47rS(P%2|cDom#YTC}e?lZD?nlxFQ5wYM78q7XVvejFZa1y)Z_PZhBJMdzSi zuXp&?6C|VDkBaI(CXa@f*qO zaE9gwn7~d-N_rVwKihNe^-kO? zzBLJ}ZJMyMlavqG3e**$c@H%3GI06sj7uMRbbH+D6*XW03z)zL2hSD+SO3#RMMZbI zySvd|x($`o4<-Muos%P|yeV{g^60WGBVe>CD4O_<`8|H#O5UY5R>8{!Fn|S2V0*P6 zoLNL-V&a=uu3WJW4i4h&fZe!naUWf=1paD^nVEU6va*t0 zll8ORRU@L3f$X|I!d@tqv9p(?EGsLk5Sad2SRqP}l59@@JiF@otnXP&aU0uNd5^_a zk1w4J`G7C@d@lVW+me!wUV1af4EW{|&cnC$siU7(Jae+hxxMffi>*+yT~(utj|$ns z2YkUNd;^1H&HHW!1^jEVW!>QuXE%P7YuTD3b*(H`s#*{+7ZI|7EquTie8M-!2>tDq zSIteU_Z@nBLvlvvrqlwq?aLoo^o1t2<8l{^mGrZnKMlEZBCdMOCHRgxJcAB&VFO$E zfG_yuzQY&%eowNJCtdWD2abHQAtgh(@%R^xXHS2_wq;*sQD0TF=<_#O%!OZFg728a zGw47UHn4>c?rY^@$ap6Da=zE76)`kkOG`^TpOcf*nwy(DmY0_|LBhC9U=Giq16|l~ z+X(JUod1b<;eyk(JnT^FfXfAF-er&1$00007suZsdu4`*%&xt&x!2y~%C)lMDhZ{maId{0$?l5E9)(=4QP&6=SIE3Z zb_k!0DC2(hCw$N2@jA~R&iUb-*H5oROLGGTT5ehZ0E3aCuJt+j|A~V9yrbdBo^#On z8`?hvfR5##$VO%(P5_{_xC4V(T6+5h`aSga^XE5$!T9|j_<7yA=LtaYG{y!Aw^`@V zIGo#unk1lJnD|+kl_Q< zZ>yx1{IU+WokOH{&d$=zFOG)4=8o4?OP?)3KFf!oyLV%sDFdgu- zdM4-sZ#7UgbTdg0AY=fWmr0ijn3M!EMs{9?;C&;&6PW4h05v_3u}X-&4k*HaYpc7NmnAafZPUY6ADPA-P;~ zXa%P4djkLzrn8@ayLTE)V5}h!lv1&bE|MFcC`s4c-IvZ*hAREF0ayr(7(SDbuIEOn zQKEd$UJGwic;BKcd~}%XRmY^=01DTq?e_ftd81eK3^z5kvb;QL+y!-X>$3|#Lw2~} z?N0CgiBLZ|Jox@`Q3x&Pj5eS+`ra|HZ(4k1=s8V{`^;*Z!AT<>>4bOmT9=VK4gq0X zvSJBH)y+%UlPkWK2z`G2v+xM%_Ts$6F}dcvB6xpSlPoMm)e8 zts(EO#)Atg@lN{9>1w?|F6tz%)j;+Iy3R`D8+`)|SEkGzqyL)j>+L|Zli|@{d##GTvYY$;%_{Pi!~>6^ z+8_!Rv>u*Di6RKf@5ZNNh%iN%Pa2l-UlCHcG)<#SLmp$*A$l#N%;bYe^QAvsm)+%L z;}M1ug5xY{tkTS339v3@A(lj#oG9+u1*6)x@DY{~{gM0Dg6k6H`3i>If*D_?Z~N3y zsl1Tj7w?T-#w>R(%P;dR3+y`5V%)U@-X7U3idpyFHRf7jUQt+~^vsddv3-+gJzG`; zzoeMv0Ie>Uz8l-rxr`|!@YAA!x6W;6NBv%lJn^sgKI z$o@gTA4Ja(#~$62fE44(zf5%*$rW_@U5;r9*Jv_V4_roBb~9%!mnqlJ76HLRp0KC) z(PkQFie&OYq~YZiB^7fObhdl8{qVH%TQ=b}`nK{mOXW1*vMOyWFqWG(JT}O3wX*mM zWSJja>urSnX(FY4r)j4J?5$N{t;F{qkFlter~xvKa1pa+Gi5VdN?XcdrlERJBURy3 z%v02&8}#XZ>2^-R$6KfZQ@_%=khZnISHh)F;itZTOAid_5tQ}xLX<>$!e#Z(iUEG= zywW|yUsf>ZPHkARTc%s~LQFbtSpChI{!@LXlsnx{OF~P&-M-y#L?}fBL`=*!%(nBa z&2S~xOVmu&OnU|g244@3=PKrF$WF+u<*(&W=$f#BiH+tNlIc3))yP@hIHpd zHh!+@+|Fpr2yYI5da6Oi5I@CO$?L!y@$ka~Hr1P|b9sc9+gjnD_p{cek%%GYp-K5A zENlPut~(f;{80lWCldECdM_b4(Il#0DqB-3pQn4aw{6)t@F2i>A#~&blV6|Tu~kNV zx2?2&XFGo8)qujQ>jn1m55IQy!oFLr3~SN7%9Qb$uZpmMS)h>(Yl6}q(&={96Ym>~ zgDMW)b~rVEYd(0jq`9Q7JSR72?=ql_Z|rUCx9IdMaEYCVMGBH`lR`!2Mk93O=~5%`peetP(R&~){k`@as`2lwjn}AT&AwBK9J`E=Jsbp0ah!1WJ)b|me zDZku#McQKNU|D#MEsis>ljKFLwpHC#sZ$RKA<{0fUlfnKNm-@dl!S%&j#*T0*=5&6 zw26e8`JivL_eHfgkoj!V+0w4WhHuVHY&lyXr0wS$-2TR4cr@7)lWN$AoZ0M=lVUT$ zD?IUjeV=k?UVJF8?84n1@*444U!9XIaAeG?$X?B6yw5N-{efZr=7+6=-+Dyp>_IVN zOEeaSd-F-XsnxUe3t>=A3;q_q5C02S+8&v0aGN-~KfKKo*7{rF=NQqk_3%{l%SWOu znXTEF*O=$A(Q*BuR!w5X`cc-guXDAzZ@^X$`3U(bl^`Q_0{3lBlKyRSQ(3S0D2td8O|{^LF#}^KJ5u z9o-$9Ee14)$2aCePYj4xnO-WW+lLtM!N1&@UXL2hK<*BuU@|e`5mJ9Ua40@L--}HsXQkDWSh*DoAv@y49l9 zWnX(sX9_kOKc?k)HZ!?16L}XORJb=hV{k|r8$EQEevrllyO@@n)*r_Zw^?vQQ$=M_ z>%r;zNhxgT_K-*c=h^GC{u)jW>4>AT%?ZMA&TvuoZg$2e-zUYV8~9DGcf{_FZoZFS zg5_mz?cY4!Y7d$T;@x>O&t$Rugg;V@&0USH{v5u1ESm%luu_c~%0Q@y1Anrb9oJn^C+#x<#H>~migZEd(HxMn1SP-K@E1i2X@0l>o1F!( z|DKSyY;$%Lk+d~ykE8t8|BCXjx#&_Go@(6+I3rzUjWOINks>?KNUu=Lvf}ctWh4@- zqUDCw3xJ-BR1hB6A(4W#FV!BC=7AYaUOD|L4ZXqzAXKI?Mv8vYaDFr}(lghsfx1Th E59N2f#Q*>R literal 0 HcmV?d00001 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..f91f736fe7a364fc4227627200f1f638d4e0952e GIT binary patch literal 1969 zcmV;i2Tu5jP)O5=i@P>wl#SALn zX0ursBsrW!)fyWee_)~=m0DVNQ^P5qkFj^vT{f~ixqt|DP!~2}E2Q8xH8pc}I$eds z;ow@h)8e4tYxOiYUrkfaJ@%<{SeZSnY=`AZUD$vv*bH_c;R=Ofd}n88fdI}LlTI`m z>D@~zzu;1x#p)b;VB~BFfxtF=1S62}s;a6*Y#eLR{SXry3v0_Xy#|-+cM1&|?M@+A z2tME|kU>1x*x0z)YPH&hq%<>!E9IU2h8J`Nvt_aieL)0Y@Co1jg&)8S9kSb9>|B?x zFV_SNUeNDZvOf)h2tMH(41I2S)|F^^63dxpQ^4T`J*_mk`GRjS^ra`luV25u$ZR&- z#RhdYC%u1J9kc-6yQC(q)#(-l7{Jn-oCwd&&7H_*1dWief*ibO2pYVg`|AyEKEVJM zF!eNuh`PGEBJsHAra2bNg2MKo2k^11o%2PKd;k;J{EmB>O!k%0Xe6oJ)7gR!FKDgS z*3Cbdz~(O>p08&jEL37S*<=b?09YKQ0w%D5(d*bhb?VeojYdPB7Dbyh%z`=!VetN}X2@FoIQ@%n^Bcc?a0G)@#MA`^Jz3aPYptD+d_C zDxFdX7Z(@*%~n0H70WuTAq(J!+Uk`9j9>+`IDkmD4{wq#UShGZ)kVDTpUM>b`KymD z0nrZ&)UI=a#o_eI0Y+` zIDlbn*Jtw=K%?GHZ=HAV?z7FNe!;hy9Ig%Go6PnDz1?pBURt z#&K^%Wp>cgYftSgENUl%-RZX;7{MwHU|4>B{zG5Ws92N+JI$8dKulxZzw3^k^fuoR z$j{5IX6|-Es0&+-dV9}$jWL2%I)tKfa&pRiEo9wyr*@iurTg|8<9T=BugqXM5`V$- z|B0nt)NXO~*dN%y2v+GdIyfaIWj&jo$lGSlt5K$fk1THE*`J~pWNl`0_A=?g21c+- z7qW=>`1scf3JR=Rt+r1y3SjPNY?NN7r&a%SaYF;iJ(KkSp7Cxk`>(3Y)@yJ&rx%v3ZrHIb(S&9fFTfenmc^>i|e+_GiMM!8&027|%BLFbbeH`|?khC*Fj z_&R!E0!&~7qjdbc4m3=ov$L~Xef2`C(LukmS!N!;cfp13zPko`XtehjyoHs;?SpU` z`~myL6x`y)hS2(81Ea?S4c{d%un5x%3k$j9n|MaTln5tpUr>3SaXw|MDppfmP{~ym zy3M9iD4y{S|DnvZ^PZC%wtr?vSA%FR0RvdT1U4}GI@sgD9Fv}&UdNVeT(ojV?y`A0 z6jv&Oej;mk-AsT1EMNkguS31i3sLOIwkRtr%UoYyPdD21+!i-f@PfX>X0Vb+2HZpt zSir;L4KaHVVUtv07+TvBov%c9}Jv%AIG5^OuXyLA7l(7FCEz2&Vl_yK+ zi_;2D@r-x)4`ommbx;>JV2igol=l(b@5TIHB#Pgc#4?$an3$Nhb?eqE$;rv}si~>z zw6rwZxpOC{c*Z;YhcYOOI(&;q^R@OZ!ljrAPM>}xJV^INE=-800000NkvXXu0mjf DIrYBm literal 0 HcmV?d00001 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_action_search.png new file mode 100644 index 0000000000000000000000000000000000000000..d699c6b37e0dcb1d636ebdd6733ab6d576d97ab5 GIT binary patch literal 3199 zcmb7`r z;FfSGv4{Ilc+Tf@o$JjxFV6RRbK*^nb!e&BsQ>`9db*nCSFZM-C`hh4x+&u4l~MZY zTKfY)&G?^)#uvlS0iZJRfI>}8-F*Ul{M~(gx%Hq>Zr>+9ZXSM6gD&W51 z8m9@|6+zYL{RAxl7Y9sk20ij%Mg)lKS-I(g4^5y0$3R^NC}@DVSzPoTKpF}h`gwVS zKvXVZ(mu3O`gOO4VGD9aDz{Dv%O|fDVM`(6M{Z>$dP@kW$9k7Z){)pTPffHdIG0T_ zLYn^j(J%l7smxc`9$f_C=xT5{*(3~|y~xgIGQw>qr?tzC(MsQ|;8p^{$1a7%>e-Qs zWJs^ecl`UL?hmO8p5hbT>gd%PLBaN%)sgRiY_tkfu(Pup>+3W6JsP%-gH~aeh%WmM ztBc2f!j;bPC*Rvw`647AMCg#7e(xGSHZ0~GO{0u*TG&k1Id7sSoO4aw?$L9?!XZp+ zW{iGGnt88|B#UpyYoy)z!aq)MSzQ)BBT-qF0UsWz5QV0Sls#}J`E4M`01xO`#RG8I z;?wy}h=K&^9=S3aNH|cv&?(>tNH@JSKL8$T@`=I*>s9+G0MIOmfP7HrIPSbD+(E|K zd2OMS`rJV_N`tSbOM^j!$_2^!#NkfWOAVozkq=xD2eEHzT+$t8?lI}UbfR6BpXii* z>Hj)XnCQ-2FMxXL@>XI@h@^KHuF`3;qNR`o*Fi(JS zTk3KhDnB8XkG0coPF3s&k}uC=T6H8cBI?YPztJ>8v1M}XQQGgQzq$lS*)3Fb*XiZb)G|8DzuZD-}_UGRUz}iNBV3V3>(rLWUe`q>Xt=$=8I*8 zueaPxItQB3bkdimTscPO!VPy5l`+e*`pNU(CE^oc+~md}v$e zNA?er<3JkP80N^nID`-z>L&S31Y6+E+8o0YwuwZxKA5icl(i+D2YZo_U9=zFt*kM?V=z1-B!Z1q9HJf5_bF;638dIUa>%szhxY00_Z zYDrYCC@++UO6f~k)tet>xT%t_<@lYx2{5MI5-QC;3Qt&KI=HiXhoeN=5G&zo=UI`J zodvJdtu(9D*=>`p*(*htv}v_ipGDBA_vs7T3F;t{ao5mW7PA(MrBtOXM#>5&HKG-s z#Th>KSG~G*n-c4NOsjXa zjl6X++|uSjy>>Oant!ULx~24bDb_gMxH5kV(f#2UW&l&(#P(rhhHSnDoBLdH+fsCrb_UfF!@ zzU;ooe(b{AVd=Mb@~x%(zjpUSzng80sZzhq6!%=N3O9k8L?9Zsc*UH>Qmv||KQt8w zR^S~ESXF+jJbAmOvZf@rB)Md5KP=bL)Za8@((RLPAH58H!Ao!C+DUzQEK@uOK z9$`y-b{g`W=W~*(!o2J6y4gMTR|QygX7%Kk)h{)E_j5EHM@vk}qq>SYi|KW{5{v@j4F0L-bZLu-gvA7wi9pskrp)SNIB<*Kv zt4uK87pY?54Q!NPc}lAxt>Gd{A)h7h8Ml|DvO=3gWLj#9pGF0bQ91^(gV=O?HdN&r zU3dA#JF!XZRwns?XMIZ5HER(nj7G^1n2pdhguD*nYUTEMBz{mnt1|!Y$lh@M;CzbQ zn}fH6J;pA^l{8FojDeL17ksm=>XCe%l3(yV)f)4)yD|64s+2w@U?5(TCY5_u*)`#9 z0wG485f3{DUv@SUdG1nMQf)+s?Ji93JurcbSuZy_{*6I%s4&MT)G*DnW;4H-5n2e^ z;E44Z{G7Xx(NJF5gLN5o8+Y5@ToTE*rOT?w-pr=+rk$N@pk2P-uy^uXYhEmSL}RLL08&On+y@wsc{=#JU#}^wNr%%1d_BldZe@p+IoVRVoU#JYU&s!2% z8cn)Qx}NEs)#Fub;w!dKv(CI8R2zHw?e&q2lU$JV(qX2t-zK@nm0{+|Q+IcD==%O? zzeFDdiqOi^TE2eMyUOdU8N9xYr(DM0qE(oC_A0b$g?!?lXIuy_u}2zthk4p4i@Y;i zC);L|VU@9|ou!a-o%w(0-$*N22kRff20Z4rUrwYW4o6?1Gtpt;qJI_~=HFpLx14dy zkLZ04ni&FC#@F#*n8~+>?mEPPnh(zylKg+!PF$$WX`#kQjmAN&{m$ui4g_!Gek+)&GGpx}OWt4XW< zvD%*cEOaq;Qq}fyVdh}r#iNeEf}^no9Xwfd1^rg1X7ZmqjP5|k@>5CliOL> z+z5aWegKe>0Q@0b`8EJg#R1rH06-xJ09Kzg`!Cv8vr?vpFfGFWUmFZRbgtH~2bddM z09tkdDK#S-H-F^oypsBk;oA0rVgQJY^)%IC@b10L&S#O_3|i`@3_Sh>f@jOuIlgF@ zjDU$X+pgSQ6gge5UGs7F;SxQt=(^faA}=#m?XsRl#YaQw$Xc>q*b@8 z0NsVVCB&vb3lCJo#es|K1-Dv=O~AWR9;=<#zd%L(ziJ+&>C(t+|2DqnDCi%PoybG} zdrO?yBFw-cm_E*{h&pbEW{?^~m0};T6$09ys@SNRHm1z!jX>1gZn><9yS zil4o!X0-hiXr?EUXi4NI?`1xs!ZaKN@oW1vk|m6pFa`gd5-p>B>>VGdm$aL~TFUo{ znEPnQiQpzTt-Ugig+Iu$H6W=6LaoGBGk?E;z|G ReC-u>pr>W5S)<|b@_%^e3*P_$ literal 0 HcmV?d00001 diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png b/pkgs/development/androidenv/examples/src/myfirstapp/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..96095ec84ba3819f01c064af82c87cfede3b73ec GIT binary patch literal 4006 zcmV;X4_WYuP)l(O}54vF%CP=G3-Hn>0t$=9m~_(i63*i8X|SF~$Q3 zBq3tzgIF=a0JUm-AVCB~1$iYP3JU_FunX++*axu70@L|zW^)ML-S7K$zg>1exaZ6{ zu={;8_x|q8ojZ5#%=-9@(>RUOIE~Xdc^*yZ?CgAqmT;|B8`sm*^IwC(P;E3C9nq{uD59qRM-Ngxo3dvsnwG|6lZfio%+dsRoe`v>isCh*+U)by~|&JigoDYwyy zE}42DHYL4CCr_9NcK|=KJVED_^KC{h?`e>lrDVwBRlUBUpBlYRFU zGPSj}z2eDp!^HOX_FZ-?j#y5+EyN_6YEkl9Hx(cX#L5viD{mn|}57*BXxo-%?;6IR=7xUVzMyeN@5U zx^=5R^%An}fe$)JSF@pB0KTPQ70pGE8L|U|(ZYX{N~N-Ec0iR~{bt|$UN2Gr_$}+` z=M&^3zyMgdeZp;NY59l?e7JYd6m)tO_?Gg={0`3fz@h|T;m(P9Vr^}0_`tvbCvyiI zdb|>ROWDuE6tOrGk;~<;xCNC_y8Y9&L|9$0N+whH23k|{sczAN>o#{a^=ct)ZLQv zF+HFSCEb!zz~73yc`E=Isnu#ZFcZz|DK0LKG?`4i7(kr;XJ4u$rGSUCRHTFFWXv{o zNJ&Xalqg=&#*G_iQH{3qZ5%OvDS>Y(*!&klzzo4_FA;0Yis-e^yr38+29|)aYn!F}k|Itrkka z4j4K*3Z_(7S6A}&d@Q*<-WGV{Tf#EiIm6V}JR)ESECu`hNl8f$(v_W{2H^oM&uo{Z z0w7mg-=N@801Sbp&~BtJ=60ZsY=!3qF|z!I1WQNXmCni_@B#=zjX z0{)+XB{1b}ev*@uA8%`G6WkDn=(qx`;6kwkrhLti@9ER0qYVaw;D)e)A!P;d4a!*w zRTE&!*9`d=7Z+dP6ZN!4E3&2O1tA>a#Q6jQOo1&Y`imAV3aG2AbNFz?>I~9`|+T4m%B)GmChrJHQtfR&gblz-4q>)X>M-rm%!Mb0;U%g6;%mc0gogcxUi=H zcGLy65DwSbGebyI%xp1u6!_>5 zkri62=I2URzti;tQ(y~>?I~bZRaKQnNCebsWAycxFWb+AemqA_I*fxJqX6vWS?e^& zm=>{t*)-_1IAnm zAkK~e%P2ta;Znk9jlH7^K01J{ERMfk>=de3z-AZxq-1=1(cPQ>4a`WIwIik@<^77l&JgN3Oq*W-a6ao z7T&v}6}3HV(pOYe7`PNLyRfjZ-H}MBEyB4gJ}K%@LP5LHZQvt&!h=ilt<=@GT@8tRrl$|G3|`^lf*=ymBDp@$lEoS3)O^RW)N=H#l^ zYP%HEf`S4CmjY&;Idi7knNWl+f}MxG=X1Zq8`L{e8N_!{;m<#P-u5aTc0Whyn)wKr zW@cu}x!lkh85tP`&IIG^(UF^doRhMp{EDs<{?pV;`b2O;piEp(U@v0>e5E(J&Lab+ zz?N$vHa$5x`G7OwXf8TRl^`T_<;naGvsuyz+>L@6!xkdKB3uVWFfucmTtRw0HjHqGP*fp=`p&gb7pi*jcrC z%P>q}7<|=*PExNMAg(502~2@4S2%i7U|`_f+}vEfPN#D@W3cb&tq*0ncOMy7<9t-3 zH+w|xAYchhfi2gD47ST;X=!O+JCc^-C|%c@$ls}XarI$t)Q_-3t=2@`Nx(8aJ-vc0 z!Z=e?Zr`E zh=s)Ek>GWhdOj}|by?jY;hRSCVqq6K)X+;>`@TD2yOV$+umq;O(o$IRP~h?7$JLZZ zJyeW6gGoLdnU9pgJDAY|c1eU;*Z(am=7_5^!4?L#u!|0+-M71eOYZBwd@GAi}t|> zyf2f;d;l|G2MmFwBL}yq%$YN1env({hf=9@Y82p2xyD4^uhxC%3|T1K^v+fqoX)%9 zOSpqNr`2G-BQA8r8L+r(I&Ui;a!lS6*K3&?rEB25}a+ zllO6?sUZ1jmt1cKKOFOzJ1FV1<#V(mGz8pTP>K_sk z@>8lwjY6T|?Gd3fBPfPgkI>aE6om*VveYm#l)Zz*ATVTr=kXpg8n7k$RKD#J6B~&N32!MO9T5q1dzl zBev}*`rUEZNRX{swd&c!hYuU->KjO8S;v?J-%{Xg^cwp~V`C!$CaYJk{xfqsU3QPC zAC}b-5fSmP?ad&I4^@z5Clq5>2~_s?&exLTUwlC#BO~8uAqPK~UR%jFm4kn#h7i>=>;gQ=<0uzRf%YS2FBHP)SAGG$JOY?UeAxl!PjVUES zR>%z5fdQ~!n7HruTm+aV-xjbqD17@BFk&7FW566iM#yRgpUMslSg_6QzbSx;Cctmb zoy&q=+E!&YM~5oOvM*Ys3qF+%GD23!4B6R6i`y^n9=>ld+wZnnOM+gEx*QU9h%7o# zMwT6KCik9dlMeV)7RUtIAR}aj%xtmc>odya%NV&k@cD?W;LUr;Pd+Xn_Z(@UjJHYv z{8qCpkO{IuM#$1-Eez-otxFG)YH^`&q+DEGQL3%aS{u-FRSb z_;&rgh)<}H*=Bcc>CvXqHBGc_@Bm)G6Ls6w`Cu>EB+K&m|RSjd@gsN>&je8w28LC19$;X;0-*2SH`o~^?G}AgFoA%`;p(& z8DX@S{X6J|sFpiliz6XhKQ#}1_}TC}mL6&RW>qbQLI60e3w5Gyw1KwJCfWuM-~~K^ zH^!sCk3@dX)|Mh7I5&G9!r!*_TF&*B}ti#kvj>O|dW18t#Av<)5@ zFES|uZ%Yv~nRjs)Euqgn_uPi4sHmgS(b2UD2?@qMd-fpCPEMRSLC&2!M=o8ugtNBh zln9iG9ncn9w?z{6Ob zA*_wrtW963*myCO;m;O3GS)+bS#Mp)%mo5q%W1ivmIqn6pMAEBJ+qL#6U^$6u{!<7 zK^LZwNi3~z8gmC{Fq09$da;a^+3d5K?3wB8ohhu2alprEoIH~L2bDf%C+ + + + + diff --git a/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml b/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml new file mode 100644 index 00000000000..0d867aa0da0 --- /dev/null +++ b/pkgs/development/androidenv/examples/src/myfirstapp/res/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + +