From ef9a15a5a4952e36c111edfba3c6716c43a49090 Mon Sep 17 00:00:00 2001 From: Marc Weber <marco-oweber@gmx.de> Date: Wed, 19 Sep 2012 11:48:27 +0200 Subject: [PATCH 001/155] fix/update debootstrap (thereby updating fakeroot) fakeroot is used to create devices.tar.gz now (thanks to aszlig) --- pkgs/tools/misc/debootstrap/default.nix | 131 ++++++++++++++---------- pkgs/tools/system/fakeroot/default.nix | 18 +++- 2 files changed, 89 insertions(+), 60 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 33a1fc839ce0..39666f461721 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: + # \<echo\>\|\/bin\/\|^\s*\<cat\>\|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 + + + sed -i \ + -e 's@\<wget\>@${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 + 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 $out/bin/debootstrap + + ensureDir $out/man/man8 + mv debootstrap.8 $out/man/man8 ''; - /* 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 - #!/bin/sh - DEBOOTSTRAP_DIR=$out/usr/share/debootstrap $out/usr/sbin/debootstrap "\$@" - EOF - chmod +x $t - ''; - */ + 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 d80b35e1a111..1bf18ed867c3 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"; From ce6dbfc66ab93a2523e40c8b0537e910cd1e1953 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Thu, 4 Oct 2012 19:57:17 -0400 Subject: [PATCH 002/155] 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 c43e9f6b4da6..731b44aa0ecd 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 = { From af045b4ee1fe1467c9112c0e5a6763a1c1d8fd94 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Thu, 4 Oct 2012 20:11:47 -0400 Subject: [PATCH 003/155] 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 53517e853e94..9633967da6a9 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 ]; From 172abb4b26e0453300fa873c5256f4b171258486 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt <tipecaml@gmail.com> Date: Fri, 5 Oct 2012 03:24:09 +0200 Subject: [PATCH 004/155] Add a "smatch" package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cyril Roelandt <tipecaml@gmail.com> Signed-off-by: Ludovic Courtès <ludo@gnu.org> --- .../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 000000000000..8b9deca409fe --- /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 bd554b7f1d13..d1b93ce496fb 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 { }; From 18d4a832b053067eb771d3f19e4116069c150033 Mon Sep 17 00:00:00 2001 From: Jack Cummings <jack@mudshark.org> Date: Fri, 5 Oct 2012 09:36:36 -0700 Subject: [PATCH 005/155] - 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 70b03a4e483b..616adf002243 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 b3563f423412..84bcf5efa7c2 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 fd6d727e7345..6e67ce660f14 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 62ec56b2f7ab..45538acdca3e 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 From e0be32f6760e26aab599a09ee2b4d71b4497f7e8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 5 Oct 2012 13:45:27 -0400 Subject: [PATCH 006/155] =?UTF-8?q?Add=20a=20function=20=E2=80=98getVersio?= =?UTF-8?q?n=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 4bd7a5bebde3..19d1738182f4 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 From e8c4748cdba536f6c85e47dea207205795b4c4de Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 5 Oct 2012 16:06:19 -0400 Subject: [PATCH 007/155] 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 9e11a1bf761e..79be818bfb39 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 = { From d9c01ef51d5dd9ed9ce26de19ff94c0b2f70d243 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 5 Oct 2012 16:06:35 -0400 Subject: [PATCH 008/155] 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 bb9743e8e5d9..767e85d67733 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"; From 29aa7abe870519b3ef12568c296dd035195328ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 5 Oct 2012 16:15:56 -0400 Subject: [PATCH 009/155] 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 0d36bf887397..0deee99eadf3 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 d1b93ce496fb..5e45b6442031 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; }; From 91d58edafc012223bcd86c4fa45231f7f3291a8a Mon Sep 17 00:00:00 2001 From: Jack Cummings <jack@mudshark.org> Date: Fri, 5 Oct 2012 13:52:54 -0700 Subject: [PATCH 010/155] - 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 84bcf5efa7c2..9d5764a6307f 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 From 66e43a52972dca165433860ba3734c6a2bfeb42b Mon Sep 17 00:00:00 2001 From: Jack Cummings <jack@mudshark.org> Date: Fri, 5 Oct 2012 13:56:51 -0700 Subject: [PATCH 011/155] - 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 84bcf5efa7c2..934213279fad 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]; From a4cd5afd0318ca8f9c653472b6ada664994da3cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 5 Oct 2012 16:58:36 -0400 Subject: [PATCH 012/155] 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 9d67c5e2f729..36d341af5e65 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 000000000000..764eead54eac --- /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; 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 013/155] 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 31372aa84186..ac6fed5deb46 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 From 79fa3e218136b777c6498fe7915aa244979f739f Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Sun, 7 Oct 2012 07:15:03 +0200 Subject: [PATCH 014/155] pyaudio: New package, version 0.2.4. Signed-off-by: aszlig <aszlig@redmoonstudios.org> --- 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 ddc852ffa4a2..e7ce262649e3 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"; From e5239b78bdade58995b0741b82987fa0676da8c9 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Sun, 7 Oct 2012 11:18:25 +0200 Subject: [PATCH 015/155] 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 <aszlig@redmoonstudios.org> --- pkgs/development/compilers/neko/default.nix | 95 +++++++------------ .../compilers/neko/disable-modules.patch | 59 ------------ 2 files changed, 34 insertions(+), 120 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 28a98fe1e258..64e1741ae5c3 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 - - # 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 - - 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} - - sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko - ln -s ./neko bin/.neko-wrapped - ''; - - inherit zlib; - - meta = { - description = "Neko is an high-level dynamicly typed programming language"; - homepage = http://nekovm.org; - license = ["GPLv2" ]; # -> docs/license.txt - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + src = fetchurl { + url = "http://nekovm.org/_media/neko-${version}.tar.gz"; + sha256 = "099727w6dk689z3pcgbhsqjl74zzrh82a5vb2abxynamcqxcgz1w"; }; - # if stripping was done neko and nekoc would be the same. ?! - dontStrip = 1; + 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 - # 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 + 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 - - 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 ]; -}) + makeFlags = "INSTALL_PREFIX=$(out)"; + buildInputs = [ boehmgc zlib sqlite pcre ]; + dontStrip = true; + + preInstall = '' + install -vd "$out/lib" "$out/bin" + ''; + + meta = { + description = "A high-level dynamically typed programming language"; + homepage = http://nekovm.org; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/neko/disable-modules.patch b/pkgs/development/compilers/neko/disable-modules.patch deleted file mode 100644 index d4d5a8eb30ee..000000000000 --- 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 From 064cf682815e953b4f17d8400c9708bca7573137 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Sun, 7 Oct 2012 11:24:51 +0200 Subject: [PATCH 016/155] 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 <aszlig@redmoonstudios.org> --- 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 8018b478e809..f7af2467e5f9 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 5e45b6442031..396f9fd9633c 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; From 08e025acab07aba03c9ab4ed3566a8b257306a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Fri, 5 Oct 2012 23:11:46 +0200 Subject: [PATCH 017/155] 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 a7300f541c4e..9fa76f5b4067 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"; From 2b31648deed18a7d558204205e0fd222ffbebb6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Sun, 7 Oct 2012 13:46:16 +0200 Subject: [PATCH 018/155] 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 9fa76f5b4067..0358e1c982c2 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 ]; From 25b4957e4aaaf1a341b683fc85f3ab6b89dd4d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Sun, 7 Oct 2012 13:51:39 +0200 Subject: [PATCH 019/155] 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 000000000000..b51c97a6d687 --- /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 396f9fd9633c..57078ac3750c 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 { }; 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 020/155] 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 000000000000..693cf7c78bfe --- /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 2ffacb084793..95682df5d39c 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 57078ac3750c..32fb0cb46753 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 eeba996990dc..0e1f11d0b8ae 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 { 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 021/155] 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 693cf7c78bfe..e8a8abea91dc 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]; }; } From f2e82a385e1e4cb508de1010673765d9aac0c3e9 Mon Sep 17 00:00:00 2001 From: Alexander Foremny <alexanderforemny@gmail.com> Date: Sun, 7 Oct 2012 17:52:43 +0200 Subject: [PATCH 022/155] 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 000000000000..4b4d85df8907 --- /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 5e45b6442031..c3f78360e110 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. From 08266083282728d8366493fd5843ca3e262b7d6d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Sun, 7 Oct 2012 18:55:07 +0200 Subject: [PATCH 023/155] 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 0e623f7ac040..dc316267e6cc 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 32fb0cb46753..28848c191689 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 { }; From a570a4c9ed9e703a4dffbe9a9153c222ab4403f7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson <rickynils@gmail.com> Date: Sun, 7 Oct 2012 19:21:02 +0200 Subject: [PATCH 024/155] 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 8c3cd9f11cd5..ba052738ad51 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)"; From d72adde5307cb26f0c307575b8a58189d49bd9c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Sun, 7 Oct 2012 00:25:38 -0400 Subject: [PATCH 025/155] 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 000000000000..80296b0d992c --- /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 000000000000..396bb2e10ccd --- /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 000000000000..a2947461c87d --- /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 28848c191689..5a5fc5e2fb8e 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 { }; From aaebab484b26c2cad4fc34a1ee66b7c25deddac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Sun, 7 Oct 2012 22:28:45 +0200 Subject: [PATCH 026/155] 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 1803a201aff2..834f98960dfb 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 ''; From df5abaf8b48ae89b0caa8e546119d523a1bd3571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Sun, 7 Oct 2012 22:30:47 +0200 Subject: [PATCH 027/155] 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 4b1f6dcd2687..fb697678ba21 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; From fc817640e5c2623f26a0e6e8207c91ac247b876a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Sun, 7 Oct 2012 22:33:20 +0200 Subject: [PATCH 028/155] 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 fb697678ba21..bc7b3c57e60b 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; }; } From 026dd8b6f226386c489f53f9313f9445ac4dd721 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Sun, 7 Oct 2012 16:54:02 -0400 Subject: [PATCH 029/155] 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 bd0a7040adff..1fbb177afa06 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 ''; From 65358fad8ce2d86f28f7ec485b30ad30b5c9badd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Sun, 7 Oct 2012 13:52:51 +0200 Subject: [PATCH 030/155] 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 2ca4d1bd0904..81cac5be709e 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 = { From c585be861961563db74f035a981d32330eb001bf Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Sun, 7 Oct 2012 23:10:42 +0200 Subject: [PATCH 031/155] 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 <aszlig@redmoonstudios.org> --- 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 64e1741ae5c3..ddeeb51c25e4 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}' \ From 529fee610b977d0fbf367753b6ee05a100fb4892 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Sun, 7 Oct 2012 18:22:30 -0400 Subject: [PATCH 032/155] 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 0e582c903c59..970a7a874979 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 ]; From c6c701909123bb3ee593a96b5a18ee39d8aa30e8 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 02:20:32 +0200 Subject: [PATCH 033/155] 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 <aszlig@redmoonstudios.org> --- 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 f7af2467e5f9..817e4573df24 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; From 5a6fd3d51042a16ae4042bafcdce976c9b26eae3 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Sun, 7 Oct 2012 23:25:11 -0400 Subject: [PATCH 034/155] 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 204c080b871a..000000000000 --- 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 0fb1cf82cc27..204c080b871a 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 5a5fc5e2fb8e..21c811dbf841 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 { }; From 77d424875c4d035c3025bcb7f8f58c2a11229f93 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 04:54:13 +0200 Subject: [PATCH 035/155] 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 <aszlig@redmoonstudios.org> --- .../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 59b05e94911f..7dee8f3d296c 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 From 949afcc0f2d82cb00a7f0ca9c0dc4b45f8fe273f Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 05:49:13 +0200 Subject: [PATCH 036/155] 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 <aszlig@redmoonstudios.org> --- .../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 7dee8f3d296c..62ceb2dfb9be 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 000000000000..bde476adbfd5 --- /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; + } From df64adc2dfbfc2e32319799ef713ecef5976d847 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 05:52:06 +0200 Subject: [PATCH 037/155] 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 <aszlig@redmoonstudios.org> --- .../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 9d2a78931027..8dd406e5ea4f 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"; From 10679a7ba6bb92779f7d24b7ac5682e6497934b2 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 07:04:47 +0200 Subject: [PATCH 038/155] 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 <aszlig@redmoonstudios.org> --- .../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 62ceb2dfb9be..1a1030606cfa 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 From 17fe198695572fb944bf3b3f6f1faaced63c508d Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 07:16:23 +0200 Subject: [PATCH 039/155] 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 <aszlig@redmoonstudios.org> --- .../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 1a1030606cfa..b3a149c8105e 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 bde476adbfd5..000000000000 --- 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; - } From 58a4edd294b855057bedb97c302a681f4544c385 Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 07:30:16 +0200 Subject: [PATCH 040/155] 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 <aszlig@redmoonstudios.org> --- .../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 b3a149c8105e..b34e13c920e3 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 edeee37f19ca..f947d796f186 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 f947d796f186..000000000000 --- 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; - } From 4f178d1698209627f535af9071e51522c78e7ee9 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 8 Oct 2012 01:57:39 -0400 Subject: [PATCH 041/155] 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 828c554175e5..5e7370718ab4 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 62b8bc763f9f..ffa67b464eca 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 @@ +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); - Linker = GetProgramPath("ld"); - -+#if 0 - LinuxDistro Distro = DetectLinuxDistro(Arch); - - 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 663e1bfab28b..48e4c4946f30 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; }; From 778635384804813f454519426a499e5363f45117 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 8 Oct 2012 02:32:09 -0400 Subject: [PATCH 042/155] 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 000000000000..bed953119151 --- /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 21c811dbf841..bcb7a356a254 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 { }; From 29fd8d4eaa6f09f8987044fae0bdfefd0c67eecf Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Mon, 8 Oct 2012 03:12:42 -0400 Subject: [PATCH 043/155] 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 cab217fef97d..d66149a95096 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 = From 18ccd4b34073dd981babab7436becf51100f4e2f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 10:46:10 +0200 Subject: [PATCH 044/155] 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 000000000000..7c977989471e --- /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 16d315056ea5..10f3238b2232 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 {}; From 3b9a7e59b29993c37925f8fe039467a8bedd9e14 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 10:46:55 +0200 Subject: [PATCH 045/155] 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 14e811b5e94e..e4698c72cad3 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 10f3238b2232..488d5ccdb429 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 {}; From 0a9568df7bc58e2921e6916c5a69ccf9f4738c7f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 10:47:32 +0200 Subject: [PATCH 046/155] 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 7f6b70a52e60..04257960a64c 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 488d5ccdb429..96ff9d0960f1 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 {}; From 3ed8a0c9dc3ab570bb2a6f853ba54970a9120ee3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:14:39 +0200 Subject: [PATCH 047/155] 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 b4010959d770..b410b36ea569 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"; From 5387c501578d7ca09b119f6e22c3cc74b5258b92 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:15:03 +0200 Subject: [PATCH 048/155] 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 e3190749f1cb..efbd56cbe6ad 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"; From 3e5dc7a950ecae099c926fc036cc74c331bb6f14 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:16:16 +0200 Subject: [PATCH 049/155] 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 ac5c87d76132..ec7b78fe6fdb 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"; From 0f54bd6130500508720031ad55f3b19a65c0cde1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:23 +0200 Subject: [PATCH 050/155] 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 deb97a19b1c0..b240824ff73e 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 = [ From 9812fb396174cae49c30713daf331ef8a174b3f3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:23 +0200 Subject: [PATCH 051/155] 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 f0757bcca023..303e67c3b99d 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"; From fbb2b63632427e24aa163092ce17fee847650fea Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:23 +0200 Subject: [PATCH 052/155] 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 3cd0c09c3b29..2899f526f36b 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 From ce15d915bbdbc90f3cf3ead87a62f5b1933b0cb2 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 053/155] 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 c383c46f30b5..e1a5fc10a42b 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"; From 10eda4938a2b6decc5aafcc2291bbf5063b58ce8 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 054/155] 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 077e31c683ec..41bd23470124 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"; From d44ce8ee8b40dc5e1b2eb5dc30a66624683eeb97 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 055/155] 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 650f82a99ece..bec44a0b8e20 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 From 136581a717b878b089af27a961f0643021b41479 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 056/155] 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 25b53834f942..7b478d8cd995 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 From e7a86c9ded110409d393327d0a17e5dd2d5687d2 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 057/155] 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 0778089bdd06..c09558449dfe 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"; From 0ab16be804e299d016ebbd335238e8fdff5c864b Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 058/155] 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 07744765adba..b6d0b4668f8e 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 ]; From bf151cdbd732c5324d65e5c18f866731483cea3c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 059/155] 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 0a6fdf6c8cce..a36d333e9099 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"; From c9cdb612d3cdf19b5d73c461992b6b5aede2218d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:24 +0200 Subject: [PATCH 060/155] 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 e988eae9adf8..4911b743d42f 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"; From 143650b1b1dd7807dad423b3a7fc0d5868ac2d8d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 061/155] 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 5d4b4365f393..e864075b42a5 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 From be0fe5c0d8710800cc9578e80878c41a1cbbf0d7 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 062/155] 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 08f933559108..8b8616fce208 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"; From a191dca5e79e8f477db04ea6aa2089716281da70 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 063/155] 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 1a22ff5df0d1..d525f2a6e0b8 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 = [ From 7c35fd86ede30880231fe62287ab6e56eed4280e Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 064/155] 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 4aad24d1cc7b..3e094e0c6b1a 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"; From ce72803dff685b92f8a04fe19c00710d3ead0563 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 065/155] 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 09ebeb847b9d..9a56f412fe2b 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; From 4af7e7d46c691a8417776765b9ad257f4a8dbc0c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 066/155] 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 c0ba821d5f1c..f6185597af17 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"; From 22caa0a77731a91d6e8f4619beef4ba84103212d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 067/155] 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 09264ab57f44..e5c334e1b22b 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 ]; From 5049bf557319960c5af87f43feabb71a0165f16d Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:25 +0200 Subject: [PATCH 068/155] 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 c376ab0cbd61..8b2871c3ce4f 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"; From 1148be313edd1987a7033135887bca57bc516e7c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 069/155] 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 d5c04d8e2b8a..45f65e932c00 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"; From 7901fa7d9669a446d743692d7419c3f62851084f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 070/155] 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 61ebc4ec1d9c..f0f6957c0364 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 ]; From 2833c14608cd12a907eb576f7d6417241fb0e385 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 071/155] 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 9e3ab7e77967..813e8372cfc7 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"; From 093aa60a74e0cf0eccc75ee474dc98168a0e59e7 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 072/155] 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 1cb682d2b919..d16f42f52ff2 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"; From 587bf8d2d8c9c39cbed2e51eb708ae16eb8c4c7b Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 073/155] 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 5815496695cc..3f6c5db004b7 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/"; From 58f227a11f8c7213b026d3b368e6ff2c50e40c88 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 074/155] 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 fb31ab76a2c5..f8032f8cde41 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"; From e55f32d2d7e0fca16a3a7dc5faff7bf8ef2c3190 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 075/155] 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 f2ebed7cc6a6..59c10c401333 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 = [ From 92e4df6ff4246dd692520ecb5aba2318880ad249 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 076/155] 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 99ce29b1991f..df93cae198a0 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"; From 0f654ae6240e7bec5c25069bca9e28e3897847a5 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:26 +0200 Subject: [PATCH 077/155] 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 349c4e057543..362dab2125f4 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 = [ From fc608ef86a0968939d58eb1eb1a7489cbe2e348f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 078/155] 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 1bb3cb76dac9..02356789bc30 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"; From 6af81dcb12f28fc210daf952752c8555487c7ef3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 079/155] 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 2704942b3609..dc8c9dd35bae 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/"; From 963a0bfc40aa840844bc6457de69a449e2497d6c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 080/155] 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 bb168f7d9901..c4c2bfc4a694 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"; From e754ab10ed6c5dfb8cf536508646c1fb9e96c3a1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 081/155] 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 52460c8246be..20d0bf3bc896 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 From f273a6054f061957e9d27c4076897e16923662ba Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 082/155] 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 c0bef5018ba0..87723df26c3d 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"; From 559a6cc24fcc7b781f037141c3cb4da8aa0c1e91 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 083/155] 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 c3dce8ca7d38..5a82c8b30af4 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 From 3ff871a11d8395196f6bdf753685a7dad06bec1c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 084/155] 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 9a801d62df83..203742853377 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/"; From 8cf5551b6ac1b127bc396928814593c6eac31bde Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 085/155] 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 10d8013f1b31..11bbc9bb6d7d 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"; From 8029d18f7ac8655793a18898f4a9b561b5611b82 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 086/155] 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 1b0397ead1bc..d4a6090fb1e1 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 = { From fc470f1d5a7716b333146d5ca79edd236269f49a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:27 +0200 Subject: [PATCH 087/155] 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 661c9c7895b5..1b971f3b3dff 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 = { From e6f26c5142ade55ea23574edf722f52b636b9213 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Mon, 8 Oct 2012 11:25:28 +0200 Subject: [PATCH 088/155] 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 3b9a6d4c9838..a3d885c60084 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"; From 58afd436155c7e49a9096d6a70320e6d98603b77 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson <rickynils@gmail.com> Date: Mon, 8 Oct 2012 12:35:25 +0200 Subject: [PATCH 089/155] 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 119633e06387..07b86c2e41ed 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 e7ce262649e3..f511b64ceda3 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 ]; From 692ad8059a4d9e10e6310a2256ad8f618463844c Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 15:05:00 +0200 Subject: [PATCH 090/155] 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 <aszlig@redmoonstudios.org> --- 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 b34e13c920e3..c4dc413c0f5b 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 From 1983d4fdfc28640993dd00c1ceed0e87a09d345c Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Mon, 8 Oct 2012 15:06:15 +0200 Subject: [PATCH 091/155] 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 <aszlig@redmoonstudios.org> --- 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 c4dc413c0f5b..1ea854c5e9df 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 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 092/155] 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 e8a8abea91dc..ddf30f342d15 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" \ From 27cadaa404b3aa4df8ff4bdab3e09d442715e299 Mon Sep 17 00:00:00 2001 From: Sander van der Burg <svanderburg@gmail.com> Date: Tue, 9 Oct 2012 11:40:06 +0200 Subject: [PATCH 093/155] 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 000000000000..dccc92a91f51 --- /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 bcb7a356a254..ddca30bfa9b8 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 { From 332c6de7367fe145e9df4faae2899216b8d51937 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Tue, 9 Oct 2012 13:18:46 +0200 Subject: [PATCH 094/155] 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 def318a1f3a5..cc6fd89e46e2 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; From 76aa428ac6306bd26b8d940dda2377894ba669f4 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Tue, 9 Oct 2012 13:19:04 +0200 Subject: [PATCH 095/155] 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 dbff9bba07e1..e79bb111a3dc 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; From 2f39ec92e3979ba526462a3ea55eaa7f90e246cf Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Tue, 9 Oct 2012 13:19:42 +0200 Subject: [PATCH 096/155] 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 9bcc6514f497..a5d375a68a74 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; From 8f480e3035f5d36212e99f2ff4b73f8e339b8439 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Tue, 9 Oct 2012 13:21:19 +0200 Subject: [PATCH 097/155] 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 5f23928ebc93..8afcffba87fa 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 a7f737d65e73..4fb7563c9a11 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 ddca30bfa9b8..e0eeb7ecb010 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 From 10462c7a820e9c4e34a3b618c8b3383aacb0888e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Tue, 9 Oct 2012 14:08:17 +0200 Subject: [PATCH 098/155] 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 861bacd46c2a..4c1963f46332 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 ]; From da8b2dfcc74cec1b4cfbd4a4b69db17b4d162f8e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Tue, 9 Oct 2012 15:49:51 +0200 Subject: [PATCH 099/155] 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 7a73a0417982..7952c73f48c9 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 From da52aeefadef9f42651ebbc5a744261b17c1dc9d Mon Sep 17 00:00:00 2001 From: Sander van der Burg <svanderburg@gmail.com> Date: Tue, 9 Oct 2012 16:41:01 +0200 Subject: [PATCH 100/155] 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 0f411b43f9f0..07c4d6a0aba7 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 ]; From 85398493bf4edcdda3ce50f3b546c2c41027ce5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name> Date: Tue, 9 Oct 2012 17:01:55 +0200 Subject: [PATCH 101/155] 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 1d9765539bfc..60ea7981931d 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 ]; From 5150b55bf21e39ae6a7513b8bd7541ff6a4afb64 Mon Sep 17 00:00:00 2001 From: Shea Levy <shea@shealevy.com> Date: Tue, 9 Oct 2012 11:11:19 -0400 Subject: [PATCH 102/155] 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 56daf43595d7..0aaa275ccc5d 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} From 156e1f1e1fb9feaf88044ce05d2cefaa7642fd92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Mon, 8 Oct 2012 17:26:02 -0400 Subject: [PATCH 103/155] 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 000000000000..ce57c2141834 --- /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 e0eeb7ecb010..2524a05ded22 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; }; From 29d3112ee9591645d58f6be48fb2982386488302 Mon Sep 17 00:00:00 2001 From: Alexander Foremny <alexanderforemny@gmail.com> Date: Sat, 6 Oct 2012 12:42:09 +0200 Subject: [PATCH 104/155] 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 d98dc33478aa..4634585cbd26 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"; }; From c3e12acb5a0a48522de1073ab61be56381397d63 Mon Sep 17 00:00:00 2001 From: Marco Maggesi <maggesi@math.unifi.it> Date: Wed, 12 Sep 2012 21:22:20 +0200 Subject: [PATCH 105/155] 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 a520f8196d8a..d59dbae45fe9 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 c587f2b6cd3b..000000000000 --- 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 From 3989f09ae660d625dae036f06ef2a90649072ff9 Mon Sep 17 00:00:00 2001 From: Marco Maggesi <maggesi@math.unifi.it> Date: Wed, 12 Sep 2012 21:23:33 +0200 Subject: [PATCH 106/155] 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 8f21ba649bf7..533f1ec8d1cd 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 From a0904241158a0e8798fd8fb4fad4446bbf342940 Mon Sep 17 00:00:00 2001 From: Marco Maggesi <maggesi@math.unifi.it> Date: Wed, 12 Sep 2012 21:40:17 +0200 Subject: [PATCH 107/155] 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 e4dc43743f32..4d9e934b6283 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]; From 2221bf0593c68cfbcb53a75fed16867b6cbf4bd8 Mon Sep 17 00:00:00 2001 From: Marco Maggesi <maggesi@math.unifi.it> Date: Wed, 12 Sep 2012 21:54:00 +0200 Subject: [PATCH 108/155] 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 315bca38f361..74b3368293c1 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 From e32567bcf75361a4b60093c8da8f0634029ddd68 Mon Sep 17 00:00:00 2001 From: Marco Maggesi <maggesi@math.unifi.it> Date: Mon, 8 Oct 2012 00:05:48 +0200 Subject: [PATCH 109/155] 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 e25654a24818..d7c14e031b35 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 2524a05ded22..3b0c1de13cbf 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 { }; From 34ff91d6028445371599ccc4c1b8a77724fb3c95 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 9 Oct 2012 14:20:44 -0400 Subject: [PATCH 110/155] 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 4a1c0be649ff..5c0b1c2d7233 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; }; } From 5dbe17f315fa49af6c8667d7f51acd6ac18e31e7 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson <rickynils@gmail.com> Date: Tue, 9 Oct 2012 22:53:38 +0200 Subject: [PATCH 111/155] 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 4d3b1a12b62b..15d7042e7dd8 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 = [ From b949359a140df37586a29b9f8f1d0ffe1bd91c0d Mon Sep 17 00:00:00 2001 From: Mathijs Kwik <mathijs@bluescreen303.nl> Date: Wed, 10 Oct 2012 00:20:16 +0200 Subject: [PATCH 112/155] 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 3b0c1de13cbf..5ba86bc6dc17 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 { }; From abf60bdb08e509dda5e95ce13f606e7586dacdfc Mon Sep 17 00:00:00 2001 From: James Cook <jcook@cs.berkeley.edu> Date: Tue, 9 Oct 2012 23:18:50 -0700 Subject: [PATCH 113/155] 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 e2ba47abb9a0..f6173fcf5f53 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 = From e74916ed629a57f0255cfd7827ac80e7bc014bda Mon Sep 17 00:00:00 2001 From: Rickard Nilsson <rickynils@gmail.com> Date: Wed, 10 Oct 2012 16:05:37 +0200 Subject: [PATCH 114/155] 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 cf4f81ea4072..e3932744286c 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 From b8471def244a0d325d9e9c8dbb45c41b7819a461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name> Date: Wed, 10 Oct 2012 16:36:31 +0200 Subject: [PATCH 115/155] 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 000000000000..d9ad100f3180 --- /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 5ba86bc6dc17..9eb0db98df70 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 { From c35a43315c20708ce79f1e306160e8e90e4cbe75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 9 Oct 2012 16:14:29 -0400 Subject: [PATCH 116/155] 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 9eb0db98df70..504e64523944 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 { }; From a352796e0d83902559614e3abb3a9159d9b7ec49 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 10 Oct 2012 19:24:37 +0200 Subject: [PATCH 117/155] 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 000000000000..e3dfd4711a17 --- /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 504e64523944..1befce294151 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 { }; From 8f662e0663c5f96f7a132523b7a43b9f95d52bc3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 10 Oct 2012 19:25:10 +0200 Subject: [PATCH 118/155] 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 ddd0860ccd19..277393283abb 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"; } From 64556b022b61ce4666722aede6f640aa56970bb9 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 10 Oct 2012 19:25:42 +0200 Subject: [PATCH 119/155] 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 388e65c9f753..820b4fb2979a 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"; From 6ef73f57c308cb11a98f2d56bee46e491a4e87a4 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 10 Oct 2012 19:26:02 +0200 Subject: [PATCH 120/155] 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 b79e92b52370..2f93f18ade59 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"; From 537fa309b5ddcd1591e5d7729a34d213f2780d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Wed, 10 Oct 2012 23:17:35 +0200 Subject: [PATCH 121/155] 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 6e68e3d9da8c..000000000000 --- 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 1befce294151..dd60798ec970 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 { }; From bc4d201478bce1ef125536a946ab7b2bee40f6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <goibhniu@fsfe.org> Date: Thu, 11 Oct 2012 01:23:10 +0200 Subject: [PATCH 122/155] 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 b51c97a6d687..7a1d24844b6a 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; { From ebd2b0e1ab5f9b7eff598ec3784bef2be7efddff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Wed, 10 Oct 2012 21:51:19 -0400 Subject: [PATCH 123/155] 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 2f36792d3536..47048509905a 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; From 7b40d67d618ab80200380d8c219bae519c289155 Mon Sep 17 00:00:00 2001 From: Marc Weber <marco-oweber@gmx.de> Date: Thu, 11 Oct 2012 06:11:49 +0200 Subject: [PATCH 124/155] 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 000000000000..529eacd377ed --- /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 504e64523944..1b9eca5e07cd 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 { }; /* 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 125/155] Use newly-added taskwarrior as an update to existing taskwarrior attribute --- .../applications/misc/taskwarrior/default.nix | 35 ++++++++----------- pkgs/tools/misc/task/default.nix | 22 ------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 14 insertions(+), 45 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 95f9de2f42b8..dbb3c3f6a4ed 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"; - - src = fetchurl { - url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz; - sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq"; - }; - - NIX_LDFLAGS = "-ldl"; - - buildNativeInputs = [ cmake ]; - buildInputs = [ lua5 ]; - - crossAttrs = { - preConfigure = '' - export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl" - ''; - }; + name = "taskwarrior-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 = "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 529eacd377ed..000000000000 --- 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 8f855a2ab34d..caedbfdb783f 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 { }; /* From 8e8143262b11396834371e133aee7b121652d7d6 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 09:53:33 +0200 Subject: [PATCH 126/155] 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 000000000000..af6778ccd141 --- /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 96ff9d0960f1..d6b2f4491c46 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 {}; From 5b2191bf2217816489ca2b50aac43f91e1215284 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 09:53:45 +0200 Subject: [PATCH 127/155] 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 000000000000..7acc89d6a91c --- /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 d6b2f4491c46..44bb7aef8c77 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 {}; From 182c28ba4a7565d30942575d00047514e2b6bb2f Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 128/155] 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 3275db0e0d8b..bb3e335eafad 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; From 101cc0bde5f9cf09b62caf35c2fe81de9b17c360 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 129/155] 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 e1a5fc10a42b..d5b45960cb97 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"; From 0d6432e26c3920005096e3ce7eb35c90b3b324c4 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:48 +0200 Subject: [PATCH 130/155] 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 54b6b20dc836..64f03d4dccae 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 From 86750b45675842cd3c674711160e7611235bd167 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 131/155] 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 25f063c20acf..2b3adde1d728 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"; From 4a383ed6c70c83154e838bdef13d057f26ca4e08 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 132/155] 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 f885b9a53134..ea2495f6586a 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"; From 09aef77b4ea6313c7c805d5ac2a85a8e3ad34a4a Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 133/155] 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 44ba8ba15ee5..d87f4fe239e9 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/"; From 6f4063686ea48296e2e4a7e73eafcce9dbd664d1 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 134/155] 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 795d8c1d674e..106b85917782 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 From 000791e74a511f862081aff90ab27304c88f0aba Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 135/155] 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 3e094e0c6b1a..9a1d45c40f13 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"; From 5f8a0e285a942a32616e5440c8d1d19ea58ec020 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 136/155] 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 45f65e932c00..3b86b0699ca4 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"; From b7cc6df1de045e30d80cac852156551518e20fc3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 137/155] 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 8b57b3d7e968..b37ab7e5d4cd 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"; From fca72874915ac187e202d50416269f619d0a712b Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 138/155] 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 b410b36ea569..449debe0405e 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"; From 864924a65df91939fd9096d814b980a2ff32a40c Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 139/155] 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 efbd56cbe6ad..95e051a3eec1 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"; From 7d22f8d91ba84df601b88f7d25f844c1d418fbd3 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:49 +0200 Subject: [PATCH 140/155] 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 a39442aef07d..16df3f347563 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/"; From 4b9b535b74fe4e7a93c7388d938a677fbc40a468 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 141/155] 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 c17b8e50e616..7f8dc8780243 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"; From c30dc2231e1a5ce65b365386c48ef23be5baf2aa Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 142/155] 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 83e149391c52..1676de1e8404 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"; From 4db1166d011d92ec2a1b668c54feca3c4c32eda7 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 143/155] 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 7c460681fcbd..bc70d14ddf91 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 From 2112958f8a957d3d6d343963090e955d7d3b94ca Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 144/155] 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 c4c2bfc4a694..0f4764c3e0ef 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"; From d330da6f54714d26b9e99a10bc897db6c7152758 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 145/155] 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 ec7b78fe6fdb..765724e00d45 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"; From a47d1d856908737fa36ecabfebf238d1d6205420 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Thu, 11 Oct 2012 10:18:50 +0200 Subject: [PATCH 146/155] 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 87723df26c3d..061e3261d2a7 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"; From b8e30a8af6e1626a351f12f9736f5f1d7d9d7918 Mon Sep 17 00:00:00 2001 From: Sander van der Burg <svanderburg@gmail.com> Date: Thu, 11 Oct 2012 10:31:42 +0200 Subject: [PATCH 147/155] 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 dccc92a91f51..f1fd9adbe86a 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 From 018068d7c5657b37a61f092936007c0a89134ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org> Date: Thu, 11 Oct 2012 12:02:46 +0200 Subject: [PATCH 148/155] 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 7952c73f48c9..08c53182dd5d 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 = From 702aec188157461c4bf410f0b1709a692e68fc5c Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Thu, 11 Oct 2012 10:54:24 +0200 Subject: [PATCH 149/155] 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 <aszlig@redmoonstudios.org> --- 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 1ea854c5e9df..acfb43e7caaa 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; From 50faa2cbef570f1f9a637f203d4786f95b5a734c Mon Sep 17 00:00:00 2001 From: aszlig <aszlig@redmoonstudios.org> Date: Thu, 11 Oct 2012 12:42:08 +0200 Subject: [PATCH 150/155] 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 <aszlig@redmoonstudios.org> --- .../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 8dd406e5ea4f..dbb0de72f30c 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"; }; } From 21e59f4a5fe6e4c6719c8cf6802e8de71f6d853a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf <flo@chaoflow.net> Date: Thu, 11 Oct 2012 14:22:26 +0200 Subject: [PATCH 151/155] 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 f511b64ceda3..d0a2bd420d43 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]; From fa27534ec6be24f3b165dd47959cff46fe03ce8a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 11 Oct 2012 11:05:33 -0400 Subject: [PATCH 152/155] 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 d0a2bd420d43..387e89647053 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]; }; From 2fa1b38853fc3c9eba02f47bf2d7031bf93e6f34 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 11 Oct 2012 12:33:28 -0400 Subject: [PATCH 153/155] 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 36d341af5e65..5abef22395e0 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 000000000000..508fd0ec0749 --- /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); + } + } + From bf5967e77e9c4cfc69501cc12a626cb5c6f22537 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 11 Oct 2012 12:33:47 -0400 Subject: [PATCH 154/155] 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 5abef22395e0..2219d82138f4 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"; From e117d037e39ac185327cf86282331185f19268c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 11 Oct 2012 15:38:54 -0400 Subject: [PATCH 155/155] 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 cc5339ba9000..c97c7416de1e 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 db4]; + buildInputs = [ db4 iptables ]; + buildNativeInputs = [ bison flex pkgconfig ]; + + enableParallelBuilding = true; + + # 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 ]; }; }