From 68c9d127ed38ddae32f94f6d404bc13d96d3a93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Jan 2010 16:31:52 +0000 Subject: [PATCH 01/63] Updating mldonkey, and adding more build-type add-ons. svn path=/nixpkgs/trunk/; revision=19486 --- .../applications/networking/p2p/mldonkey/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 6e950df0a75e..d52e1ab37068 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, ocaml, zlib, ncurses}: +{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: stdenv.mkDerivation { - name = "mldonkey-3.0.0"; + name = "mldonkey-3.0.1"; src = fetchurl { - url = mirror://sourceforge/mldonkey/mldonkey-3.0.0.tar.bz2; - sha256 = "0zzvcfnbhxk8axfch5fbkd9j2ks67nbb1ndjjarxvrza78g5y8r7"; + url = "mirror://sourceforge/mldonkey/mldonkey-3.0.1.tar.bz2"; + sha256 = "09zk53rfdkjipf5sl37rypzi2mx0a5v57vsndj22zajkqr4l0zds"; }; meta = { @@ -13,6 +13,6 @@ stdenv.mkDerivation { homepage = http://mldonkey.sourceforge.net/; }; - buildInputs = [ ocaml zlib ncurses ]; - configureFlags = "--disable-gd --disable-gui"; + buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; + configureFlags = [ "--disable-gui" "--enable-ocamlver=3.11.1" ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 937bb1196013..5b04dcd3f2ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1032,7 +1032,7 @@ let }; mldonkey = import ../applications/networking/p2p/mldonkey { - inherit fetchurl stdenv ocaml zlib ncurses; + inherit fetchurl stdenv ocaml zlib bzip2 ncurses file gd libpng; }; monit = builderDefsPackage ../tools/system/monit { From 063ef1925db4d33f435ed92e1f175f88898c341e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Jan 2010 20:13:20 +0000 Subject: [PATCH 02/63] Adding digikam and kipi-plugins for kde4. svn path=/nixpkgs/trunk/; revision=19488 --- .../applications/graphics/digikam/default.nix | 25 +++++++++++++++++++ pkgs/desktops/kde-4.3/default.nix | 12 +++++++++ .../extragear/kipi-plugins/default.nix | 23 +++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 4 files changed, 66 insertions(+) create mode 100644 pkgs/applications/graphics/digikam/default.nix create mode 100644 pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix new file mode 100644 index 000000000000..907c5ca3e225 --- /dev/null +++ b/pkgs/applications/graphics/digikam/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl, kdelibs, exiv2, libXt, libXext, zlib, libjpeg, perl, qt3, + libpng, expat, cmake }: + +stdenv.mkDerivation { + name = "digikam-1.0.0"; + + src = fetchurl { + url = mirror://sourceforge/digikam/digikam-1.0.0.tar.bz2; + sha256 = "0qblqyjn0vas8hyqn5s9rr401d93cagk53y3j8kch0mr0bk706bk"; + }; + +/* + configurePhase = '' + LDFLAGS="$LDFLAGS -ljpeg" ./configure --without-arts --prefix=$out + ''; +*/ + + buildInputs = [ kdelibs exiv2 libXt libXext zlib libjpeg perl qt3 libpng expat cmake ]; + + meta = { + homepage = http://digikam.sourceforge.net/; + description = "KDE 3.x photo viewer"; + # license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 9a3968fe7807..4aac5eafd9fe 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -218,6 +218,12 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon strigi soprano qca2; }; + digikam = import ./extragear/digikam { + inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext; + inherit kdelibs kdepimlibs kdegraphics; + inherit automoc4 phonon qimageblitz qca2 eigen; + }; + filelight = import ./extragear/filelight { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl; inherit kdelibs kdebase_workspace; @@ -229,6 +235,12 @@ pkgs.recurseIntoAttrs (rec { inherit kdelibs; inherit automoc4 phonon; }; + + kipiplugins = import ./extragear/kipi-plugins { + inherit (pkgs) stdenv fetchurl lib cmake qt4 libxml2 libxslt gettext; + inherit kdelibs kdepimlibs kdegraphics; + inherit automoc4 phonon qimageblitz qca2; + }; kmplayer = import ./extragear/kmplayer { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext dbus_glib; diff --git a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix new file mode 100644 index 000000000000..c77a06e9b85f --- /dev/null +++ b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, +kdegraphics, kdepimlibs, libxml2, libxslt, gettext}: + +stdenv.mkDerivation { + name = "kipi-plugins-0.9.0"; + + src = fetchurl { + url = mirror://sourceforge/kipi/kipi-plugins-0.9.0.tar.bz2; + sha256 = "0wx1r607q8i4v55k8qjzz7wn8rfd86nniq3h3s7dgnddq7x17fqn"; + }; + + includeAllQtDirs=true; + buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs + libxml2 libxslt gettext ]; + CMAKE_PREFIX_PATH = kdepimlibs; + cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.koffice.org; + maintainers = [ lib.maintainers.viric ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b04dcd3f2ee..aedd867589e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6605,6 +6605,12 @@ let inherit (gtkLibs) gtk glib; }; + digikam = import ../applications/graphics/digikam { + inherit stdenv fetchurl exiv2 zlib libjpeg perl libpng expat qt3 cmake; + inherit (kde3) kdelibs; + inherit (xlibs) libXt libXext; + }; + djvulibre = import ../applications/misc/djvulibre { inherit stdenv fetchurl libjpeg libtiff libungif zlib ghostscript libpng x11 mesa; From 1743ba3ba81a6a21e0febe3cb8db1e00665eabe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Jan 2010 21:07:32 +0000 Subject: [PATCH 03/63] Adding the digikam I forgot before. Enabling in it and kipi-plugins 'platforms' for hydra to build them. svn path=/nixpkgs/trunk/; revision=19490 --- .../kde-4.3/extragear/digikam/default.nix | 24 +++++++++++++++++++ .../extragear/kipi-plugins/default.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/desktops/kde-4.3/extragear/digikam/default.nix diff --git a/pkgs/desktops/kde-4.3/extragear/digikam/default.nix b/pkgs/desktops/kde-4.3/extragear/digikam/default.nix new file mode 100644 index 000000000000..abf78cd9c62c --- /dev/null +++ b/pkgs/desktops/kde-4.3/extragear/digikam/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}: + +stdenv.mkDerivation { + name = "digikam-1.0.0"; + + src = fetchurl { + url = mirror://sourceforge/digikam/digikam-1.0.0.tar.bz2; + sha256 = "0qblqyjn0vas8hyqn5s9rr401d93cagk53y3j8kch0mr0bk706bk"; + }; + + includeAllQtDirs=true; + buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen + lcms jasper libgphoto2 kdepimlibs gettext ]; + CMAKE_PREFIX_PATH = kdepimlibs; + cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.koffice.org; + maintainers = [ lib.maintainers.viric ]; + platforms = with lib.platforms; linux; + }; +} diff --git a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix index c77a06e9b85f..e4930c1c704d 100644 --- a/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix +++ b/pkgs/desktops/kde-4.3/extragear/kipi-plugins/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = "GPL"; homepage = http://www.koffice.org; maintainers = [ lib.maintainers.viric ]; + platforms = with lib.platforms; linux; }; } From 9b5743ceac1b2dd8e8b2ce35d07eddace201ddc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 16 Jan 2010 23:40:30 +0000 Subject: [PATCH 04/63] Adding kerberos into kdelibs (I think this may enable konqueror browse https) svn path=/nixpkgs/trunk/; revision=19495 --- pkgs/desktops/kde-4.3/default.nix | 3 ++- pkgs/desktops/kde-4.3/libs/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 4aac5eafd9fe..3298408c5bab 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -56,7 +56,8 @@ pkgs.recurseIntoAttrs (rec { ### LIBS kdelibs = import ./libs { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt; - inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info; + inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info + kerberos; inherit automoc4 phonon strigi soprano; }; diff --git a/pkgs/desktops/kde-4.3/libs/default.nix b/pkgs/desktops/kde-4.3/libs/default.nix index a9ee9ef19aac..3f5f2d5ab50a 100644 --- a/pkgs/desktops/kde-4.3/libs/default.nix +++ b/pkgs/desktops/kde-4.3/libs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, lib, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, flex, bison, openexr, aspell, avahi +, xz, flex, bison, openexr, aspell, avahi, kerberos , automoc4, phonon, strigi, soprano }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt - shared_mime_info giflib jasper /* openexr */ aspell avahi + shared_mime_info giflib jasper /* openexr */ aspell avahi kerberos automoc4 phonon strigi soprano ]; From 87e357c1673b39377967a79a6fee9c6b00317d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Jan 2010 00:15:22 +0000 Subject: [PATCH 05/63] Enabling ACLs in kdelibs. Not in the cleanest way, but I wrote a comment about the hack. svn path=/nixpkgs/trunk/; revision=19496 --- pkgs/desktops/kde-4.3/default.nix | 2 +- pkgs/desktops/kde-4.3/libs/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index 3298408c5bab..48ba9fc65a32 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -57,7 +57,7 @@ pkgs.recurseIntoAttrs (rec { kdelibs = import ./libs { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt; inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info - kerberos; + kerberos acl attr; inherit automoc4 phonon strigi soprano; }; diff --git a/pkgs/desktops/kde-4.3/libs/default.nix b/pkgs/desktops/kde-4.3/libs/default.nix index 3f5f2d5ab50a..c37bda037128 100644 --- a/pkgs/desktops/kde-4.3/libs/default.nix +++ b/pkgs/desktops/kde-4.3/libs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, lib, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, flex, bison, openexr, aspell, avahi, kerberos +, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr , automoc4, phonon, strigi, soprano }: @@ -16,9 +16,12 @@ stdenv.mkDerivation { buildInputs = [ cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt - shared_mime_info giflib jasper /* openexr */ aspell avahi kerberos + shared_mime_info giflib jasper /* openexr */ aspell avahi kerberos acl attr automoc4 phonon strigi soprano ]; + + # I don't know why cmake does not find the acl files (but finds attr files) + cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ]; meta = { description = "KDE libraries"; From 2ab641c39ed77d00be6032f71872f2dd0cffdf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Jan 2010 00:46:57 +0000 Subject: [PATCH 06/63] Adding libiptcdata. I'm attempting to build rawtherapee, but it wants the propietary library 'rawzor'. Maybe upstream someone will allow building without it some day. Until then, no rawtherapee. svn path=/nixpkgs/trunk/; revision=19497 --- .../libraries/libiptcdata/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/libiptcdata/default.nix diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix new file mode 100644 index 000000000000..1094a4e75919 --- /dev/null +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "libiptcdata-1.0.4"; + + src = fetchurl { + url = "mirror://sourceforge/libiptcdata/${name}.tar.gz"; + sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr"; + }; + + meta = { + description = "Library for reading and writing the IPTC metadata in images and other files"; + homepage = http://libiptcdata.sourceforge.net/; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aedd867589e8..1cb9dd43cd81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4011,6 +4011,10 @@ let inherit fetchurl stdenv pkgconfig libraw1394; }; + libiptcdata = import ../development/libraries/libiptcdata { + inherit fetchurl stdenv; + }; + libjingle = import ../development/libraries/libjingle/0.3.11.nix { inherit fetchurl stdenv mediastreamer; }; From b207890b819eb31de395e4dce5e4c77e130cd9a1 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 17 Jan 2010 01:39:29 +0000 Subject: [PATCH 07/63] applications/misc/epdfview: New package. svn path=/nixpkgs/trunk/; revision=19498 --- pkgs/applications/misc/epdfview/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/epdfview/default.nix diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix new file mode 100644 index 000000000000..4d88096d0423 --- /dev/null +++ b/pkgs/applications/misc/epdfview/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, gtk, poppler }: +stdenv.mkDerivation rec { + name = "epdfview-0.1.7"; + src = fetchurl { + url = "http://trac.emma-soft.com/epdfview/chrome/site/releases/${name}.tar.bz2"; + sha256 = "1s2af09ij5jjqryv4dl10flsdk5p953qp94dymn93fnl93rv1yqa"; + }; + buildInputs = [ pkgconfig gtk poppler ]; + meta = { + homepage = http://trac.emma-soft.com/epdfview/; + description = "A lightweight PDF document viewer using Poppler and GTK+"; + longDescription = '' + ePDFView is a free lightweight PDF document viewer using Poppler and + GTK+ libraries. The aim of ePDFView is to make a simple PDF document + viewer, in the lines of Evince but without using the Gnome libraries. + ''; + license = "GPLv2"; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cb9dd43cd81..2a7bc0d4e928 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6786,6 +6786,11 @@ let emacs22Packages = emacsPackages emacs22; emacs23Packages = emacsPackages emacs23; + epdfview = import ../applications/misc/epdfview { + inherit stdenv fetchurl pkgconfig poppler; + inherit (gtkLibs) gtk; + }; + evince = makeOverridable (import ../applications/misc/evince) { inherit fetchurl stdenv perl perlXMLParser gettext intltool pkgconfig poppler libspectre djvulibre libxslt From 5c8a2bf152afb234ba10af2913068fa320b133f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Jan 2010 14:01:47 +0000 Subject: [PATCH 08/63] Add openssl to qt 4.5, for all the kde https communications to work. svn path=/nixpkgs/trunk/; revision=19499 --- pkgs/development/libraries/qt-4.5/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/qt-4.5/default.nix b/pkgs/development/libraries/qt-4.5/default.nix index e19edae3bdbc..d7d69a3fa8e5 100644 --- a/pkgs/development/libraries/qt-4.5/default.nix +++ b/pkgs/development/libraries/qt-4.5/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation { libtiff ]; + # libQtNetwork will call libQtCore for it to dlopen openssl. + NIX_LDFLAGS = "-rpath ${openssl}/lib"; + # Don't shrink the rpath, to keep ${openssl} in it. + dontPatchELF = 1; + prefixKey = "-prefix "; configureFlags = '' From 47735a06c3739fd6eac11f0157b69edaf2d6434a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 17 Jan 2010 17:49:35 +0000 Subject: [PATCH 09/63] Adding rawtherapee svn r25 svn path=/nixpkgs/trunk/; revision=19500 --- .../graphics/rawtherapee/default.nix | 41 +++++++++ .../rawtherapee/optional-rawzor.patch | 83 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++ 3 files changed, 131 insertions(+) create mode 100644 pkgs/applications/graphics/rawtherapee/default.nix create mode 100644 pkgs/applications/graphics/rawtherapee/optional-rawzor.patch diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix new file mode 100644 index 000000000000..eda187cbf235 --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchsvn, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau, +libXdmcp, lcms, libiptcdata +}: + +stdenv.mkDerivation rec { + name = "rawtherapee-svn-25"; + + src = fetchsvn { + url = "http://rawtherapee.googlecode.com/svn/trunk"; + rev = 25; + sha256 = "09jg47rs09lly70x1zlrb3qcwi2rry1m7gjzs39iqzp53hi9j9mh"; + }; + + buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp + lcms libiptcdata ]; + + # Rawtherapee died if the default setting for the icc directory pointed to a + # non existant place + patchPhase = '' + sed -i s,/usr/share/color/icc,/tmp/, rtgui/options.cc + ''; + + # Disable the use of the RAWZOR propietary libraries + cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; + + installPhase = '' + ensureDir $out/bin $out/lib + cp rtgui/rt $out/bin + # Weird kind of path reference + cp -r ../release/* $out/bin + cp rtengine/*.so $out/lib + ''; + + meta = { + description = "RAW converter and digital photo processing software"; + homepage = http://www.rawtherapee.com/; + license = "GPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch b/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch new file mode 100644 index 000000000000..bc0210803a1b --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/optional-rawzor.patch @@ -0,0 +1,83 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,7 @@ + cmake_minimum_required(VERSION 2.6) + ++option (WITH_RAWZOR "Build with Rawzor support" ON) ++ + add_subdirectory (rtexif) + add_subdirectory (rtengine) + add_subdirectory (rtgui) +--- a/rtengine/CMakeLists.txt ++++ b/rtengine/CMakeLists.txt +@@ -9,9 +9,13 @@ + IF (WIN32) + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../lib; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../winclude; ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win") +- SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a") ++ SET (EXTRA_LIB "ws2_32 ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libiptcdata.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libjpeg.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libpng.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libtiff.a ${CMAKE_CURRENT_SOURCE_DIR}/../lib/libz.a") ++ if (WITH_RAWZOR) + ADD_DEFINITIONS (-DRAWZOR_SUPPORT) ++ SET (EXTRA_LIB "${EXTRA_LIB} ${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_win/rwz_sdk_s.a") ++ endif (WITH_RAWZOR) + ELSE (WIN32) ++ if (WITH_RAWZOR) + IF (CMAKE_SIZEOF_VOID_P EQUAL 4) + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") +@@ -19,10 +23,11 @@ + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") + ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) +- pkg_check_modules (IPTCDATA REQUIRED libiptcdata) +- pkg_check_modules (LCMS REQUIRED lcms) + SET (EXTRA_LIB "-lrwz_sdk") + ADD_DEFINITIONS (-DRAWZOR_SUPPORT) ++ endif (WITH_RAWZOR) ++ pkg_check_modules (IPTCDATA REQUIRED libiptcdata) ++ pkg_check_modules (LCMS REQUIRED lcms) + ENDIF (WIN32) + + include_directories (${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS}) +--- a/rtengine/imagedata.cc ++++ b/rtengine/imagedata.cc +@@ -19,7 +19,9 @@ + #include + #include + #include ++#ifdef RAWZOR_SUPPORT + #include ++#endif + + using namespace rtengine; + +--- a/rtengine/myfile.cc ++++ b/rtengine/myfile.cc +@@ -19,7 +19,9 @@ + #include + #include + #include ++#ifdef RAWZOR_SUPPORT + #include ++#endif + + IMFILE* fopen (const char* fname) { + +--- a/rtgui/CMakeLists.txt ++++ b/rtgui/CMakeLists.txt +@@ -75,6 +75,7 @@ + if (NOT ZLIB_LIBRARIES) + message(SEND_ERROR "libz was not found!") + endif (NOT ZLIB_LIBRARIES) ++ if (WITH_RAWZOR) + IF (CMAKE_SIZEOF_VOID_P EQUAL 4) + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin32") +@@ -82,6 +83,7 @@ + SET (EXTRA_INCDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") + SET (EXTRA_LIBDIR "${CMAKE_CURRENT_SOURCE_DIR}/../rawzor_lin64") + ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 4) ++ endif (WITH_RAWZOR) + + include_directories (/usr/local/lib ${CMAKE_CURRENT_SOURCE_DIR}/../rtengine . ${CMAKE_CURRENT_SOURCE_DIR}/../rtexif ${EXTRA_INCDIR} ${GLIB2_INCLUDE_DIRS} ${GLIBMM_INCLUDE_DIRS} + ${GTK_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} ${GIO_INCLUDE_DIRS} ${GIOMM_INCLUDE_DIRS} ${IPTCDATA_INCLUDE_DIRS} ${LCMS_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS} ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a7bc0d4e928..9fcdf299be71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7542,6 +7542,13 @@ let libXtst xextproto libXi; }; + rawtherapee = import ../applications/graphics/rawtherapee { + inherit fetchsvn pkgconfig cmake lcms libiptcdata; + inherit (gtkLibs) gtk gtkmm; + inherit (xlibs) libXau libXdmcp pixman libpthreadstubs; + stdenv = overrideGCC stdenv gcc43_wrapper2; + }; + rcs = import ../applications/version-management/rcs { inherit fetchurl stdenv; }; From fe20c0ad38dc6f24571366de43ebf40cd8adbb9c Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 17 Jan 2010 20:12:04 +0000 Subject: [PATCH 10/63] add patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526164 svn path=/nixpkgs/trunk/; revision=19501 --- pkgs/desktops/kde-4.3/extragear/krusader/default.nix | 1 + .../kde-4.3/extragear/krusader/krusader-gcc44.patch | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch diff --git a/pkgs/desktops/kde-4.3/extragear/krusader/default.nix b/pkgs/desktops/kde-4.3/extragear/krusader/default.nix index 773f741bb7ab..7b2926fd2221 100644 --- a/pkgs/desktops/kde-4.3/extragear/krusader/default.nix +++ b/pkgs/desktops/kde-4.3/extragear/krusader/default.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { }; includeAllQtDirs=true; buildInputs = [ cmake qt4 perl gettext kdelibs automoc4 phonon ]; + patches = [./krusader-gcc44.patch]; meta = { description = "Norton/Total Commander clone for KDE"; license = "GPL"; diff --git a/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch b/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch new file mode 100644 index 000000000000..5be350bc9494 --- /dev/null +++ b/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch @@ -0,0 +1,10 @@ +--- krusader/VFS/kiojobwrapper.cpp~ 2009-04-29 17:13:43.000000000 +0000 ++++ krusader/VFS/kiojobwrapper.cpp 2009-04-29 17:14:01.000000000 +0000 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include + #include + #include "virtualcopyjob.h" From 53abbeb8e79a00b25f8b44841d904a721011d78e Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 17 Jan 2010 20:19:47 +0000 Subject: [PATCH 11/63] fix path for patch svn path=/nixpkgs/trunk/; revision=19502 --- pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch b/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch index 5be350bc9494..f8840d5f33c6 100644 --- a/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch +++ b/pkgs/desktops/kde-4.3/extragear/krusader/krusader-gcc44.patch @@ -1,5 +1,5 @@ ---- krusader/VFS/kiojobwrapper.cpp~ 2009-04-29 17:13:43.000000000 +0000 -+++ krusader/VFS/kiojobwrapper.cpp 2009-04-29 17:14:01.000000000 +0000 +--- krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp~ 2009-04-29 17:13:43.000000000 +0000 ++++ krusader-2.0.0/krusader/VFS/kiojobwrapper.cpp 2009-04-29 17:14:01.000000000 +0000 @@ -37,6 +37,7 @@ #include #include From cfcadb5967da7fe83f905d45055e7867a992926c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 17 Jan 2010 23:38:12 +0000 Subject: [PATCH 12/63] Montone update svn path=/nixpkgs/trunk/; revision=19512 --- pkgs/applications/version-management/monotone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 263c6f139071..061f4bef3d51 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -2,13 +2,13 @@ lua, pcre, sqlite, perl, lib}: let - version = "0.45"; + version = "0.46"; in stdenv.mkDerivation rec { name = "monotone-${version}"; inherit perl; src = fetchurl { url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.gz"; - sha256 = "64c734274715f392eb4a879172a11c0606d37c02b4a6f23045772af5f8e2a9ec"; + sha256 = "1pla2fvkmfbrzfbdqd2jjghldpxl9iq81pwwkwaxa7n57snbvq61"; }; buildInputs = [boost zlib botan libidn lua pcre sqlite]; preConfigure = '' From ba79b385030e69019d52e6da12ea6c23fff68dfd Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Mon, 18 Jan 2010 08:28:38 +0000 Subject: [PATCH 13/63] nix-prefetch-git: * Optimized download size in case of references. * Add support for submodules. svn path=/nixpkgs/trunk/; revision=19513 --- pkgs/build-support/fetchgit/nix-prefetch-git | 114 +++++++++++++++++-- 1 file changed, 106 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 9f2eb4b3a4c0..9207b84ddec1 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -24,6 +24,96 @@ if test -n "$expHash"; then hash=$expHash fi +init_remote(){ + local url=$1; + git init; + git remote add origin $url; +} + +# Return the reference of an hash if it exists on the remote repository. +ref_from_hash(){ + local hash=$1; + git ls-remote origin | sed -n "\,$hash\t, { s,\(.*\)\t\(.*\),\2,; p; q}" +} + +# Return the hash of a reference if it exists on the remote repository. +hash_from_ref(){ + local ref=$1 + git ls-remote origin | sed -n "\,\t$ref, { s,\(.*\)\t\(.*\),\1,; p; q}" +} + +# Fetch everything and checkout the right sha1 +checkout_hash(){ + local hash="$1"; + local ref="$2"; + + if test -z "$hash"; then + hash=$(hash_from_ref $ref); + fi; + + git fetch origin || return 1 + git checkout $hash || return 1 +} + +# Fetch only a branch/tag and checkout it. +checkout_ref(){ + local hash="$1"; + local ref="$2"; + + if test -z "$ref"; then + ref=$(ref_from_hash $hash); + fi; + + if test -n "$ref"; then + # --depth option is ignored on http repository. + git fetch --depth 1 origin +"$ref" || return 1 + git checkout FETCH_HEAD || return 1 + else + return 1; + fi; +} + +# Update submodules +init_submodules(){ + # Add urls into .git/config file + git submodule init + + # list submodule directories and their hashes + git submodule status | + while read l; do + # checkout each submodule + local hash=$(echo $l | sed 's,^-\([0-9a-f]*\) \(.*\)$,\1,'); + local dir=$(echo $l | sed 's,^-\([0-9a-f]*\) \(.*\)$,\2,'); + local url=$(sed -n "\,$dir, { :loop; n; s,^.*url = ,,; T loop; p; q }" .git/config); + + clone "$dir" "$url" "$hash" ""; + done; +} + +clone(){ + local top=$(pwd) + local dir="$1" + local url="$2" + local hash="$3" + local ref="$4" + + cd $dir; + + # Initialize the repository. + init_remote "$url"; + + # Download data from the repository. + checkout_ref "$hash" "$ref" || + checkout_hash "$hash" "$ref" || ( + echo 1>&2 "Unable to checkout $hash$ref from $url."; + exit 1; + ) + + # Checkout linked sources. + init_submodules; + + cd $top; +} # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. @@ -31,23 +121,31 @@ if test -z "$finalPath"; then tmpPath=/tmp/git-checkout-tmp-$$ tmpFile=$tmpPath/git-export - mkdir $tmpPath + mkdir $tmpPath $tmpFile trap "rm -rf $tmpPath" EXIT # Perform the checkout. - git clone "$url" $tmpFile 1>&2 - if test -n "$rev"; then - cd $tmpFile - echo $tmpFile >&2 - git checkout $rev 1>&2 - fi + case "$rev" in + HEAD|refs/*) + clone "$tmpFile" "$url" "" "$rev" 1>&2;; + [0-9a-f]*) + if test -z "$(echo $rev | tr -d 0123456789abcdef)"; then + clone "$tmpFile" "$url" "$rev" "" 1>&2; + else + echo 1>&2 "Bad commit hash or bad reference."; + exit 1; + fi;; + "") + clone "$tmpFile" "$url" "" "HEAD" 1>&2;; + esac + # Allow doing additional processing before .git removal eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" if test "$NIX_PREFETCH_GIT_LEAVE_DOT_GIT" != 1 then echo "removing \`.git'..." >&2 - rm -rf .git + rm -rf $tmpFile/.git fi # Compute the hash. From 7c7f9b63adde97cfa29b4cc55d9c9721b6717b50 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Jan 2010 10:19:11 +0000 Subject: [PATCH 14/63] * kbd 1.15.1. svn path=/nixpkgs/trunk/; revision=19514 --- pkgs/os-specific/linux/kbd/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index b7dd81c03785..39d14b569f2f 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,14 +1,22 @@ -{stdenv, fetchurl, bison, flex}: +{ stdenv, fetchurl, bison, flex, autoconf, automake }: stdenv.mkDerivation rec { - name = "kbd-1.15"; + name = "kbd-1.15.1"; src = fetchurl { url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz"; - sha256 = "1h2klv4sxf0j08fzlpki2zf7f4k7m0j1d0ca01a1bsd8yza0l39d"; + sha256 = "1klrxas8vjikx6jm6m2lcpmn88lhxb6p3whwgdwq9d9flf1qrf4i"; }; - buildInputs = [bison flex]; + buildInputs = [ bison flex autoconf automake ]; + + # Grrr, kbd 1.15.1 doesn't include a configure script. + preConfigure = "autoreconf"; makeFlags = "setowner= "; + + meta = { + homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; + description = "Linux keyboard utilities and keyboard maps"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fcdf299be71..18202421daf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5531,7 +5531,7 @@ let }; kbd = import ../os-specific/linux/kbd { - inherit fetchurl stdenv bison flex; + inherit fetchurl stdenv bison flex autoconf automake; }; kernelHeaders = kernelHeaders_2_6_28; From 0ca38abd826852c479d3e268d2563b6fdc1036e8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 18 Jan 2010 10:37:37 +0000 Subject: [PATCH 15/63] PadWalker perl module for easier debugging of perl svn path=/nixpkgs/trunk/; revision=19515 --- pkgs/top-level/perl-packages.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ecc056d90172..b4b166092900 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1852,6 +1852,14 @@ rec { propagatedBuildInputs = [UNIVERSALrequire]; }; + PadWalker = buildPerlPackage rec { + name = "PadWalker-1.9"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RO/ROBIN/${name}.tar.gz"; + sha256 = "0lvh0qlyrpnkssqkhfxhbjpb5lyr4fp6d1p7la8k6w3wv1qmbl1s"; + }; + }; + Perl6Junction = buildPerlPackage rec { name = "Perl6-Junction-1.40000"; src = fetchurl { From 1da5799ce434f9e8cab90ae757253bdededeace5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Jan 2010 13:10:01 +0000 Subject: [PATCH 16/63] * Release notes for Nixpkgs 0.13. svn path=/nixpkgs/trunk/; revision=19518 --- doc/release-notes.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/doc/release-notes.xml b/doc/release-notes.xml index eb870da3a0e3..37cbdd684038 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -5,6 +5,29 @@ Nixpkgs Release Notes +
Release 0.13 (Januari NNN, 2010) + +As always, there are many changes. Some of the most important +updates are: + + + + Glibc 2.9. + + GCC 4.3.3. + + Linux 2.6.32. + + X.org 7.5. + + KDE 4.3.4. + + + + +
+ +
Release 0.12 (April 24, 2009) There are way too many additions to Nixpkgs since the last From 45d18b9b4ad0ac4e8c27dc61538bf75d73356012 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Jan 2010 15:40:23 +0000 Subject: [PATCH 17/63] svn path=/nixpkgs/trunk/; revision=19523 --- pkgs/tools/filesystems/genext2fs/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index d58167ab8473..7f7d956afd2f 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -1,9 +1,15 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "genext2fs-1.4.1"; + src = fetchurl { url = mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; + + meta = { + homepage = http://genext2fs.sourceforge.net/; + description = "A tool to generate ext2 filesystem images without requiring root privileges"; + }; } From b8bb0ce6dddd6eb57b4963d3b222597dc72cc192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Jan 2010 16:07:44 +0000 Subject: [PATCH 18/63] Add `gitFull'. svn path=/nixpkgs/trunk/; revision=19525 --- .../version-management/git-and-tools/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2520a4a49e2d..3a43e4ad8128 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -17,6 +17,17 @@ rec { perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; }; + # The full-featured Git. + gitFull = import ./git { + inherit fetchurl stdenv curl openssl zlib expat perl gettext + asciidoc texinfo xmlto docbook2x + docbook_xsl docbook_xml_dtd_45 libxslt + cpio tcl tk makeWrapper subversion; + svnSupport = true; + guiSupport = true; + perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey subversion]; + }; + gitGit = import ./git/git-git.nix { inherit fetchurl sourceFromHead stdenv curl openssl zlib expat perl gettext asciidoc texinfo xmlto docbook2x diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18202421daf2..877f4605bd84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6952,6 +6952,7 @@ let inherit pkgs; }); git = gitAndTools.git; + gitFull = gitAndTools.gitFull; gnucash = import ../applications/office/gnucash { inherit fetchurl stdenv pkgconfig libxml2 goffice enchant From 88646b77e1ddc8f36a84276700244fee57d37782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Jan 2010 16:07:48 +0000 Subject: [PATCH 19/63] git: Augment `meta' so that `gitFull' gets built by Hydra. svn path=/nixpkgs/trunk/; revision=19526 --- .../version-management/git-and-tools/git/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index babb6aff2206..d4975262d2ea 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = { license = "GPLv2"; - homepage = http://git.or.cz; + homepage = http://git-scm.com/; description = "Git, a popular distributed version control system"; longDescription = '' @@ -110,5 +110,13 @@ stdenv.mkDerivation rec { handle very large projects with speed and efficiency. ''; + license = "GPLv2"; + + maintainers = + [ # Add your name here! + stdenv.lib.maintainers.ludo + ]; + + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } From 5143789a4db0b994539ff2460a8569d5da66fc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Jan 2010 16:49:19 +0000 Subject: [PATCH 20/63] git: Remove extra `meta.license' tag. svn path=/nixpkgs/trunk/; revision=19527 --- .../version-management/git-and-tools/git/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d4975262d2ea..c1435b768085 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -110,8 +110,6 @@ stdenv.mkDerivation rec { handle very large projects with speed and efficiency. ''; - license = "GPLv2"; - maintainers = [ # Add your name here! stdenv.lib.maintainers.ludo From 7eadcd46a00cc9aac1a2b80ce22ae3f4b17e623f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 18 Jan 2010 17:22:58 +0000 Subject: [PATCH 21/63] Build `gitFull'. svn path=/nixpkgs/trunk/; revision=19528 --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index b5eaed5f9a37..80c79cfe98e1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -177,6 +177,7 @@ in { ghostscriptX = linux; gimp = linux; git = linux; + gitFull = linux; glibc = linux; glibcLocales = linux; glxinfo = linux; From ca68ccdaf42a8ba9344be859558af241c8be3ab7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 19 Jan 2010 11:54:04 +0000 Subject: [PATCH 22/63] Update ikiwiki svn path=/nixpkgs/trunk/; revision=19537 --- pkgs/applications/misc/ikiwiki/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 9092c08303c5..bda42123a356 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -6,12 +6,12 @@ , extraUtils ? [] }: -stdenv.mkDerivation { - name = "ikiwiki_3.20091009"; +stdenv.mkDerivation rec { + name = "ikiwiki_3.20100102.3"; src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/ikiwiki_3.20091009.tar.gz; - sha256 = "1iznyiypsnhga71s31782j3rf52fyvxrcys3nfpcr8yg1a5zadpn"; + url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz"; + sha256 = "0vb54z7hwb6iwd0j96vhr8ypzwc8l4hd98wbp5wsxkx5bgc38nsp"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From 81324b5de0a098c2159f4fb6ed7ecfe773435c78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Jan 2010 15:58:19 +0000 Subject: [PATCH 23/63] pkgs/tools/system/ipmitool: command-line interface to IPMI-enabled devices Initial version 1.8.9. svn path=/nixpkgs/trunk/; revision=19542 --- pkgs/tools/system/ipmitool/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 ++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 pkgs/tools/system/ipmitool/default.nix diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix new file mode 100644 index 000000000000..73e8877fc937 --- /dev/null +++ b/pkgs/tools/system/ipmitool/default.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv }: + +let + pkgname = "ipmitool"; + version = "1.8.9"; +in +stdenv.mkDerivation { + name = "${pkgname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz"; + sha256 = "1d6bf2595d1fd0dbef206c300cc666d3d079548ba97f727077d61c4736a7e63a"; + }; + + buildInputs = []; + + meta = { + description = ''Command-line interface to IPMI-enabled devices''; + license = "BSD"; + homepage = "http://ipmitool.sourceforge.net"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 877f4605bd84..a540eadc7e18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -903,6 +903,10 @@ let inherit fetchurl stdenv; }; + ipmitool = import ../tools/system/ipmitool { + inherit fetchurl stdenv; + }; + jdiskreport = import ../tools/misc/jdiskreport { inherit fetchurl stdenv unzip jdk; }; @@ -1678,7 +1682,7 @@ let }; wicd = import ../tools/networking/wicd { - inherit stdenv fetchurl python pygobject pycairo pyGtkGlade pythonDBus + inherit stdenv fetchurl python pygobject pycairo pyGtkGlade pythonDBus wpa_supplicant dhcp wirelesstools nettools iproute; }; @@ -4253,7 +4257,7 @@ let liquidwar = builderDefsPackage ../games/liquidwar { inherit (xlibs) xproto libX11 libXrender; - inherit gmp guile mesa libjpeg libpng + inherit gmp guile mesa libjpeg libpng expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite @@ -8331,7 +8335,7 @@ let ncbiCTools = builderDefsPackage ../development/libraries/ncbi { inherit tcsh mesa lesstif; - inherit (xlibs) libX11 libXaw xproto libXt libSM libICE + inherit (xlibs) libX11 libXaw xproto libXt libSM libICE libXmu libXext; }; @@ -8360,7 +8364,7 @@ let content = builderDefsPackage ../applications/science/math/content { inherit mesa lesstif; - inherit (xlibs) libX11 libXaw xproto libXt libSM libICE + inherit (xlibs) libX11 libXaw xproto libXt libSM libICE libXmu libXext libXcursor; }; From 35424c8836a371040ce0098d32750d4ef3ee05db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 19 Jan 2010 16:21:40 +0000 Subject: [PATCH 24/63] pkgs/tools/system/ipmitool/default.nix: add openssl dependency to enable lanplus protocol svn path=/nixpkgs/trunk/; revision=19543 --- pkgs/tools/system/ipmitool/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 73e8877fc937..87b77a483e38 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, openssl }: let pkgname = "ipmitool"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1d6bf2595d1fd0dbef206c300cc666d3d079548ba97f727077d61c4736a7e63a"; }; - buildInputs = []; + buildInputs = [ openssl ]; meta = { description = ''Command-line interface to IPMI-enabled devices''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a540eadc7e18..8199924acd08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -904,7 +904,7 @@ let }; ipmitool = import ../tools/system/ipmitool { - inherit fetchurl stdenv; + inherit fetchurl stdenv openssl; }; jdiskreport = import ../tools/misc/jdiskreport { From 99a54b362efabfac8696ee12f7cd0576688e9fc9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 20 Jan 2010 05:40:46 +0000 Subject: [PATCH 25/63] Adding ECL svn path=/nixpkgs/trunk/; revision=19555 --- pkgs/development/compilers/ecl/default.nix | 26 +++++++++++++++++++ .../compilers/ecl/src-for-default.nix | 9 +++++++ .../compilers/ecl/src-info-for-default.nix | 5 ++++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/compilers/ecl/default.nix create mode 100644 pkgs/development/compilers/ecl/src-for-default.nix create mode 100644 pkgs/development/compilers/ecl/src-info-for-default.nix diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix new file mode 100644 index 000000000000..2571c09a224b --- /dev/null +++ b/pkgs/development/compilers/ecl/default.nix @@ -0,0 +1,26 @@ +a : +let + s = import ./src-for-default.nix; + buildInputs = with a; [ + gmp mpfr + ]; +in +rec { + src = a.fetchUrlFromSrcInfo s; + + inherit (s) name; + inherit buildInputs; + configureFlags = []; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + meta = { + description = "A Lisp implementation aiming to be small and fast"; + maintainers = [ + a.lib.maintainers.raskin + ]; + platforms = with a.lib.platforms; + linux; + }; +} diff --git a/pkgs/development/compilers/ecl/src-for-default.nix b/pkgs/development/compilers/ecl/src-for-default.nix new file mode 100644 index 000000000000..8e1753cb41fa --- /dev/null +++ b/pkgs/development/compilers/ecl/src-for-default.nix @@ -0,0 +1,9 @@ +rec { + version="9.6.2"; + name="ecl-9.6.2"; + hash="1847ppfrgfpjwc9qlfcvvsfhkarjz339qzh9mb0fwnqfihrbqpfy"; + url="http://downloads.sourceforge.net/ecls/files/ecls/9.6.0/ecl-${version}.tar.gz"; + advertisedUrl="http://downloads.sourceforge.net/ecls/files/ecls/9.6.0/ecl-9.6.2.tar.gz"; + + +} diff --git a/pkgs/development/compilers/ecl/src-info-for-default.nix b/pkgs/development/compilers/ecl/src-info-for-default.nix new file mode 100644 index 000000000000..84be3b3f5273 --- /dev/null +++ b/pkgs/development/compilers/ecl/src-info-for-default.nix @@ -0,0 +1,5 @@ +{ + downloadPage = "http://sourceforge.net/projects/ecls/files/"; + baseName = "ecl"; + choiceCommand = "head -1 | sed -e 's@/download@@;'\"$skipRedirectSF\""; +} From ef4198ec8df7ab61950c4adfcf8b027fbf4af374 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 20 Jan 2010 05:41:18 +0000 Subject: [PATCH 26/63] ECL entry in all-packages svn path=/nixpkgs/trunk/; revision=19556 --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8199924acd08..56f7d34d0c41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1806,6 +1806,10 @@ let }; }; + ecl = builderDefsPackage ../development/compilers/ecl { + inherit gmp mpfr; + }; + adobeFlexSDK33 = import ../development/compilers/adobe-flex-sdk { inherit fetchurl stdenv unzip jre; }; From d2795e889ca7a44efdb27be0612da406b0f45128 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 20 Jan 2010 06:24:29 +0000 Subject: [PATCH 27/63] Force CFS in zen-kernel not specified as BFS svn path=/nixpkgs/trunk/; revision=19557 --- pkgs/os-specific/linux/kernel/config-blocks.nix | 6 ++++++ pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/config-blocks.nix b/pkgs/os-specific/linux/kernel/config-blocks.nix index b7ae587569eb..06564b506727 100644 --- a/pkgs/os-specific/linux/kernel/config-blocks.nix +++ b/pkgs/os-specific/linux/kernel/config-blocks.nix @@ -254,4 +254,10 @@ rec { HZ_300 y HZ 300 ''; + + forceCFSched = '' + SCHED_CFS? y + SCHED_BFS? y + NO_HZ? y + ''; } diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix index c5dc6a3b18ba..ec52d701df5a 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix @@ -57,7 +57,7 @@ import ../kernel/generic.nix ( ${blockDevices} ${bluetooth} ${misc} - ${if stdenv.lib.attrByPath ["features" "ckSched"] false args then bfsched else ""} + ${if stdenv.lib.attrByPath ["features" "ckSched"] false args then bfsched else forceCFSched} ''; preConfigure = '' From 0577bc6bf1210c9233186bd74380ececbccf1b33 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 20 Jan 2010 09:39:08 +0000 Subject: [PATCH 28/63] add grub2 to channel svn path=/nixpkgs/trunk/; revision=19558 --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 80c79cfe98e1..2fe3c6e154c2 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -200,6 +200,7 @@ in { gqview = gtkSupported; graphviz = all; grub = linux; + grub2 = linux; gsl = linux; guile = linux; # tests fail on Cygwin guileLib = linux; From 44457a9ad732b482ff9953a7a6776a419f8a8e44 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 20 Jan 2010 11:06:20 +0000 Subject: [PATCH 29/63] Fixing a typo in options svn path=/nixpkgs/trunk/; revision=19563 --- pkgs/os-specific/linux/kernel/config-blocks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/config-blocks.nix b/pkgs/os-specific/linux/kernel/config-blocks.nix index 06564b506727..33247bd059fb 100644 --- a/pkgs/os-specific/linux/kernel/config-blocks.nix +++ b/pkgs/os-specific/linux/kernel/config-blocks.nix @@ -257,7 +257,7 @@ rec { forceCFSched = '' SCHED_CFS? y - SCHED_BFS? y + SCHED_BFS? n NO_HZ? y ''; } From 98b73c13064c0603437a0d8fa1159e56695239ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 20 Jan 2010 11:08:50 +0000 Subject: [PATCH 30/63] cvs: Fix getcwd() from Gnulib so that it works in chroots. svn path=/nixpkgs/trunk/; revision=19564 --- .../version-management/cvs/default.nix | 11 + .../cvs/getcwd-chroot.patch | 302 ++++++++++++++++++ 2 files changed, 313 insertions(+) create mode 100644 pkgs/applications/version-management/cvs/getcwd-chroot.patch diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 80b27b8376ae..05b33f2bcf21 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -8,5 +8,16 @@ stdenv.mkDerivation { sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; + patches = [ ./getcwd-chroot.patch ]; + + preConfigure = + # Apply the Debian patches. + '' for p in "debian/patches/"* + do + echo "applying \`$p'..." + patch --verbose -p1 < "$p" + done + ''; + buildInputs = [ nano ]; } diff --git a/pkgs/applications/version-management/cvs/getcwd-chroot.patch b/pkgs/applications/version-management/cvs/getcwd-chroot.patch new file mode 100644 index 000000000000..3f827a1e6981 --- /dev/null +++ b/pkgs/applications/version-management/cvs/getcwd-chroot.patch @@ -0,0 +1,302 @@ +Fix Gnulib's getcwd in chroots. +From Debian bug #456164, http://bugs.debian.org/456164 . + +--- cvs-1.12.13.orig/debian/patches/20_readdir_errno ++++ cvs-1.12.13/debian/patches/20_readdir_errno +@@ -0,0 +1,121 @@ ++# From Gnulib: ++# http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=0b78641d85af3b72e3b9d94cb7b94e45f3c08ee5 ++# We don't need this directly, but it's required so that 21_getcwd_chroot ++# applies cleanly. ++# ++# 2005-10-29 Paul Eggert ++# ++# * getcwd.c (__getcwd): Don't assume that system calls after readdir ++# leave errno alone. Problem reported by Dmitry V. Levin. ++ ++--- cvs-1.12.13-old/lib/getcwd.c +++++ cvs-1.12.13/lib/getcwd.c ++@@ -201,6 +201,8 @@ __getcwd (char *buf, size_t size) ++ ino_t dotino; ++ bool mount_point; ++ int parent_status; +++ size_t dirroom; +++ size_t namlen; ++ ++ /* Look at the parent directory. */ ++ #ifdef AT_FDCWD ++@@ -241,11 +243,20 @@ __getcwd (char *buf, size_t size) ++ goto lose; ++ dotlist[dotlen++] = '/'; ++ #endif ++- /* Clear errno to distinguish EOF from error if readdir returns ++- NULL. */ ++- __set_errno (0); ++- while ((d = __readdir (dirstream)) != NULL) +++ for (;;) ++ { +++ /* Clear errno to distinguish EOF from error if readdir returns +++ NULL. */ +++ __set_errno (0); +++ d = __readdir (dirstream); +++ if (d == NULL) +++ { +++ if (errno == 0) +++ /* EOF on dirstream, which means that the current directory +++ has been removed. */ +++ __set_errno (ENOENT); +++ goto lose; +++ } ++ if (d->d_name[0] == '.' && ++ (d->d_name[1] == '\0' || ++ (d->d_name[1] == '.' && d->d_name[2] == '\0'))) ++@@ -303,48 +314,38 @@ __getcwd (char *buf, size_t size) ++ break; ++ } ++ } ++- if (d == NULL) ++- { ++- if (errno == 0) ++- /* EOF on dirstream, which means that the current directory ++- has been removed. */ ++- __set_errno (ENOENT); ++- goto lose; ++- } ++- else ++- { ++- size_t dirroom = dirp - dir; ++- size_t namlen = _D_EXACT_NAMLEN (d); ++ ++- if (dirroom <= namlen) +++ dirroom = dirp - dir; +++ namlen = _D_EXACT_NAMLEN (d); +++ +++ if (dirroom <= namlen) +++ { +++ if (size != 0) ++ { ++- if (size != 0) ++- { ++- __set_errno (ERANGE); ++- goto lose; ++- } ++- else ++- { ++- char *tmp; ++- size_t oldsize = allocated; +++ __set_errno (ERANGE); +++ goto lose; +++ } +++ else +++ { +++ char *tmp; +++ size_t oldsize = allocated; ++ ++- allocated += MAX (allocated, namlen); ++- if (allocated < oldsize ++- || ! (tmp = realloc (dir, allocated))) ++- goto memory_exhausted; +++ allocated += MAX (allocated, namlen); +++ if (allocated < oldsize +++ || ! (tmp = realloc (dir, allocated))) +++ goto memory_exhausted; ++ ++- /* Move current contents up to the end of the buffer. ++- This is guaranteed to be non-overlapping. */ ++- dirp = memcpy (tmp + allocated - (oldsize - dirroom), ++- tmp + dirroom, ++- oldsize - dirroom); ++- dir = tmp; ++- } +++ /* Move current contents up to the end of the buffer. +++ This is guaranteed to be non-overlapping. */ +++ dirp = memcpy (tmp + allocated - (oldsize - dirroom), +++ tmp + dirroom, +++ oldsize - dirroom); +++ dir = tmp; ++ } ++- dirp -= namlen; ++- memcpy (dirp, d->d_name, namlen); ++- *--dirp = '/'; ++ } +++ dirp -= namlen; +++ memcpy (dirp, d->d_name, namlen); +++ *--dirp = '/'; ++ ++ thisdev = dotdev; ++ thisino = dotino; +--- cvs-1.12.13.orig/debian/patches/21_getcwd_chroot ++++ cvs-1.12.13/debian/patches/21_getcwd_chroot +@@ -0,0 +1,172 @@ ++# From Gnulib: ++# http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=79c0a43808d9ca85acd04600149fc1a9b75bd1b9 ++# ++# 2006-07-03 Paul Eggert ++# ++# Merge from coreutils. ++# ++# 2006-03-19 Jim Meyering ++# ++# Work even in a chroot where d_ino values for entries in "/" ++# don't match the stat.st_ino values for the same names. ++# * getcwd.c (__getcwd): When no d_ino value matches the target inode ++# number, iterate through all entries again, using lstat instead. ++# Reported by Kenshi Muto in http://bugs.debian.org/355810, and by ++# Zouhir Hafidi in https://bugzilla.redhat.com/bugzilla/190656. ++# ++# * getcwd.c (__getcwd): Clarify a comment. ++# Use memcpy in place of a call to strcpy. ++ ++--- cvs-1.12.13-old/lib/getcwd.c +++++ cvs-1.12.13/lib/getcwd.c ++@@ -211,6 +211,7 @@ __getcwd (char *buf, size_t size) ++ int parent_status; ++ size_t dirroom; ++ size_t namlen; +++ bool use_d_ino = true; ++ ++ /* Look at the parent directory. */ ++ #ifdef AT_FDCWD ++@@ -257,11 +258,26 @@ __getcwd (char *buf, size_t size) ++ NULL. */ ++ __set_errno (0); ++ d = __readdir (dirstream); +++ +++ /* When we've iterated through all directory entries without finding +++ one with a matching d_ino, rewind the stream and consider each +++ name again, but this time, using lstat. This is necessary in a +++ chroot on at least one system (glibc-2.3.6 + linux 2.6.12), where +++ .., ../.., ../../.., etc. all had the same device number, yet the +++ d_ino values for entries in / did not match those obtained +++ via lstat. */ +++ if (d == NULL && errno == 0 && use_d_ino) +++ { +++ use_d_ino = false; +++ rewinddir (dirstream); +++ d = __readdir (dirstream); +++ } +++ ++ if (d == NULL) ++ { ++ if (errno == 0) ++- /* EOF on dirstream, which means that the current directory ++- has been removed. */ +++ /* EOF on dirstream, which can mean e.g., that the current +++ directory has been removed. */ ++ __set_errno (ENOENT); ++ goto lose; ++ } ++@@ -269,58 +285,65 @@ __getcwd (char *buf, size_t size) ++ (d->d_name[1] == '\0' || ++ (d->d_name[1] == '.' && d->d_name[2] == '\0'))) ++ continue; ++- if (MATCHING_INO (d, thisino) || mount_point) +++ +++ if (use_d_ino) ++ { ++- int entry_status; +++ bool match = (MATCHING_INO (d, thisino) || mount_point); +++ if (! match) +++ continue; +++ } +++ +++ { +++ int entry_status; ++ #ifdef AT_FDCWD ++- entry_status = fstatat (fd, d->d_name, &st, AT_SYMLINK_NOFOLLOW); +++ entry_status = fstatat (fd, d->d_name, &st, AT_SYMLINK_NOFOLLOW); ++ #else ++- /* Compute size needed for this file name, or for the file ++- name ".." in the same directory, whichever is larger. ++- Room for ".." might be needed the next time through ++- the outer loop. */ ++- size_t name_alloc = _D_ALLOC_NAMLEN (d); ++- size_t filesize = dotlen + MAX (sizeof "..", name_alloc); ++- ++- if (filesize < dotlen) ++- goto memory_exhausted; ++- ++- if (dotsize < filesize) ++- { ++- /* My, what a deep directory tree you have, Grandma. */ ++- size_t newsize = MAX (filesize, dotsize * 2); ++- size_t i; ++- if (newsize < dotsize) ++- goto memory_exhausted; ++- if (dotlist != dots) ++- free (dotlist); ++- dotlist = malloc (newsize); ++- if (dotlist == NULL) ++- goto lose; ++- dotsize = newsize; ++- ++- i = 0; ++- do ++- { ++- dotlist[i++] = '.'; ++- dotlist[i++] = '.'; ++- dotlist[i++] = '/'; ++- } ++- while (i < dotlen); ++- } ++- ++- strcpy (dotlist + dotlen, d->d_name); ++- entry_status = __lstat (dotlist, &st); +++ /* Compute size needed for this file name, or for the file +++ name ".." in the same directory, whichever is larger. +++ Room for ".." might be needed the next time through +++ the outer loop. */ +++ size_t name_alloc = _D_ALLOC_NAMLEN (d); +++ size_t filesize = dotlen + MAX (sizeof "..", name_alloc); +++ +++ if (filesize < dotlen) +++ goto memory_exhausted; +++ +++ if (dotsize < filesize) +++ { +++ /* My, what a deep directory tree you have, Grandma. */ +++ size_t newsize = MAX (filesize, dotsize * 2); +++ size_t i; +++ if (newsize < dotsize) +++ goto memory_exhausted; +++ if (dotlist != dots) +++ free (dotlist); +++ dotlist = malloc (newsize); +++ if (dotlist == NULL) +++ goto lose; +++ dotsize = newsize; +++ +++ i = 0; +++ do +++ { +++ dotlist[i++] = '.'; +++ dotlist[i++] = '.'; +++ dotlist[i++] = '/'; +++ } +++ while (i < dotlen); +++ } +++ +++ memcpy (dotlist + dotlen, d->d_name, _D_ALLOC_NAMLEN (d)); +++ entry_status = __lstat (dotlist, &st); ++ #endif ++- /* We don't fail here if we cannot stat() a directory entry. ++- This can happen when (network) file systems fail. If this ++- entry is in fact the one we are looking for we will find ++- out soon as we reach the end of the directory without ++- having found anything. */ ++- if (entry_status == 0 && S_ISDIR (st.st_mode) ++- && st.st_dev == thisdev && st.st_ino == thisino) ++- break; ++- } +++ /* We don't fail here if we cannot stat() a directory entry. +++ This can happen when (network) file systems fail. If this +++ entry is in fact the one we are looking for we will find +++ out soon as we reach the end of the directory without +++ having found anything. */ +++ if (entry_status == 0 && S_ISDIR (st.st_mode) +++ && st.st_dev == thisdev && st.st_ino == thisino) +++ break; +++ } ++ } ++ ++ dirroom = dirp - dir; From 50a7b78fb4161dc833df559b3f22741be9dbda84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 20 Jan 2010 11:09:00 +0000 Subject: [PATCH 31/63] GNU Guile 1.9.7. svn path=/nixpkgs/trunk/; revision=19565 --- pkgs/development/interpreters/guile/1.9.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/guile/1.9.nix b/pkgs/development/interpreters/guile/1.9.nix index 27e412484056..37773043bda2 100644 --- a/pkgs/development/interpreters/guile/1.9.nix +++ b/pkgs/development/interpreters/guile/1.9.nix @@ -7,10 +7,11 @@ else stdenv.mkDerivation) rec { - name = "guile-1.9.6"; # This is an alpha release! + name = "guile-1.9.7"; # This is a beta release! + src = fetchurl { url = "ftp://alpha.gnu.org/gnu/guile/${name}.tar.gz"; - sha256 = "1cfhzm9az1wbq0741v98af09v7f3094ym727qjfgj8n9jyxvpxnw"; + sha256 = "1jyvckid3wjx82717fy1018qpdnglawv29r4wbv239cva8gv5nbr"; }; buildInputs = [ makeWrapper gawk readline libtool libunistring pkgconfig ]; From 8e3a1e09c07868bb20dc68dd063032b81fba4d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 20 Jan 2010 11:09:04 +0000 Subject: [PATCH 32/63] GNU Libtasn1 2.4. svn path=/nixpkgs/trunk/; revision=19566 --- .../libraries/libtasn1/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index e70bdd23dc1d..e259c7b6e439 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,15 +1,26 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libtasn1-2.4"; -stdenv.mkDerivation { - name = "libtasn1-1.5"; - src = fetchurl { - url = mirror://gnu/gnutls/libtasn1-1.5.tar.gz; - sha256 = "1p4m9in144ypk6ndqw46sfz0njx6wccp0zlxjvigxry8034zbn6s"; + url = "mirror://gnu/libtasn1/${name}.tar.gz"; + sha256 = "03qz9wnx3643wvy10603syx97mi634z6bhdwznzmqcsq6hwg5g69"; }; meta = { - homepage = http://josefsson.org/libtasn1/; - description = "An ASN.1 library"; + homepage = http://www.gnu.org/software/libtasn1/; + description = "GNU Libtasn1, an ASN.1 library"; + + longDescription = + '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some + other packages. The goal of this implementation is to be highly + portable, and only require an ANSI C89 platform. + ''; + + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } From f724089f6f863b5dc44d86fcae6b7cc29829b298 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 Jan 2010 14:10:26 +0000 Subject: [PATCH 33/63] * Added a bundle of CA certificates, useful for e.g. curl. svn path=/nixpkgs/trunk/; revision=19571 --- pkgs/data/misc/cacert/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/data/misc/cacert/default.nix diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix new file mode 100644 index 000000000000..f981c79b6922 --- /dev/null +++ b/pkgs/data/misc/cacert/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "cacert-20090922"; + + src = fetchurl { + url = http://nixos.org/tarballs/cacert-20090922.pem.bz2; + sha256 = "1fakipxy5y62vslw6czj24pksh16b042py9v0199mxhzg5nmbmy7"; + }; + + unpackPhase = "true"; + + installPhase = + '' + ensureDir $out/etc + bunzip2 < $src > $out/etc/ca-bundle.crt + ''; + + meta = { + homepage = http://curl.haxx.se/docs/caextract.html; + description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56f7d34d0c41..db1fb14b41bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6126,6 +6126,10 @@ let inherit fetchurl stdenv; }; + cacert = import ../data/misc/cacert { + inherit fetchurl stdenv; + }; + corefonts = import ../data/fonts/corefonts { inherit fetchurl stdenv cabextract; }; From b3625c242b97acb1f0f367ae2eb3e0ae1f312cbd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 20 Jan 2010 21:09:33 +0000 Subject: [PATCH 34/63] * Add the ext3 module to the initrd. The Amazon image generator needs it. svn path=/nixpkgs/trunk/; revision=19585 --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 1092812443c6..865b34f131d7 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -14,7 +14,7 @@ rec { modulesClosure = makeModulesClosure { inherit kernel; - rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "unix"]; + rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" "unix"]; }; From cdf8259bb3fafc5f0e47071ccc17475cd5ceaace Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Jan 2010 07:39:36 +0000 Subject: [PATCH 35/63] svn path=/nixpkgs/trunk/; revision=19588 --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2fe3c6e154c2..f1f0fd3d36e1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -217,6 +217,7 @@ in { hugin = linux; iana_etc = linux; icecat3Xul = linux; + icewm = linux; idutils = all; ifplugd = linux; imagemagick = allBut "i686-cygwin"; From b56c549f2695079ebe8d0b88173ac06165d1c811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 21 Jan 2010 09:46:48 +0000 Subject: [PATCH 36/63] Version bump for uu-parsinglib. svn path=/nixpkgs/trunk/; revision=19590 --- 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 784fe915814f..6df06579942e 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.3.0"; - sha256 = "0ddf5ff41e59d8a777942f821170f1e6c7373712b029261a7efbc16fa663b671"; + version = "2.3.1"; + sha256 = "63ed4257f360a861b13f3e0edad6c17bbad90a0e3e031de49ed4d13a1ace98d2"; meta = { description = "New version of the Utrecht University parser combinator library"; }; From 13733f6f94ac00a7ba7df0c378ed72d3b37ede28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 21 Jan 2010 09:49:06 +0000 Subject: [PATCH 37/63] Updating gtkwave svn path=/nixpkgs/trunk/; revision=19591 --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index c6256103d070..1630303c603b 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2} : stdenv.mkDerivation rec { - name = "gtkwave-3.2.3"; + name = "gtkwave-3.3.2"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1ym8fw6cv76gn80qzh6a5y7gikqgnz65hwy0cp6p6h18i5ghgfs0"; + sha256 = "0dccyyzk963v5nz6hxfvkcnfwm98m8d8s5x0nw6459r9683pdlri"; }; buildInputs = [ gtk gperf pkgconfig bzip2 ]; From 8640725ca4cd23738c20b45f36a4abed80af7868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 21 Jan 2010 09:49:10 +0000 Subject: [PATCH 38/63] Updating meshlab svn path=/nixpkgs/trunk/; revision=19592 --- pkgs/applications/graphics/meshlab/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 10b48b063256..1a1fa1605c55 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, qt, bzip2}: stdenv.mkDerivation { - name = "meshlab-1.2.0"; + name = "meshlab-1.2.2"; src = fetchurl { - url = mirror://sourceforge/meshlab/MeshLabSrc_v120.tgz; - sha256 = "0iidp2pzwq96v8zbm8gc67wi1f41anpkncp17ajkv1rrh653nila"; + url = mirror://sourceforge/meshlab/MeshLabSrc_v122.tar.gz; + sha256 = "166a8mx72wf3r84pnpr0ssqkd2xw6y5brviywlj8rjk6w9cy8fdc"; }; @@ -34,5 +34,7 @@ stdenv.mkDerivation { description = "System for the processing and editing of unstructured 3D triangular meshes"; homepage = http://meshlab.sourceforge.net/; license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } From 247d4ae0986b572c47d49811ab6ee0da56f01a76 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 Jan 2010 10:06:17 +0000 Subject: [PATCH 39/63] Update pstree svn path=/nixpkgs/trunk/; revision=19593 --- pkgs/applications/misc/pstree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index e642824d4bf0..71cac8eefa74 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation rec { - name = "pstree-2.32"; + name = "pstree-2.33"; src = fetchurl { - url = "http://fresh.t-systems-sfr.com/unix/src/misc/${name}.tar.gz"; - sha256 = "0k5r6alnc0ch3frvl5bhh2vi91m6aik10pnjfl86qwkdwsr303az"; + url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"; + sha256 = "1469lrhpy6wghlvbjx6lmvh27rakq00x11cpz4n965fg11i121hg"; }; unpackPhase="unpackFile \$src; sourceRoot=."; From e70276079f7a0de76c67843acf252e354525dedd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 Jan 2010 10:07:25 +0000 Subject: [PATCH 40/63] Add myself as a maintainer svn path=/nixpkgs/trunk/; revision=19594 --- pkgs/development/interpreters/acl2/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 959cd50aae6e..6cad083ac853 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -35,7 +35,11 @@ rec { name = "acl2-" + version; meta = { description = "An interpreter and a prover for a Lisp dialect"; - maintainers = [ + maintainers = with a.lib.maintainers; + [ + raskin ]; + platforms = with a.lib.platforms; + linux; }; } From a3e4c7640f18ac4bc07feafc09a0c687c34b1554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 21 Jan 2010 14:39:53 +0000 Subject: [PATCH 41/63] Updating meshlab. Their build system has changed, and the source tree they distribute too, so the dependencies changed a bit. To get meshlab working, I update lib3ds and add levmar. svn path=/nixpkgs/trunk/; revision=19595 --- .../applications/graphics/meshlab/default.nix | 31 ++++++++++++---- pkgs/development/libraries/levmar/default.nix | 28 ++++++++++++++ .../libraries/levmar/use-atlas.patch | 37 +++++++++++++++++++ pkgs/development/libraries/lib3ds/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 ++- 5 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/libraries/levmar/default.nix create mode 100644 pkgs/development/libraries/levmar/use-atlas.patch diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 1a1fa1605c55..bc816a1daf75 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, qt, bzip2}: +{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "meshlab-1.2.2"; src = fetchurl { @@ -8,14 +8,29 @@ stdenv.mkDerivation { sha256 = "166a8mx72wf3r84pnpr0ssqkd2xw6y5brviywlj8rjk6w9cy8fdc"; }; + srcGlew151 = fetchurl { + url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.1-src.tgz; + sha256 = "02n1p6s6sia92fgng9iq0kqq890rga8d8g0y34mc6qxmbh43vrl9"; + }; - setSourceRoot = "sourceRoot=`pwd`/meshlab/src"; + srcQHull20031 = fetchurl { + url = http://www.qhull.org/download/qhull-2003.1.zip; + sha256 = "07mh371i6xs691qz6wwzkqk9h0d2dkih2q818is2b041w1l79b46"; + }; + + + patchPhase = '' + cd meshlab/src + mkdir external + pushd external + tar xf ${srcGlew151} + mv glew glew-1.5.1 + unzip ${srcQHull20031} + popd + ''; buildPhase = '' - pushd external - qmake -recursive external.pro - make - popd + pwd qmake -recursive meshlabv12.pro make ''; @@ -28,7 +43,7 @@ stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlab $out/bin/meshlab ''; - buildInputs = [ qt bzip2 ]; + buildInputs = [ qt bzip2 lib3ds levmar muparser unzip ]; meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix new file mode 100644 index 000000000000..a17cdf0b4d58 --- /dev/null +++ b/pkgs/development/libraries/levmar/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "levmar-2.5"; + + src = fetchurl { + url = "http://www.ics.forth.gr/~lourakis/levmar/${name}.tgz"; + sha256 = "0xcx9fvymr0j5kmfy5cqaa2lxf1c64vv25z2a28w43pkxz1nl3xp"; + }; + + patchPhase = '' + sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h + sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile + ''; + + installPhase = '' + ensureDir $out/include $out/lib + cp lm.h $out/include + cp liblevmar.a $out/lib + ''; + + meta = { + description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; + homepage = http://www.ics.forth.gr/~lourakis/levmar/; + license = "GPLv2+"; + }; +} + diff --git a/pkgs/development/libraries/levmar/use-atlas.patch b/pkgs/development/libraries/levmar/use-atlas.patch new file mode 100644 index 000000000000..2be9999b40ff --- /dev/null +++ b/pkgs/development/libraries/levmar/use-atlas.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile b/Makefile +index af70b4c..53c6fab 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,11 +15,11 @@ DEMOBJS=lmdemo.o + DEMOSRCS=lmdemo.c + AR=ar + RANLIB=ranlib +-LAPACKLIBS=-llapack -lblas -lf2c # comment this line if you are not using LAPACK. ++#LAPACKLIBS=-llapack -lblas -lf2c # comment this line if you are not using LAPACK. + # On systems with a FORTRAN (not f2c'ed) version of LAPACK, -lf2c is + # not necessary; on others, -lf2c is equivalent to -lF77 -lI77 + +-#LAPACKLIBS=-L/usr/local/atlas/lib -llapack -lcblas -lf77blas -latlas -lf2c # This works with the ATLAS updated lapack and Linux_P4SSE2 ++LAPACKLIBS=-llapack -lcblas -lf77blas -latlas -lgfortran # This works with the ATLAS updated lapack and Linux_P4SSE2 + # from http://www.netlib.org/atlas/archives/linux/ + + #LAPACKLIBS=-llapack -lgoto2 -lpthread -lf2c # This works with GotoBLAS +diff --git a/misc.h b/misc.h +index e32f18d..827507e 100644 +--- a/misc.h ++++ b/misc.h +@@ -30,11 +30,11 @@ + /* f2c'd BLAS */ + //#define LM_BLAS_PREFIX f2c_ + /* C BLAS */ +-//#define LM_BLAS_PREFIX cblas_ ++#define LM_BLAS_PREFIX cblas_ + + /* common suffix for BLAS subroutines */ +-//#define LM_BLAS_SUFFIX // define empty if a f2c_ or cblas_ prefix was defined for LM_BLAS_PREFIX above +-#define LM_BLAS_SUFFIX _ // use this in case of no BLAS prefix ++#define LM_BLAS_SUFFIX // define empty if a f2c_ or cblas_ prefix was defined for LM_BLAS_PREFIX above ++//#define LM_BLAS_SUFFIX _ // use this in case of no BLAS prefix + + + #define LCAT_(a, b) #a b diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 82367600467f..a470dac24e16 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lib3ds-1.3.0"; src = fetchurl { - url = "mirror://sourceforge/lib3ds/${name}.zip"; + url = "http://lib3ds.googlecode.com/files/${name}.zip"; sha256 = "1qr9arfdkjf7q11xhvxwzmhxqz3nhcjkyb8zzfjpz9jm54q0rc7m"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db1fb14b41bc..7082a8c60497 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3820,6 +3820,10 @@ let inherit (xlibs) libXp libXau; }; + levmar = import ../development/libraries/levmar { + inherit fetchurl stdenv; + }; + lib3ds = import ../development/libraries/lib3ds { inherit fetchurl stdenv unzip; }; @@ -7304,7 +7308,7 @@ let }; meshlab = import ../applications/graphics/meshlab { - inherit fetchurl stdenv bzip2; + inherit fetchurl stdenv bzip2 lib3ds levmar muparser unzip; qt = qt4; }; From 218c9189096540fdc1a75c79b7f1daf29b366a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 21 Jan 2010 14:39:57 +0000 Subject: [PATCH 42/63] Updating glew svn path=/nixpkgs/trunk/; revision=19596 --- pkgs/development/libraries/glew/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 82925d144b5b..ff3baabe339a 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "glew-1.5.0"; + name = "glew-1.5.2"; src = fetchurl { - url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.0-src.tgz; - sha256 = "1kjr1fchnl785wsg11vzc03q3pm12lh20n1i593zr1xqfjgx2b4h"; + url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.2.tgz; + sha256 = "0dh5wpfq7aaldkiwcqmm9w59c2qcglkjv8zazmnm8n5771n3caj8"; }; buildInputs = [mesa x11 libXmu libXi]; From 3c206efa1f16f3f0af89b5232894be37923d4a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 21 Jan 2010 14:44:15 +0000 Subject: [PATCH 43/63] Updating qhull svn path=/nixpkgs/trunk/; revision=19597 --- pkgs/development/libraries/qhull/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 522c0cb75358..f91697fb117a 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "qhull-2003.1"; + name = "qhull-2010.1"; src = fetchurl { - url = http://www.qhull.org/download/qhull-2003.1-src.tgz; - sha256 = "1ah6yhh8qxqmvjcpmijibxcw8gjwvdcrb9g7j2rkawazq95a2j0s"; + url = http://www.qhull.org/download/qhull-2010.1-src.tgz; + sha256 = "1ghnwci1s56yzzwg8gmlzhsd5v3imsqxf24yb0j5m6qv8kxqaw2m"; }; NIX_CFLAGS_COMPILE = "-fno-strict-aliasing " + From 05868b3046e83c237bb608c180c3da32d6fb93cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Jan 2010 15:40:43 +0000 Subject: [PATCH 44/63] pkgs/development/tools/misc/distcc: optionally, build static binaries without any dependencies Using nix-pkgs.conf, it is possible to disable avahi, python, and all other optional dependencies of distcc in order to generate binaries that are as small and simple as possible. Furthermore, there is now an option for static linking. svn path=/nixpkgs/trunk/; revision=19599 --- pkgs/development/tools/misc/distcc/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 03fc9badb055..653354f9159e 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk}: +{stdenv, fetchurl, popt, avahi, pkgconfig, python, gtk, static ? false}: let name = "distcc"; version = "3.1"; @@ -15,7 +15,8 @@ stdenv.mkDerivation { '' configureFlagsArray=( CFLAGS="-O2 -fno-strict-aliasing" CXXFLAGS="-O2 -fno-strict-aliasing" - --with${if popt == null then "" else "out"}-included-popt + ${if static then "LDFLAGS=-static" else ""} + --with${if static == true || popt == null then "" else "out"}-included-popt --with${if avahi != null then "" else "out"}-avahi --with${if gtk != null then "" else "out"}-gtk --without-gnome diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7082a8c60497..cd6f4c0a7f12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2749,10 +2749,12 @@ let }; distcc = import ../development/tools/misc/distcc { - inherit fetchurl stdenv popt python; + inherit fetchurl stdenv popt; + python = if getPkgConfig "distcc" "python" true then python else null; avahi = if getPkgConfig "distcc" "avahi" false then avahi else null; pkgconfig = if getPkgConfig "distcc" "gtk" false then pkgconfig else null; gtk = if getPkgConfig "distcc" "gtk" false then gtkLibs.gtk else null; + static = getPkgConfig "distcc" "static" false; }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { From 28ef44c86acd2a2c9b7409f04537fc738bb7d097 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 21 Jan 2010 15:40:48 +0000 Subject: [PATCH 45/63] pkgs/development/tools/misc/distcc: patch distcc to use a 20 minute timeout for I/O After having established the connection to the distcc server, time out after 20 minutes of inactivity -- rather than 5 minutes, which is too quick to build large C++ files with complex template machinery. svn path=/nixpkgs/trunk/; revision=19600 --- .../tools/misc/distcc/20-minute-io-timeout.patch | 12 ++++++++++++ pkgs/development/tools/misc/distcc/default.nix | 1 + 2 files changed, 13 insertions(+) create mode 100644 pkgs/development/tools/misc/distcc/20-minute-io-timeout.patch diff --git a/pkgs/development/tools/misc/distcc/20-minute-io-timeout.patch b/pkgs/development/tools/misc/distcc/20-minute-io-timeout.patch new file mode 100644 index 000000000000..175060137fda --- /dev/null +++ b/pkgs/development/tools/misc/distcc/20-minute-io-timeout.patch @@ -0,0 +1,12 @@ +diff -ubr distcc-3.1-orig/src/io.c distcc-3.1-patched/src/io.c +--- distcc-3.1-orig/src/io.c 2008-12-02 22:50:25.000000000 +0100 ++++ distcc-3.1-patched/src/io.c 2010-01-07 15:07:18.000000000 +0100 +@@ -64,7 +64,7 @@ + + /** Timeout for all IO other than opening connections. Much longer, because + * compiling files can take a long time. **/ +-const int dcc_io_timeout = 300; /* seconds */ ++const int dcc_io_timeout = 1200; /* seconds */ + + + /** diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 653354f9159e..a46c007cf31d 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation { --enable-rfc2553 ) ''; + patches = [ ./20-minute-io-timeout.patch ]; # The test suite fails because it uses hard-coded paths, i.e. /usr/bin/gcc. doCheck = false; From b14e1f31c9604ad861c35283f258e6583876b53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 21 Jan 2010 16:43:27 +0000 Subject: [PATCH 46/63] Fixing the 'platforms' at python 2.6. svn path=/nixpkgs/trunk/; revision=19602 --- pkgs/development/interpreters/python/2.6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 80c09722eec4..2d607926a237 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation ( { }; meta = { - platforms = stdenv.lib.platforms; + platforms = stdenv.lib.platforms.all; }; } // (if stdenv.isDarwin then { NIX_CFLAGS_COMPILE = "-msse2" ; patches = [./search-path.patch]; } else {} ) ) From 16dec9905426285d9302e48217654707ee651cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 21 Jan 2010 16:53:16 +0000 Subject: [PATCH 47/63] Add GNU mkisofs. svn path=/nixpkgs/trunk/; revision=19603 --- pkgs/tools/cd-dvd/mkisofs/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/cd-dvd/mkisofs/default.nix diff --git a/pkgs/tools/cd-dvd/mkisofs/default.nix b/pkgs/tools/cd-dvd/mkisofs/default.nix new file mode 100644 index 000000000000..255e7467def4 --- /dev/null +++ b/pkgs/tools/cd-dvd/mkisofs/default.nix @@ -0,0 +1,25 @@ +{ fetchurl, stdenv, gettext }: + +stdenv.mkDerivation rec { + name = "mkisofs-1.13"; + + src = fetchurl { + url = "mirror://gnu/isofsmk/${name}.tar.gz"; + sha256 = "13f8zynl64aaqjgxf0m1m2gbizdh7ndicg5d1bm6s0x97bqifrfn"; + }; + + buildInputs = [ gettext ]; + + doCheck = true; + + meta = { + homepage = http://savannah.gnu.org/projects/isofsmk; + + description = "GNU mkisofs, an ISO 9660 filesystem builder"; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd6f4c0a7f12..18b3addd5cf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1031,6 +1031,10 @@ let inherit (xlibs) libX11; }; + mkisofs = import ../tools/cd-dvd/mkisofs { + inherit fetchurl stdenv gettext; + }; + mktemp = import ../tools/security/mktemp { inherit fetchurl stdenv; }; From b8f106abd7cb5c0a3a5b34ca9b39eb9894c74486 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Jan 2010 21:14:22 +0000 Subject: [PATCH 48/63] * Throw away some old versions of Firefox. svn path=/nixpkgs/trunk/; revision=19604 --- .../browsers/firefox/2.0-builder.sh | 35 ----- .../networking/browsers/firefox/2.0.nix | 57 -------- .../networking/browsers/firefox/3.0.nix | 130 ------------------ pkgs/top-level/all-packages.nix | 20 --- pkgs/top-level/release.nix | 4 +- 5 files changed, 1 insertion(+), 245 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/2.0-builder.sh delete mode 100644 pkgs/applications/networking/browsers/firefox/2.0.nix delete mode 100644 pkgs/applications/networking/browsers/firefox/3.0.nix diff --git a/pkgs/applications/networking/browsers/firefox/2.0-builder.sh b/pkgs/applications/networking/browsers/firefox/2.0-builder.sh deleted file mode 100644 index e77bd2211de2..000000000000 --- a/pkgs/applications/networking/browsers/firefox/2.0-builder.sh +++ /dev/null @@ -1,35 +0,0 @@ -source $stdenv/setup - -postInstall() { - - # Strip some more stuff - strip -S $out/lib/*/* || true - - # Fix some references to /bin paths in the Firefox shell script. - substituteInPlace $out/bin/firefox \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # This fixes starting Firefox when there already is a running - # instance. The `firefox' wrapper script actually expects to be - # in the same directory as `run-mozilla.sh', apparently. - libDir=$(cd $out/lib && ls -d firefox-*) - test -n "$libDir" - cd $out/bin - mv firefox ../lib/$libDir/ - ln -s ../lib/$libDir/firefox . - - # Register extensions etc. - echo "running firefox -register..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./firefox-bin -register) || false - - echo "running regxpcom..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false - - # Put the Firefox icon in the right place. - ensureDir $out/lib/$libDir/chrome/icons/default - ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/ - -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/firefox/2.0.nix b/pkgs/applications/networking/browsers/firefox/2.0.nix deleted file mode 100644 index 1d3fccefc06c..000000000000 --- a/pkgs/applications/networking/browsers/firefox/2.0.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi -, libjpeg, libpng, zlib, cairo - -, # If you want the resulting program to call itself "Firefox" instead - # of "Deer Park", 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 - -}: - -stdenv.mkDerivation { - name = "firefox-2.0.0.20"; - - builder = ./2.0-builder.sh; - - src = fetchurl { - url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/source/firefox-2.0.0.20-source.tar.bz2; - sha1 = "16601fdbbb0a83b85fd053e76350f7da397f525e"; - }; - - buildInputs = [ - pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo - ]; - - patches = [ - ./writable-copies.patch - # Ugh, inexplicable problem since GTK+ 2.10. Probably a Firefox - # bug, but I don't know. See - # http://lists.gobolinux.org/pipermail/gobolinux-users/2007-January/004344.html - ./xlibs.patch - ]; - - configureFlags = [ - "--enable-application=browser" - "--enable-optimize" - "--disable-debug" - "--enable-xft" - "--disable-freetype2" - "--enable-svg" - "--enable-canvas" - "--enable-strip" - "--enable-default-toolkit=gtk2" - "--with-system-jpeg" - "--with-system-png" - "--with-system-zlib" - "--enable-system-cairo" - ] - ++ (if enableOfficialBranding then ["--enable-official-branding"] else []); - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = {inherit gtk;}; -} diff --git a/pkgs/applications/networking/browsers/firefox/3.0.nix b/pkgs/applications/networking/browsers/firefox/3.0.nix deleted file mode 100644 index e6da5e6f44d0..000000000000 --- a/pkgs/applications/networking/browsers/firefox/3.0.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file - -, # If you want the resulting program to call itself "Firefox" instead - # of "Deer Park", 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 -}: - -rec { - - firefoxVersion = "3.0.17"; - - xulVersion = "1.9.0.17"; # this attribute is used by other packages - - - src = fetchurl { - url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}-source.tar.bz2"; - sha1 = "e4bb7daae1699f3493936ca6739512d28c7f150f"; - }; - - - commonConfigureFlags = - [ "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ]; - - - xulrunner = stdenv.mkDerivation { - 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 - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - ] ++ commonConfigureFlags; - - installFlags = "SKIP_GRE_REGISTRATION=1"; - - postInstall = '' - export dontPatchELF=1 - - # Fix some references to /bin paths in the Xulrunner shell script. - substituteInPlace $out/bin/xulrunner \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - # Fix run-mozilla.sh search - libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) - echo libDir: $libDir - test -n "$libDir" - cd $out/bin - mv xulrunner ../lib/$libDir/ - - for i in $out/lib/$libDir/*; do - file $i; - if file $i | grep executable &>/dev/null; then - ln -s $i $out/bin - fi; - done; - rm $out/bin/run-mozilla.sh || true - ''; # */ - - 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-3.0.11"; - - inherit src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python - dbus dbus_glib pango freetype fontconfig - ]; - - propagatedBuildInputs = [xulrunner]; - - configureFlags = - [ "--enable-application=browser" - "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" - ] - ++ commonConfigureFlags - ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; - - postInstall = '' - libDir=$(cd $out/lib && ls -d firefox-[0-9]*) - test -n "$libDir" - - ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner - - # Register extensions etc. !!! is this needed anymore? - echo "running firefox -register..." - $out/bin/firefox -register - ''; # */ - - meta = { - description = "Mozilla Firefox - the browser, reloaded"; - homepage = http://www.mozilla.com/en-US/firefox/; - }; - - passthru = { - inherit gtk; - isFirefox3Like = true; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18b3addd5cf3..6f911d100ab6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6876,26 +6876,6 @@ let firefoxWrapper = firefox35Wrapper; - firefox2 = lowPrio (import ../applications/networking/browsers/firefox/2.0.nix { - inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo; - inherit (gtkLibs) gtk; - inherit (gnome) libIDL; - inherit (xlibs) libXi; - }); - - firefox2Wrapper = wrapFirefox firefox2 "firefox" ""; - - firefox3Pkgs = lowPrio (import ../applications/networking/browsers/firefox/3.0.nix { - inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo - python dbus dbus_glib freetype fontconfig bzip2 xlibs file; - inherit (gtkLibs) gtk pango; - inherit (gnome) libIDL; - }); - - firefox3 = firefox3Pkgs.firefox; - xulrunner3 = firefox3Pkgs.xulrunner; - firefox3Wrapper = wrapFirefox firefox3 "firefox" ""; - firefox35Pkgs = lowPrio (import ../applications/networking/browsers/firefox/3.5.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs file alsaLib diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f1f0fd3d36e1..4b1083b8e00e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -156,9 +156,7 @@ in { feh = linux; file = all; findutils = all; - firefox2 = linux; - firefox3 = prio 150 linux; - firefox35 = linux; + firefox35 = prio 150 linux; flex = all; flex2535 = all; fontforge = linux; From c7194fe7cfb735359c811adc6c3fedc77bc19e72 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Jan 2010 22:23:59 +0000 Subject: [PATCH 49/63] * Added Firefox 3.6. It's not entirely stable yet though. In particular it segfaults with the `-P' option. svn path=/nixpkgs/trunk/; revision=19606 --- .../networking/browsers/firefox/3.6.nix | 139 ++++++++++++++++++ .../libraries/libnotify/default.nix | 20 +-- pkgs/top-level/all-packages.nix | 16 +- pkgs/top-level/release.nix | 9 +- 4 files changed, 170 insertions(+), 14 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/3.6.nix diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix new file mode 100644 index 000000000000..03c06e0bf372 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/3.6.nix @@ -0,0 +1,139 @@ +{ 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 + +, # 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 +}: + +rec { + + firefoxVersion = "3.6"; + + xulVersion = "1.9.2"; # this attribute is used by other packages + + + src = fetchurl { + url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; + sha1 = "33226b45a0bcd795545a980cab475c5492f0ea69"; + }; + + + commonConfigureFlags = + [ "--enable-optimize" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + #"--with-system-nss" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + "--enable-system-cairo" + #"--enable-system-sqlite" # <-- this seems to be discouraged + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + ]; + + + xulrunner = stdenv.mkDerivation { + 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 + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + ] ++ commonConfigureFlags; + + # !!! Temporary hack. + preBuild = '' + export NIX_ENFORCE_PURITY= + ''; + + installFlags = "SKIP_GRE_REGISTRATION=1"; + + postInstall = '' + # Fix some references to /bin paths in the Xulrunner shell script. + substituteInPlace $out/bin/xulrunner \ + --replace /bin/pwd "$(type -tP pwd)" \ + --replace /bin/ls "$(type -tP ls)" + + # Fix run-mozilla.sh search + libDir=$(cd $out/lib && ls -d xulrunner-[0-9]*) + echo libDir: $libDir + test -n "$libDir" + cd $out/bin + mv xulrunner ../lib/$libDir/ + + for i in $out/lib/$libDir/*; do + file $i; + if file $i | grep executable &>/dev/null; then + ln -s $i $out/bin + fi; + 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; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python + dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify + ]; + + propagatedBuildInputs = [xulrunner]; + + configureFlags = + [ "--enable-application=browser" + "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}" + ] + ++ commonConfigureFlags + ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding"; + + postInstall = '' + libDir=$(cd $out/lib && ls -d firefox-[0-9]*) + test -n "$libDir" + + ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $out/lib/$libDir/xulrunner + + # Register extensions etc. !!! is this needed anymore? + echo "running firefox -register..." + $out/bin/firefox -register + ''; # */ + + meta = { + description = "Mozilla Firefox - the browser, reloaded"; + homepage = http://www.mozilla.com/en-US/firefox/; + }; + + passthru = { + inherit gtk xulrunner nspr; + isFirefox3Like = true; + }; + }; +} diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 8b58fe857e9d..7bfd8c05104b 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -1,17 +1,17 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, dbus, dbus_glib, gtk, glib }: -stdenv.mkDerivation { - name = "libnotify-0.4.4"; - #builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "libnotify-0.4.5"; src = fetchurl { - url = http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.4.tar.gz; - sha256 = "2389a9b8220f776033f728a8d46352cfee5c8705066e34887bfb188f9f0d3856"; + url = "http://www.galago-project.org/files/releases/source/libnotify/${name}.tar.gz"; + sha256 = "1ndh7wpm9qh12vm5avjrq2xv1j681j9qq6j2fyj6a2shl67dp687"; }; - buildInputs = [ - pkgconfig dbus.libs dbus_glib gtk glib - ]; + buildInputs = [ pkgconfig dbus.libs dbus_glib gtk glib ]; - configureFlags=""; + meta = { + homepage = http://galago-project.org/; + description = "A library that sends desktop notifications to a notification daemon"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f911d100ab6..3e47fd057a5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6876,18 +6876,28 @@ let firefoxWrapper = firefox35Wrapper; - firefox35Pkgs = lowPrio (import ../applications/networking/browsers/firefox/3.5.nix { + firefox35Pkgs = import ../applications/networking/browsers/firefox/3.5.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs file alsaLib nspr nss; inherit (gtkLibs) gtk pango; inherit (gnome) libIDL; - }); + }; firefox35 = firefox35Pkgs.firefox; xulrunner35 = firefox35Pkgs.xulrunner; firefox35Wrapper = wrapFirefox firefox35 "firefox" ""; + firefox36Pkgs = import ../applications/networking/browsers/firefox/3.6.nix { + inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo + python dbus dbus_glib freetype fontconfig bzip2 xlibs file alsaLib + nspr nss libnotify; + inherit (gtkLibs) gtk pango; + inherit (gnome) libIDL; + }; + + firefox36Wrapper = lowPrio (wrapFirefox firefox36Pkgs.firefox "firefox" ""); + flac = import ../applications/audio/flac { inherit fetchurl stdenv libogg; }; @@ -6897,7 +6907,7 @@ let flashplayer9 = ( import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 { inherit fetchurl stdenv zlib alsaLib nss nspr fontconfig freetype expat; - inherit (xlibs) libX11 libXext libXrender libXt ; + inherit (xlibs) libX11 libXext libXrender libXt; inherit (gtkLibs) gtk glib pango atk; }); diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 4b1083b8e00e..8eaaeeed9435 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -156,7 +156,6 @@ in { feh = linux; file = all; findutils = all; - firefox35 = prio 150 linux; flex = all; flex2535 = all; fontforge = linux; @@ -455,6 +454,14 @@ in { jdee = linux; }; + firefox35Pkgs = { + firefox = prio 150 linux; + }; + + firefox36Pkgs = { + firefox = linux; + }; + gnome = { gnome_panel = linux; metacity = linux; From 2ae7ffd707585c9f60c3e5c761fe60238a07b09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 22 Jan 2010 08:55:09 +0000 Subject: [PATCH 50/63] foolscap: Disable checks. svn path=/nixpkgs/trunk/; revision=19608 --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca6ce2af42f4..feae42220102 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -80,6 +80,9 @@ rec { propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; + # For some reason "python setup.py test" doesn't work with Python 2.6. + doCheck = false; + meta = { homepage = http://foolscap.lothar.com/; From 2feb60424384c917fde753647d8aed39d3d4e7ef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Jan 2010 16:42:54 +0000 Subject: [PATCH 51/63] * A patch to ec2-bundle-image to make it work properly on read-only images (in the Nix store). svn path=/nixpkgs/trunk/; revision=19616 --- .../amazon-ec2-ami-tools/default.nix | 8 +++++ .../amazon-ec2-ami-tools/writable.patch | 33 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix index 58a833a33eae..e5114ddaed6a 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix @@ -10,6 +10,14 @@ stdenv.mkDerivation { sha256 = "2a7c848abea286234adcbb08938cfad50b844ecdfc7770e781289d9d396a1972"; }; + # Amazon EC2 requires that disk images are writable. If they're + # not, the VM immediately terminates with a mysterious + # "Server.InternalError" message. Since disk images generated in + # the Nix store are read-only, they must be made writable in the + # tarball uploaded to Amazon S3. So add a `--mode=0755' flag to the + # tar invocation. + patches = [ ./writable.patch ]; + installPhase = '' ensureDir $out diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch new file mode 100644 index 000000000000..c8d0597b4799 --- /dev/null +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch @@ -0,0 +1,33 @@ +diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb +*** ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb 2009-12-02 22:28:44.000000000 +0100 +--- ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb 2010-01-22 16:16:13.000000000 +0100 +*************** +*** 80,86 **** + # piped via several processes. The tee is used to allow a + # digest of the file to be calculated without having to re-read + # it from disk. +! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse + tar.add(File::basename( image_file ), File::dirname( image_file )) + openssl = EC2::Platform::Current::Constants::Utility::OPENSSL + pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) +--- 80,86 ---- + # piped via several processes. The tee is used to allow a + # digest of the file to be calculated without having to re-read + # it from disk. +! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable + tar.add(File::basename( image_file ), File::dirname( image_file )) + openssl = EC2::Platform::Current::Constants::Utility::OPENSSL + pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) +diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb +*** ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb 2009-12-02 22:28:44.000000000 +0100 +--- ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb 2010-01-22 16:16:11.000000000 +0100 +*************** +*** 31,36 **** +--- 31,37 ---- + def update; @options << '-u'; self; end + def sparse; @options << '-S'; self; end + def dereference; @options << '-h'; self; end ++ def writable; @options << '--mode=0755'; self; end + + def archive(filename) + filename = '-' if filename.nil? From 14ef5473591454db5a1ccd0e4b8049867f340343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 22 Jan 2010 17:00:44 +0000 Subject: [PATCH 52/63] Add GNU Gengetopt. svn path=/nixpkgs/trunk/; revision=19618 --- .../tools/misc/gengetopt/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/misc/gengetopt/default.nix diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix new file mode 100644 index 000000000000..7d5f47dba397 --- /dev/null +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "gengetopt-2.22.4"; + + src = fetchurl { + url = "mirror://gnu/gengetopt/${name}.tar.gz"; + sha256 = "08a4wmzvin8ljdgw2c0mcz654h4hpzam2p43hsf951c0xhj6ppsf"; + }; + + doCheck = true; + + meta = { + description = "GNU Gengetopt, a command-line option parser generator"; + + longDescription = + '' GNU Gengetopt program generates a C function that uses getopt_long + function to parse the command line options, to validate them and + fills a struct + ''; + + homepage = http://www.gnu.org/software/gengetopt/; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e47fd057a5f..cc321eb1d817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -720,6 +720,10 @@ let inherit fetchurl stdenv; }; + gengetopt = import ../development/tools/misc/gengetopt { + inherit fetchurl stdenv; + }; + getopt = import ../tools/misc/getopt { inherit fetchurl stdenv; }; From f8df44abb1a20e95b42686f58a829f5e3b99c581 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sat, 23 Jan 2010 16:02:45 +0000 Subject: [PATCH 53/63] update to 4.6.1. svn path=/nixpkgs/trunk/; revision=19631 --- pkgs/development/libraries/qt-4.6/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-4.6/default.nix b/pkgs/development/libraries/qt-4.6/default.nix index 284760537b4c..014ae8505c49 100644 --- a/pkgs/development/libraries/qt-4.6/default.nix +++ b/pkgs/development/libraries/qt-4.6/default.nix @@ -5,11 +5,11 @@ , buildDemos ? false, buildExamples ? false, keepDocumentation ? false}: stdenv.mkDerivation { - name = "qt-4.6.0"; + name = "qt-4.6.1"; src = fetchurl { - url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.0.tar.gz; - sha256 = "12c5s9am0wd7a9fkpgizssv21hq17vra46j4ply3ixi46f0rq9am"; + url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.1.tar.gz; + sha256 = "1id05qfxn5rxds3yngn3nbd7dnjmvmhzgjf0x568aii5iadv712c"; }; setupHook = ./setup-hook.sh; From 41030334dd1cf4336ffad18025bec377660b0806 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 24 Jan 2010 15:39:42 +0000 Subject: [PATCH 54/63] adding w3c CSS validator svn path=/nixpkgs/trunk/; revision=19635 --- pkgs/tools/misc/w3c-css-validator/default.nix | 79 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 84 insertions(+) create mode 100644 pkgs/tools/misc/w3c-css-validator/default.nix diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix new file mode 100644 index 000000000000..dd4e8bbfd9ae --- /dev/null +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -0,0 +1,79 @@ +args: with args; + +let + + inherit (args.stdenv) lib; + + sources = [ + (fetchurl { + name = "jigsaw_2.2.6.tar.gz"; + url="http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.gz"; + sha256 = "01cjpqjcs8gbvvzy0f488cb552f9b38hvwr97wydglrzndmcwypd"; + }) + (fetchurl { + name = "commons-collectionurl3.2.1-bin.tar.gz"; + url="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.1-bin.tar.gz"; + sha256 = "7843f8307495b2be446353b10c25218793b776fa3e22615a1f50f067d81713ce"; + }) + (fetchurl { + name = "commons-lang-2.4-bin.tar.gz"; + url="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.4-bin.tar.gz"; + sha256 = "0phwlgnvwj3n3j1aka2pkm0biacvgs72qc0ldir6s69i9qbv7rh0"; + }) + + (fetchurl { + name = "velocity-1.6.1.tar.gz"; + url="http://www.apache.org/dist/velocity/engine/1.6.1/velocity-1.6.1.tar.gz"; + sha256 = "125s8yp8whx947kahm902wc49ms44knxdj6yfskhpk0a8h0rz9jm"; + }) + (fetchurl { + name = "Xerces-J-bin.2.9.1.tar.gz"; + url="http://www.apache.org/dist/xerces/j/Xerces-J-bin.2.9.1.tar.gz"; + sha256 = "1xlrrznfgdars0a9m9z5k9q8arbqskdfdfjx4s0pp52wn3r0gbns"; + }) + ]; + +in + +stdenv.mkDerivation { + name = "w3c-css-validator"; + + # REGION AUTO UPDATE: { name="w3c-css-validator"; type="cvs"; cvsRoot=":pserver:anonymous:anonymous@dev.w3.org:/sources/public"; module="2002/css-validator"; } + src = sourceFromHead "w3c-css-validator-F_17-52-37.tar.gz" + (fetchurl { url = "http://mawercer.de/~nix/repos/w3c-css-validator-F_17-52-37.tar.gz"; sha256 = "b6f05d4812eaa464906d101242689effa8b5516d32d6420315740a77d8ee11fd"; }); + # END + + buildInputs = [apacheAnt]; + + # prepare target downloads dependency .tar.gz into tmp + # note: There is a .war as well which could be deployed to tomcat + installPhase = '' + cd css-validator + mkdir tmp + ${ lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) } + sed -i -e 's@@@' \ + -e '/dest="tmp\//d' \ + -e '/untar/d' \ + build.xml + ant + ensureDir $out/{bin,lib} + JAR=$out/lib/css-validator.jar + cat >> $out/bin/css-validator << EOF + #!/bin/sh + exec ${jre}/bin/java -jar $JAR "\$@" + EOF + chmod +x $out/bin/css-validator + cp css-validator.jar $out/lib + cp -r lib $out/lib/lib + ''; + + meta = { + description = "w3c CSS validator"; + homepage = http://dev.w3.org/cvsweb/2002/css-validator/; + # dependencies ship their own license files + # I think all .java files are covered by this license (?) + license = "w3c"; # http://www.w3.org/Consortium/Legal/ + maintainers = [args.lib.maintainers.marcweber]; + platforms = args.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc321eb1d817..aa6011c9d4b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1672,6 +1672,11 @@ let inherit fetchurl stdenv automake autoconf libtool; }; + w3cCSSValidator = import ../tools/misc/w3c-css-validator { + inherit fetchurl stdenv apacheAnt jre sourceFromHead; + tomcat = tomcat6; + }; + wdfs = import ../tools/filesystems/wdfs { inherit stdenv fetchurl neon fuse pkgconfig glib; }; From cb582a87c9be055ab89ce3ec7b45ed02de698fe3 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 24 Jan 2010 15:39:46 +0000 Subject: [PATCH 55/63] cabal: add noHadock env var. Eg haddock can't create docs for haskell-src-exts svn path=/nixpkgs/trunk/; revision=19636 --- pkgs/development/libraries/haskell/cabal/cabal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index f6220cb0fb3b..5b9ac3da9b6e 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -67,7 +67,7 @@ attrs : ./Setup build export GHC_PACKAGE_PATH=$(ghc-packages) - ./Setup haddock + [ -n "$noHadock" ] || ./Setup haddock eval "$postBuild" ''; From f6c80710f530f6ebc5a7e82cf718a2c8afffd84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 24 Jan 2010 19:07:16 +0000 Subject: [PATCH 56/63] Add SWEC (Simple Web Error Checker). svn path=/nixpkgs/trunk/; revision=19637 --- pkgs/tools/networking/swec/default.nix | 73 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 78 insertions(+) create mode 100644 pkgs/tools/networking/swec/default.nix diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix new file mode 100644 index 000000000000..4cb47fada061 --- /dev/null +++ b/pkgs/tools/networking/swec/default.nix @@ -0,0 +1,73 @@ +{ fetchurl, stdenv, makeWrapper, perl, LWP, URI, HTMLParser +, HTTPServerSimple, Parent }: + +stdenv.mkDerivation rec { + name = "swec-0.4"; + + src = fetchurl { + url = "http://random.zerodogg.org/files/${name}.tar.bz2"; + sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; + }; + + buildInputs = [ makeWrapper perl LWP URI HTMLParser ] + ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; + + configurePhase = + '' for i in swec tests/{runTests,testServer} + do + sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' + done + ''; + + buildPhase = "true"; + installPhase = + '' make install prefix="$out" + + ensureDir "$out/share/${name}" + cp -v default.sdf "$out/share/${name}" + sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" + + wrapProgram "$out/bin/swec" \ + --prefix PERL5LIB : \ + ${stdenv.lib.concatStringsSep ":" + (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} + ''; + + doCheck = true; + checkPhase = "make test"; + + meta = { + homepage = http://random.zerodogg.org/swec/; + + description = "Simple Web Error Checker (SWEC)"; + + longDescription = + '' SWEC (Simple Web Error Checker) is a program that automates testing + of dynamic websites. It parses each HTML file it finds for links, + and if those links are within the site specified (ie. local, not + external), it will check that page as well. In this respect it + works a lot like a crawler, in that it'll click on any link it finds + (more notes about this later). + + In addition to parsing and locating links, it will also parse the + pages looking for known errors and report those (such as Mason or + PHP errors), and will report if a page can not be read (by either + returning a 404, 500 or similar). + + Since you may often want SWEC to be logged in on your site, you have + to be careful. When logged in, SWEC will still click on all links + it finds, including things like 'join group' or 'delete account' + (though it has some magic trying to avoid the latter). Therefore it + is highly recommended that when you run SWEC as a logged-in user on + a site, use a test server, not the live one. + + Running SWEC on a live site without being logged in as a user is + perfectly fine, it won't do anything a normal crawler wouldn't do + (well, not exactly true, SWEC will ignore robots.txt). + ''; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa6011c9d4b4..3573abe85162 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1530,6 +1530,11 @@ let inherit fetchurl stdenv pam; }; + swec = import ../tools/networking/swec { + inherit fetchurl stdenv makeWrapper perl; + inherit (perlPackages) LWP URI HTMLParser HTTPServerSimple Parent; + }; + system_config_printer = import ../tools/misc/system-config-printer { inherit stdenv fetchurl perl perlXMLParser desktop_file_utils; }; From 6f462d2c7c77c96b7150091a160646071b3283b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 24 Jan 2010 21:32:09 +0000 Subject: [PATCH 57/63] Adding (quite blindly) some gnome packages to get gnucash built. svn path=/nixpkgs/trunk/; revision=19638 --- pkgs/applications/office/gnucash/default.nix | 4 ++-- pkgs/desktops/gnome-2.28/default.nix | 19 +++++++++++++++++-- .../platform/libgnomecups/default.nix | 13 +++++++++++++ .../platform/libgnomeprint/default.nix | 14 ++++++++++++++ .../platform/libgtkhtml/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix create mode 100644 pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix create mode 100644 pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 213e3fd0a457..94c4a3870078 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk -, libglade, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant +, libglade, libgnomeui, libgtkhtml, libgnomeprint, goffice, enchant , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2 , makeWrapper }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 gconf glib gtk - libglade libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant + libglade libgnomeui libgtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper ]; diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index dfc637551f85..40cf09636d08 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -11,8 +11,6 @@ rec { gnomeicontheme = gnome_icon_theme; # !!! Missing! Need to add these. - libgnomeprint = throw "libgnomeprint not implemented"; - libgtkhtml = throw "libgtkhtml not implemented"; vte = throw "vte not implemented"; gtksourceview_24 = gtksourceview; @@ -47,6 +45,23 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext; inherit (pkgs.gtkLibs) gtk; }; + + libgnomeprint = import ./platform/libgnomeprint { + inherit intltool libart_lgpl libgnomecups; + inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2 bison flex; + inherit (pkgs.gtkLibs) gtk; + }; + + libgnomecups = import ./platform/libgnomecups { + inherit intltool libart_lgpl; + inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; + inherit (pkgs.gtkLibs) gtk; + }; + + libgtkhtml = import ./platform/libgtkhtml { + inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; + inherit (pkgs.gtkLibs) gtk; + }; intltool = import ./platform/intltool { inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext; diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix new file mode 100644 index 000000000000..ec276578cb64 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgnomecups/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl }: + +stdenv.mkDerivation { + name = "libgnomecups-0.2.3"; + + src = fetchurl { + url = mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2; + sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; + }; + + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; + propagatedBuildInputs = [ libxml2 ]; +} diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix new file mode 100644 index 000000000000..3fa902c67e6f --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprint/default.nix @@ -0,0 +1,14 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2, intltool, libart_lgpl, libgnomecups, bison, +flex }: + +stdenv.mkDerivation { + name = "libgnomeprint-2.11.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.6.tar.bz2; + sha256 = "15c00ya2mx0x4mh8lyy3xg9dd66z5yjnax74bqx99zd90sar10fg"; + }; + + buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl libgnomecups bison flex ]; + propagatedBuildInputs = [ libxml2 ]; +} diff --git a/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix new file mode 100644 index 000000000000..6aab400c60ae --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgtkhtml/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, libxml2 }: + +stdenv.mkDerivation { + name = "libgtkhtml-2.11.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2; + sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; + }; + + buildInputs = [ pkgconfig gtk gettext ]; + propagatedBuildInputs = [ libxml2 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3573abe85162..b8ea3ae45312 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,7 +6983,7 @@ let gnucash = import ../applications/office/gnucash { inherit fetchurl stdenv pkgconfig libxml2 goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper; - inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml + inherit (gnome) gtk glib libglade libgnomeui libgtkhtml libgnomeprint; gconf = gnome.GConf; }; From 029cd0a21360417035adc9236a70410a35cf7da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 24 Jan 2010 22:07:53 +0000 Subject: [PATCH 58/63] Adding gtkhtml, another program needed for gnucash to build. I thought gtkhtml was not needed, and in my previous commit I removed it as a gnucash dependency. svn path=/nixpkgs/trunk/; revision=19639 --- pkgs/applications/office/gnucash/default.nix | 4 ++-- pkgs/desktops/gnome-2.28/default.nix | 7 +++++++ .../gnome-2.28/platform/gtkhtml/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 94c4a3870078..213e3fd0a457 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk -, libglade, libgnomeui, libgtkhtml, libgnomeprint, goffice, enchant +, libglade, libgnomeui, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant , gettext, intltool, perl, guile, slibGuile, swig, isocodes, bzip2 , makeWrapper }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 gconf glib gtk - libglade libgnomeui libgtkhtml libgnomeprint goffice enchant + libglade libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper ]; diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 40cf09636d08..cfc1b1579779 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -141,6 +141,13 @@ rec { # What name should we use?? gtkdoc = gtk_doc; + + gtkhtml = import ./platform/gtkhtml { + inherit (pkgs.gtkLibs) gtk; + inherit (pkgs) fetchurl stdenv pkgconfig intltool enchant isocodes; + inherit GConf gnome_icon_theme; + }; + # Freedesktop library startup_notification = import ./platform/startup-notification { diff --git a/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix new file mode 100644 index 000000000000..e4ced2247a5d --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/gtkhtml/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, pkgconfig, gtk, intltool, +GConf, enchant, isocodes, gnome_icon_theme }: + +stdenv.mkDerivation rec { + name = "gtkhtml-3.29.5"; + + src = fetchurl { + url = "mirror://gnome/sources/gtkhtml/3.29/${name}.tar.bz2"; + sha256 = "0abd91isqbriq9nclq14275v2xd0r9vrr3sxhxwxxp02m8gskwvd"; + }; + + buildInputs = [pkgconfig gtk intltool GConf enchant isocodes gnome_icon_theme ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8ea3ae45312..3573abe85162 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6983,7 +6983,7 @@ let gnucash = import ../applications/office/gnucash { inherit fetchurl stdenv pkgconfig libxml2 goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper; - inherit (gnome) gtk glib libglade libgnomeui libgtkhtml + inherit (gnome) gtk glib libglade libgnomeui libgtkhtml gtkhtml libgnomeprint; gconf = gnome.GConf; }; From 98de9a27c9f3be384371f350fedce25852e34a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 24 Jan 2010 22:15:23 +0000 Subject: [PATCH 59/63] Fixing the trunk evaluation svn path=/nixpkgs/trunk/; revision=19640 --- 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 3573abe85162..2cbcb8bfa1d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1678,7 +1678,7 @@ let }; w3cCSSValidator = import ../tools/misc/w3c-css-validator { - inherit fetchurl stdenv apacheAnt jre sourceFromHead; + inherit fetchurl stdenv apacheAnt jre sourceFromHead lib; tomcat = tomcat6; }; From 279ffaa62139d628abf1aa2a67d47aaadef4454d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 25 Jan 2010 10:34:47 +0000 Subject: [PATCH 60/63] Adding ecryptfs, and one of its dependencies: keyutils. (I have not tried whether they work) svn path=/nixpkgs/trunk/; revision=19645 --- pkgs/os-specific/linux/keyutils/default.nix | 25 +++++++++++++++++++++ pkgs/tools/security/ecryptfs/default.nix | 18 +++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++++++ 3 files changed, 51 insertions(+) create mode 100644 pkgs/os-specific/linux/keyutils/default.nix create mode 100644 pkgs/tools/security/ecryptfs/default.nix diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix new file mode 100644 index 000000000000..43c580c2528f --- /dev/null +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -0,0 +1,25 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "keyutils-1.2"; + + src = fetchurl { + url = http://people.redhat.com/dhowells/keyutils/keyutils-1.2.tar.bz2; + sha256 = "0gcv47crbaw6crgn02j1w75mknhnwgkhmfcmwq2qi9iwiwprnv9h"; + }; + + patchPhase = '' + sed -i -e "s, /etc, $out/etc," \ + -e "s, /bin, $out/bin," \ + -e "s, /sbin, $out/sbin," \ + -e "s, /lib, $out/lib," \ + -e "s,/usr,$out," \ + Makefile + ''; + + meta = { + homepage = http://people.redhat.com/dhowells/keyutils/; + description = "Tools used to control the Linux kernel key management system"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix new file mode 100644 index 000000000000..d1ed6f420ec3 --- /dev/null +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, fuse, python, perl, keyutils, pam, nss, nspr}: +stdenv.mkDerivation { + name = "ecryptfs-82"; + + src = fetchurl { + url = http://launchpad.net/ecryptfs/trunk/82/+download/ecryptfs-utils_82.orig.tar.gz; + sha256 = "1w3swispgp71prz8h56hqby2wwnvam5vllqvc69rn8cf605i69a6"; + }; + + NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + + buildInputs = [ python perl keyutils pam nss nspr ]; + + meta = { + description = "Enterprise-class stacked cryptographic filesystem"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cbcb8bfa1d0..02f376e9f71f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -612,6 +612,10 @@ let inherit fetchurl stdenv pkgconfig libuuid; }; + ecryptfs = import ../tools/security/ecryptfs { + inherit fetchurl stdenv fuse python perl keyutils pam nss nspr; + }; + enblendenfuse = import ../tools/graphics/enblend-enfuse { inherit fetchurl stdenv libtiff libpng lcms libxmi boost; }; @@ -5794,6 +5798,10 @@ let inherit fetchurl stdenv perl mktemp module_init_tools; }); + keyutils = import ../os-specific/linux/keyutils { + inherit fetchurl stdenv; + }; + libselinux = import ../os-specific/linux/libselinux { inherit fetchurl stdenv libsepol; }; From d1c34b3a4740138f833c803dfe2c2b0130fe045e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 25 Jan 2010 10:34:51 +0000 Subject: [PATCH 61/63] Updating chmlib. svn path=/nixpkgs/trunk/; revision=19646 --- pkgs/development/libraries/chmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 4f27a133c99e..319892237aeb 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "chmlib-0.39"; + name = "chmlib-0.40"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j"; + sha256 = "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l"; }; meta = { From 45aa4e2d7f27f593edb0ca6c4f0ee8cf7c4f1332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 25 Jan 2010 13:23:08 +0000 Subject: [PATCH 62/63] nix-prefetch-git: Add support for $NIX_PREFETCH_GIT_DEEP_CLONE. svn path=/nixpkgs/trunk/; revision=19648 --- pkgs/build-support/fetchgit/nix-prefetch-git | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 9207b84ddec1..63d756c5807c 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -60,6 +60,14 @@ checkout_ref(){ local hash="$1"; local ref="$2"; + if test -n "$NIX_PREFETCH_GIT_DEEP_CLONE"; then + # The caller explicitly asked for a deep clone. Deep clones + # allow "git describe" and similar tools to work. See + # http://thread.gmane.org/gmane.linux.distributions.nixos/3569 + # for a discussion. + return 1 + fi + if test -z "$ref"; then ref=$(ref_from_hash $hash); fi; From 10ca771495c7942bdc316db1ed043ce820808288 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Jan 2010 17:39:33 +0000 Subject: [PATCH 63/63] * Latest Nix. svn path=/nixpkgs/trunk/; revision=19653 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index bf1b00ace704..131dcfc77198 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.14pre19016"; + name = "nix-0.14pre19652"; src = fetchurl { - url = "http://hydra.nixos.org/build/191984/download/4/${name}.tar.bz2"; - sha256 = "998d550ff2420d3fe2fdac498136f228845064f4c70fe730410431985a1b5012"; + url = "http://hydra.nixos.org/build/259251/download/4/${name}.tar.bz2"; + sha256 = "e96d5e2cc7a86aea0d06f0d81395290d0c259004cc8a56d9eec203d5bb1a9d71"; }; buildInputs = [perl curl openssl];