From 9379c34b113d3fc72ce25b88f83fb349439aec97 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 31 Mar 2009 20:10:05 +0000 Subject: [PATCH 01/63] Renable preConfigure for kernel builder. Actually needed by custom kernel Linux kernel 2.6.29 (release) has a slightly changed Makefile. They now add the prefix for depmod. So in NixOS "make modules_install" fails on depmod. To fix it, our old '/-b \$(INSTALL_MOD_PATH) -r/d' should be replaced with '/-b \$(INSTALL_MOD_PATH)/d'. svn path=/nixpkgs/trunk/; revision=14811 --- pkgs/os-specific/linux/kernel/builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 246bafb748d..84064134d01 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -3,6 +3,10 @@ source $stdenv/setup configurePhase=configurePhase configurePhase() { + if test -n "$preConfigure"; then + eval "$preConfigure"; + fi + export INSTALL_PATH=$out export INSTALL_MOD_PATH=$out From a2803bc5c3ba9c77794cb42d8fbcdc136834ba97 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Apr 2009 05:42:07 +0000 Subject: [PATCH 02/63] added btrfs utilities svn path=/nixpkgs/trunk/; revision=14818 --- pkgs/os-specific/linux/btrfsprogs/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/btrfsprogs/default.nix diff --git a/pkgs/os-specific/linux/btrfsprogs/default.nix b/pkgs/os-specific/linux/btrfsprogs/default.nix new file mode 100644 index 00000000000..a8f2c7ea46f --- /dev/null +++ b/pkgs/os-specific/linux/btrfsprogs/default.nix @@ -0,0 +1,27 @@ +a : +let + fetchurl = a.fetchurl; + + version = a.lib.getAttr ["version"] "0.18" a; + buildInputs = with a; [ + zlib e2fsprogs acl + ]; +in +rec { + src = fetchurl { + url = "http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-${version}.tar.bz2"; + sha256 = "032g9lyrinpnrx4b8hs5i6qfbmv8x4ss02p26fgvk4zbc0slh7z8"; + }; + + inherit buildInputs; + configureFlags = []; + makeFlags = ["prefix=$out"]; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doMakeInstall"]; + + name = "btrfs-progs-" + version; + meta = { + description = "BTRFS utilities"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91cec7d28f6..1498aed49e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6637,6 +6637,10 @@ let inherit fetchurl stdenv autoconf automake; }; + btrfsProgs = builderDefsPackage (import ../os-specific/linux/btrfsprogs) { + inherit e2fsprogs zlib acl; + }; + cpufrequtils = import ../os-specific/linux/cpufrequtils { inherit fetchurl stdenv libtool gettext; glibc = stdenv.gcc.libc; From 829f95f8366b566d0111961dd2dff07ef0e36a7d Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 1 Apr 2009 15:12:22 +0000 Subject: [PATCH 03/63] Added PAM support for KDE login manager svn path=/nixpkgs/trunk/; revision=14824 --- pkgs/desktops/kde-4.2/base-workspace/default.nix | 4 ++-- pkgs/desktops/kde-4.2/default.nix | 4 ++-- pkgs/development/libraries/ConsoleKit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix index a73b8d3b7c5..843b3ad24e2 100644 --- a/pkgs/desktops/kde-4.2/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, perl, python, +{stdenv, fetchurl, cmake, perl, python, pam, ConsoleKit, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver, lm_sensors, libxklavier, libusb, pthread_stubs, boost, @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0"; }; CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake perl python qt4 /*sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc + buildInputs = [ cmake perl python qt4 pam ConsoleKit /*sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ]; } diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix index 364c5a28a8b..4e24259d874 100644 --- a/pkgs/desktops/kde-4.2/default.nix +++ b/pkgs/desktops/kde-4.2/default.nix @@ -54,8 +54,8 @@ rec { ### BASE kdebase_workspace = import ./base-workspace { - inherit (pkgs) stdenv fetchurl cmake qt4 perl python sip pyqt4; - inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost; + inherit (pkgs) stdenv fetchurl cmake qt4 perl python pam sip pyqt4; + inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost ConsoleKit; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz; diff --git a/pkgs/development/libraries/ConsoleKit/default.nix b/pkgs/development/libraries/ConsoleKit/default.nix index 743b3c1756c..d84d12546af 100644 --- a/pkgs/development/libraries/ConsoleKit/default.nix +++ b/pkgs/development/libraries/ConsoleKit/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus_glib, zlib, glib, libX11}: +{stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, libX11}: stdenv.mkDerivation { name = "ConsoleKit-0.3.0"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = http://people.freedesktop.org/~mccann/dist/ConsoleKit-0.3.0.tar.bz2; md5 = "43b02a52212330b54cfb34c4044d9ce0"; }; - buildInputs = [ pkgconfig dbus_glib zlib glib libX11 ]; + buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1498aed49e4..33a19587c27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2803,7 +2803,7 @@ let }; ConsoleKit = import ../development/libraries/ConsoleKit { - inherit stdenv fetchurl pkgconfig dbus_glib zlib; + inherit stdenv fetchurl pkgconfig dbus_glib zlib pam; inherit (gtkLibs) glib; inherit (xlibs) libX11; }; From 25f22ceed6272d22f6cd62e49d3046c65a03ee92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 1 Apr 2009 17:31:44 +0000 Subject: [PATCH 04/63] Add GNU Dico, a DICT server and client. svn path=/nixpkgs/trunk/; revision=14825 --- pkgs/servers/dico/default.nix | 43 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/servers/dico/default.nix diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix new file mode 100644 index 00000000000..0be61a1a558 --- /dev/null +++ b/pkgs/servers/dico/default.nix @@ -0,0 +1,43 @@ +{ fetchurl, stdenv, libtool, gettext, zlib, readline, guile, python }: + +stdenv.mkDerivation rec { + name = "dico-2.0"; + + src = fetchurl { + url = "mirror://gnu/dico/${name}.tar.gz"; + sha256 = "03cpg16jbsv5xh9mvyjj7myvpdpb82354a1yjrhcy0k5w8faa9kv"; + }; + + # XXX: Add support for GNU SASL. + buildInputs = [ libtool gettext zlib readline guile python ]; + + doCheck = true; + + meta = { + description = "GNU Dico, a flexible dictionary server and client implementing RFC 2229"; + + longDescription = '' + GNU Dico is a flexible modular implementation of DICT server + (RFC 2229). In contrast to another existing servers, it does + not depend on particular database format, instead it handles + database accesses using loadable modules. + + The package includes several loadable modules for interfacing + with various database formats, among them a module for dict.org + databases and a module for transparently accessing Wikipedia or + Wiktionary sites as a dictionary database. + + New modules can easily be written in C, Guile or Python. The + module API is mature and well documented. + + A web interface serving several databases is available. + + The package also includes a console client program for querying + remote dictionary servers. + ''; + + homepage = http://www.gnu.org/software/dico/; + + license = "GPLv3+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33a19587c27..bcdcac58298 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6410,6 +6410,10 @@ let inherit openssl libtool; }; + dico = import ../servers/dico { + inherit fetchurl stdenv libtool gettext zlib readline guile python; + }; + dict = composedArgsAndFun (selectVersion ../servers/dict "1.9.15") { inherit builderDefs which bison; flex=flex2534; From c37d211182e4ade7534e06e20dd19befe53ffdbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 1 Apr 2009 20:32:04 +0000 Subject: [PATCH 05/63] Build GNU Dico. svn path=/nixpkgs/trunk/; revision=14827 --- 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 73ecb5660a7..baf022575fc 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -89,6 +89,7 @@ in { cups = linux; db4 = all; dhcp = linux; + dico = linux; dietlibc = linux; diffutils = all; docbook5 = all; From 042e3eddd97d01c8b79fbe8b8dcb137d24a6076a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 2 Apr 2009 12:18:53 +0000 Subject: [PATCH 06/63] Updated Mercurial svn path=/nixpkgs/trunk/; revision=14831 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 836232a688b..579a4ae6600 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -3,8 +3,8 @@ args: with args; stdenv.mkDerivation { name = "mercurial-1.0.2"; src = fetchurl { - url = http://www.selenic.com/mercurial/release/mercurial-1.0.2.tar.gz; - sha256 = "0fj2aakband855684q76h7zl328iq8i6l81c2k64hy5m0if9hvgr"; + url = http://www.selenic.com/mercurial/release/mercurial-1.2.1.tar.gz; + sha256 = "0zmldqvl6lbg40d4jbx6hm8790bi8h4dfmawinvq5gfgpij78603"; }; inherit python; # pass it so that the same version can be used in hg2git From 4391a3a849958be02199402811ef73edb7005296 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 2 Apr 2009 14:00:08 +0000 Subject: [PATCH 07/63] Build lndir svn path=/nixpkgs/trunk/; revision=14836 --- 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 baf022575fc..0b4d1005680 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -373,6 +373,7 @@ in { fontmiscmisc = linux; iceauth = linux; libX11 = linux; + lndir = all; setxkbmap = linux; xauth = linux; xf86inputkeyboard = linux; From 3d1b6f30347a2116ebdf18ac97a83992388b9c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 2 Apr 2009 14:30:34 +0000 Subject: [PATCH 08/63] Add pthread man pages from LinuxThreads. svn path=/nixpkgs/trunk/; revision=14837 --- .../pthread-man-pages/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/data/documentation/pthread-man-pages/default.nix diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix new file mode 100644 index 00000000000..bd29b0384a1 --- /dev/null +++ b/pkgs/data/documentation/pthread-man-pages/default.nix @@ -0,0 +1,47 @@ +/* Pthread man pages from LinuxThreads. + + Some of these pages are superseded by those in the `man-pages' + package, but not all. Like other distros (e.g., Debian's + `glibc-doc' package) we take man pages from LinuxThreads so that + we can cover pretty much all of pthreads. */ + +{ fetchurl, stdenv, perl }: + +let version = "2.3.6"; +in + stdenv.mkDerivation rec { + name = "pthread-man-pages-${version}"; + + src = fetchurl { + url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2"; + sha256 = "0f56msimlyfmragqa69jd39rb47h09l9b0agn67k1rfi8yic8fvc"; + }; + + buildInputs = [ perl ]; + + unpackPhase = '' + echo "unpacking to \`${name}'" + mkdir "${name}" + cd "${name}" + tar xjvf "$src" + ''; + + patchPhase = '' + ensureDir "$out/share/man/man3" + + sed -i "linuxthreads/man/Makefile" \ + -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ; + s|3thr|3|g" + ''; + + preConfigure = "cd linuxthreads/man"; + + postInstall = '' + chmod a-x $out/share/man/man3/*.3 + ''; + + meta = { + description = "POSIX threads (pthreads) manual pages from LinuxThreads"; + homepage = http://www.gnu.org/software/libc/; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcdcac58298..8c9d21b84ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7556,6 +7556,10 @@ let inherit fetchurl stdenv unzip; }; + pthreadmanpages = lowPrio (import ../data/documentation/pthread-man-pages { + inherit fetchurl stdenv perl; + }); + shared_mime_info = import ../data/misc/shared-mime-info { inherit fetchurl stdenv pkgconfig gettext intltool libxml2; inherit (gtkLibs) glib; From 758fb873675f3276142899d556df9569a5f85573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 2 Apr 2009 14:34:54 +0000 Subject: [PATCH 09/63] Build `pthread-man-pages'. svn path=/nixpkgs/trunk/; revision=14838 --- 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 0b4d1005680..c05140a86a1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -225,6 +225,7 @@ in { portmap = linux; postgresql = all; procps = linux; + pthreadmanpages = all; python = allBut "i686-cygwin"; pythonFull = linux; qt3 = allBut "i686-cygwin"; From 987156abfd85724898cd857e012dd6baaba4937e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 2 Apr 2009 15:02:49 +0000 Subject: [PATCH 10/63] KDM fixes svn path=/nixpkgs/trunk/; revision=14840 --- pkgs/desktops/kde-4.2/base-workspace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix index 843b3ad24e2..585cf5bfc54 100644 --- a/pkgs/desktops/kde-4.2/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0"; }; CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake perl python qt4 pam ConsoleKit /*sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc + buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ]; } From 19ac94dee3b0914ac3522e9ae1bddf64ddafabaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 2 Apr 2009 15:20:19 +0000 Subject: [PATCH 11/63] Adding cinepaint 0.22.1 and as a dependency, also fltk 1.1.9 svn path=/nixpkgs/trunk/; revision=14841 --- .../graphics/cinepaint/default.nix | 39 ++++++++++++++++ .../graphics/cinepaint/fltk.patch | 13 ++++++ pkgs/development/libraries/fltk/fltk11.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 18 ++++++++ 4 files changed, 115 insertions(+) create mode 100644 pkgs/applications/graphics/cinepaint/default.nix create mode 100644 pkgs/applications/graphics/cinepaint/fltk.patch create mode 100644 pkgs/development/libraries/fltk/fltk11.nix diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix new file mode 100644 index 00000000000..f3a2c980ab7 --- /dev/null +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, gtk, freetype, fontconfig, lcms, fltk, + flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, + perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, + glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, + mesa, libXext, libXpm, libXxf86vm } : + +stdenv.mkDerivation { + name = "cinepaint-0.22-1"; + + src = fetchurl { + url = mirror://sourceforge/cinepaint/cinepaint-0.22-1.tar.gz; + sha256 = "bb08a9210658959772df12408769d660999ede168b7431514e1f3cead07c0fea"; + }; + + buildInputs = [ pkgconfig gtk freetype fontconfig lcms fltk flex libtiff + libjpeg libpng libexif zlib perl libX11 perlXMLParser python pygtk gettext + intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu + openexr mesa libXext libXpm libXxf86vm ]; + + patches = [ ./fltk.patch ]; + + prePatch = '' + sed -i -e s@/usr/X11R6/bin/makedepend@${makedepend}/bin/makedepend@ \ + -e s@/usr/X11R6/include/X11/extensions/xf86vmode@${xf86vidmodeproto}/include/X11/extensions/xf86vmode@ \ + -e s@/usr/X11R6/include/X11/Xlib.h@${libX11}/include/X11/Xlib.h@ \ + -e s@/usr/X11R6/include/X11/extensions/Xinerama.h@${xineramaproto}/include/X11/extensions/Xinerama.h@ \ + -e s@/usr/X11R6/lib/libfreetype.a@${freetype}/lib/libfreetype.a@ \ + plug-ins/icc_examin/icc_examin/configure \ + plug-ins/icc_examin/icc_examin/configure.sh + ''; + + configureFlags = [ "--disable-print" "--enable-gtk2" ]; + + meta = { + homepage = http://www.cinepaint.org/; + license = "free"; + description = "Image editor which supports images over 8bpp and ICC profiles"; + }; +} diff --git a/pkgs/applications/graphics/cinepaint/fltk.patch b/pkgs/applications/graphics/cinepaint/fltk.patch new file mode 100644 index 00000000000..2b007a7a65a --- /dev/null +++ b/pkgs/applications/graphics/cinepaint/fltk.patch @@ -0,0 +1,13 @@ +diff --git a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp +index b507454..85f4441 100644 +--- a/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp ++++ b/plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp +@@ -226,7 +226,7 @@ namespace icc_examin_ns { + + int awake(void) + { +- Fl::awake(0); ++ Fl::awake((void *)0); + return 0; + } + int leerWait(void) { return 0; } diff --git a/pkgs/development/libraries/fltk/fltk11.nix b/pkgs/development/libraries/fltk/fltk11.nix new file mode 100644 index 00000000000..4832410102d --- /dev/null +++ b/pkgs/development/libraries/fltk/fltk11.nix @@ -0,0 +1,45 @@ +args: with args; +let inherit (args.composableDerivation) composableDerivation edf; in +composableDerivation {} { + + name = "fltk-1.1.9"; + + src = args.fetchurl { + url = http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.9/fltk-1.1.9-source.tar.bz2; + sha256 = "1ppdqc4vg3g11px4dxm6czxi4sswfxs485q44nrr5ji0galsbjzs"; + }; + + propagatedBuildInputs=[x11 inputproto libXi freeglut]; + + buildInputs = [ args.pkgconfig ]; + + flags = + # this could be tidied up (?).. eg why does it require freeglut without glSupport? + edf { name = "cygwin"; } # use the CygWin libraries default=no + // edf { name = "debug"; } # turn on debugging default=no + // edf { name = "gl"; enable = { buildInputs = [ mesa ]; }; } # turn on OpenGL support default=yes + // edf { name = "shared"; } # turn on shared libraries default=no + // edf { name = "threads"; } # enable multi-threading support + // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) + // edf { name = "largefile"; } # omit support for large files + // edf { name = "localjpeg"; disable = { buildInputs = [libjpeg]; }; } # use local JPEG library, default=auto + // edf { name = "localzlib"; disable = { buildInputs = [zlib]; }; } # use local ZLIB library, default=auto + // edf { name = "localpng"; disable = { buildInputs = [libpng]; }; } # use local PNG library, default=auto + // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no + // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no + // edf { name = "xdbe"; }; # turn on Xdbe support default=no + cfg = { + largefileSupport = true; # is default + glSupport = true; # doesn't build without it. Why? + localjpegSupport = false; + localzlibSupport = false; + localpngSupport = false; + sharedSupport = true; + threadsSupport = true; + }; + + meta = { + description = "a C++ cross platform lightweight gui library binding"; + homepage = http://www.fltk.org; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c9d21b84ea..119e4399ad7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2921,6 +2921,13 @@ let singlePrecision = true; }; + fltk11 = (import ../development/libraries/fltk/fltk11.nix) { + inherit composableDerivation x11 lib pkgconfig freeglut; + inherit fetchurl stdenv mesa mesaHeaders libpng libjpeg zlib ; + inherit (xlibs) inputproto libXi libXinerama libXft; + flags = [ "useNixLibs" "threads" "shared" "gl" ]; + }; + fltk20 = (import ../development/libraries/fltk) { inherit composableDerivation x11 lib pkgconfig freeglut; inherit fetchurl stdenv mesa mesaHeaders libpng libjpeg zlib ; @@ -7881,6 +7888,17 @@ let inherit fetchurl stdenv emacs texinfo ctags; }; + cinepaint = import ../applications/graphics/cinepaint { + inherit stdenv fetchurl pkgconfig freetype fontconfig lcms flex libtiff + libjpeg libpng libexif zlib perl mesa perlXMLParser python pygtk gettext + intltool babl gegl; + inherit (xlibs) makedepend libX11 xf86vidmodeproto xineramaproto libXmu + libXext libXpm libXxf86vm; + inherit (gtkLibs) gtk glib; + openexr = openexr_1_6_1; + fltk = fltk11; + }; + codeville = builderDefsPackage (selectVersion ../applications/version-management/codeville "0.8.0") { inherit makeWrapper; python = pythonFull; From b5dccb39e9ca18b84a156ef3e15e6411e8017788 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 3 Apr 2009 09:22:20 +0000 Subject: [PATCH 12/63] meta-build-env svn path=/nixpkgs/trunk/; revision=14850 --- 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 119e4399ad7..69496f0cb73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1997,6 +1997,10 @@ let inherit fetchurl stdenv pkgconfig aterm getopt jdk; }; + metaBuildEnv = import ../development/compilers/meta-environment/meta-build-env { + inherit fetchurl stdenv ; + }; + swiProlog = composedArgsAndFun (selectVersion ../development/compilers/swi-prolog "5.6.51") { inherit fetchurl stdenv; }; From 6a469ac20a4990c67bd1dff0e430d90eef7813eb Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 3 Apr 2009 09:34:49 +0000 Subject: [PATCH 13/63] meta-build-env svn path=/nixpkgs/trunk/; revision=14851 --- .../compilers/meta-environment/meta-build-env/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 pkgs/development/compilers/meta-environment/meta-build-env/default.nix diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix new file mode 100644 index 00000000000..00d3075df3c --- /dev/null +++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -0,0 +1,7 @@ +{stdenv, fetchurl}: stdenv.mkDerivation { + name = "meta-build-env-0.1"; + src = fetchurl { + url = http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz ; + md5 = "827b54ace4e2d3c8e7605ea149b34293"; + }; +} From 75e277ac15457d53c90c4edbf6ff1366329d8ed9 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Fri, 3 Apr 2009 10:02:30 +0000 Subject: [PATCH 14/63] make samba built the pam_smbpass.so file by default svn path=/nixpkgs/trunk/; revision=14852 --- pkgs/servers/samba/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 708947154e6..0e92992c372 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { --with-pam --with-smbmount --with-aio-support + --with-pam_smbpass ${if (stdenv.gcc.libc != null) then "--with-libiconv=${stdenv.gcc.libc}" else ""} ''; } From d6ca7f9e131b13cf22b4f5e5e213c304592c2cba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 12:21:06 +0000 Subject: [PATCH 15/63] * Doh. svn path=/nixpkgs/trunk/; revision=14854 --- pkgs/top-level/make-tarball.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 11c12378ba8..0c138545f72 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -40,8 +40,9 @@ releaseTools.makeSourceTarball { checkPhase = '' # Run the regression tests in `lib'. - if test "$(nix-instantiate --eval-only --strict tests.nix)" != "List([])"; then - echo "regression tests for `lib' failed" + res="$(nix-instantiate --eval-only --strict tests.nix)" + if test "$res" != "List([])"; then + echo "regression tests for lib failed, got: $res" exit 1 fi From 1de497f1cb4d1e1262f90f2c502398ac45fa45d4 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 3 Apr 2009 12:25:57 +0000 Subject: [PATCH 16/63] Upgraded to KDE 4.2.2 and Qt-4.5.0 svn path=/nixpkgs/trunk/; revision=14855 --- pkgs/desktops/kde-4.2/admin/default.nix | 6 +++--- pkgs/desktops/kde-4.2/artwork/default.nix | 6 +++--- pkgs/desktops/kde-4.2/base-runtime/default.nix | 6 +++--- pkgs/desktops/kde-4.2/base-workspace/default.nix | 6 +++--- pkgs/desktops/kde-4.2/base/default.nix | 6 +++--- pkgs/desktops/kde-4.2/bindings/default.nix | 6 +++--- pkgs/desktops/kde-4.2/edu/default.nix | 6 +++--- pkgs/desktops/kde-4.2/games/default.nix | 6 +++--- pkgs/desktops/kde-4.2/graphics/default.nix | 6 +++--- pkgs/desktops/kde-4.2/libs/default.nix | 6 +++--- pkgs/desktops/kde-4.2/multimedia/default.nix | 6 +++--- pkgs/desktops/kde-4.2/network/default.nix | 6 +++--- pkgs/desktops/kde-4.2/pim/default.nix | 6 +++--- pkgs/desktops/kde-4.2/pimlibs/default.nix | 6 +++--- pkgs/desktops/kde-4.2/plasma-addons/default.nix | 6 +++--- pkgs/desktops/kde-4.2/sdk/default.nix | 6 +++--- pkgs/desktops/kde-4.2/toys/default.nix | 6 +++--- pkgs/desktops/kde-4.2/utils/default.nix | 6 +++--- pkgs/desktops/kde-4.2/webdev/default.nix | 6 +++--- pkgs/development/libraries/qt-4/default.nix | 4 ++-- 20 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix index a741525b071..b51f6cf5976 100644 --- a/pkgs/desktops/kde-4.2/admin/default.nix +++ b/pkgs/desktops/kde-4.2/admin/default.nix @@ -3,10 +3,10 @@ kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeadmin-4.2.1"; + name = "kdeadmin-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdeadmin-4.2.1.tar.bz2; - sha1 = "888203103fe86010461b1e38d51ba9a20f3250e8"; + url = mirror://kde/stable/4.2.2/src/kdeadmin-4.2.2.tar.bz2; + sha1 = "3bf8f689d6fcafcfdfb2bea4c6003e56c80c4601"; }; builder = ./builder.sh; inherit system_config_printer; diff --git a/pkgs/desktops/kde-4.2/artwork/default.nix b/pkgs/desktops/kde-4.2/artwork/default.nix index e1cc3f4b441..4fd38cc22c5 100644 --- a/pkgs/desktops/kde-4.2/artwork/default.nix +++ b/pkgs/desktops/kde-4.2/artwork/default.nix @@ -2,10 +2,10 @@ kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: stdenv.mkDerivation { - name = "kdeartwork-4.2.1"; + name = "kdeartwork-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdeartwork-4.2.1.tar.bz2; - sha1 = "02bd99ca5cf303bdeb991b3e85b45dfc4e69e0bc"; + url = mirror://kde/stable/4.2.2/src/kdeartwork-4.2.2.tar.bz2; + sha1 = "306eede44f62fdef0892ad40988ada51f06bfa73"; }; buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; diff --git a/pkgs/desktops/kde-4.2/base-runtime/default.nix b/pkgs/desktops/kde-4.2/base-runtime/default.nix index 5728b206c92..4cf2c7413bc 100644 --- a/pkgs/desktops/kde-4.2/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.2/base-runtime/default.nix @@ -2,10 +2,10 @@ automoc4, phonon, strigi, soprano, cluceneCore}: stdenv.mkDerivation { - name = "kdebase-runtime-4.2.1"; + name = "kdebase-runtime-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdebase-runtime-4.2.1.tar.bz2; - sha1 = "e80d1882d36e4c9737e80fcb5080bc683403ddb5"; + url = mirror://kde/stable/4.2.2/src/kdebase-runtime-4.2.2.tar.bz2; + sha1 = "0b100ceb77fa2e8cbe5303f7fea28b02117c7658"; }; /* CLUCENE_HOME=cluceneCore;*/ buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix index 585cf5bfc54..1038df9b2c6 100644 --- a/pkgs/desktops/kde-4.2/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix @@ -5,10 +5,10 @@ automoc4, phonon, strigi, soprano, qimageblitz}: stdenv.mkDerivation { - name = "kdebase-workspace-4.2.1"; + name = "kdebase-workspace-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdebase-workspace-4.2.1.tar.bz2; - sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0"; + url = mirror://kde/stable/4.2.2/src/kdebase-workspace-4.2.2.tar.bz2; + sha1 = "9397220827f378cedf38e800e06e9ca8b1a1235d"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake perl python qt4 pam /*ConsoleKit sip pyqt4*/ kdelibs kdepimlibs /*kdebindings*/ pthread_stubs boost libusb stdenv.gcc.libc diff --git a/pkgs/desktops/kde-4.2/base/default.nix b/pkgs/desktops/kde-4.2/base/default.nix index 901145b5b48..0f6d2e91259 100644 --- a/pkgs/desktops/kde-4.2/base/default.nix +++ b/pkgs/desktops/kde-4.2/base/default.nix @@ -2,10 +2,10 @@ automoc4, phonon, strigi, qimageblitz, soprano}: stdenv.mkDerivation { - name = "kdebase-4.2.1"; + name = "kdebase-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdebase-4.2.1.tar.bz2; - sha1 = "c500024294a7621d176d26bdabdd138d18ec827d"; + url = mirror://kde/stable/4.2.2/src/kdebase-4.2.2.tar.bz2; + sha1 = "10309413767b856d303102155911518519e5b57e"; }; buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394 automoc4 phonon strigi qimageblitz soprano ]; diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix index 712f321bef2..7364ba5d415 100644 --- a/pkgs/desktops/kde-4.2/bindings/default.nix +++ b/pkgs/desktops/kde-4.2/bindings/default.nix @@ -5,10 +5,10 @@ # some bindings are even broken. stdenv.mkDerivation { - name = "kdebindings-4.2.1"; + name = "kdebindings-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdebindings-4.2.1.tar.bz2; - sha1 = "96353bb3269a7ca37ff31487a0fb7a9c25958963"; + url = mirror://kde/stable/4.2.2/src/kdebindings-4.2.2.tar.bz2; + sha1 = "1d5eb1bb92f68172d0a0345070b1120c2601ab8c"; }; builder = ./builder.sh; buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4 diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix index 5336ecccfb6..b70cf3613ca 100644 --- a/pkgs/desktops/kde-4.2/edu/default.nix +++ b/pkgs/desktops/kde-4.2/edu/default.nix @@ -3,10 +3,10 @@ kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeedu-4.2.1"; + name = "kdeedu-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdeedu-4.2.1.tar.bz2; - sha1 = "f2381f33f6586b950e925423d135b9e66b7bf428"; + url = mirror://kde/stable/4.2.2/src/kdeedu-4.2.2.tar.bz2; + sha1 = "c6aaf3639188e66d14da0d404a9b5d5fb95e7df5"; }; buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/games/default.nix b/pkgs/desktops/kde-4.2/games/default.nix index cc099d9cb70..29ba3e9a26f 100644 --- a/pkgs/desktops/kde-4.2/games/default.nix +++ b/pkgs/desktops/kde-4.2/games/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}: stdenv.mkDerivation { - name = "kdegames-4.2.1"; + name = "kdegames-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdegames-4.2.1.tar.bz2; - sha1 = "dee8a0fece054bc3b6234fa088ca16b8f5f87795"; + url = mirror://kde/stable/4.2.2/src/kdegames-4.2.2.tar.bz2; + sha1 = "ffd4dde8c10f14de9da4e44d22b2ac19c8bfce9b"; }; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ]; } diff --git a/pkgs/desktops/kde-4.2/graphics/default.nix b/pkgs/desktops/kde-4.2/graphics/default.nix index e468bded53f..678eb67f98e 100644 --- a/pkgs/desktops/kde-4.2/graphics/default.nix +++ b/pkgs/desktops/kde-4.2/graphics/default.nix @@ -3,10 +3,10 @@ kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: stdenv.mkDerivation { - name = "kdegraphics-4.2.1"; + name = "kdegraphics-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdegraphics-4.2.1.tar.bz2; - sha1 = "5c21e016c75a79a9499aac26ea1240d6024e700e"; + url = mirror://kde/stable/4.2.2/src/kdegraphics-4.2.2.tar.bz2; + sha1 = "cb7bda631b6e5b1866b07c622c7dc54771a87760"; }; buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib stdenv.gcc.libc libXxf86vm diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix index 881ca1b4f85..57893cedcfb 100644 --- a/pkgs/desktops/kde-4.2/libs/default.nix +++ b/pkgs/desktops/kde-4.2/libs/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation { - name = "kdelibs-4.2.1"; + name = "kdelibs-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdelibs-4.2.1.tar.bz2; - sha1 = "d2214b9864b64e4a8382a9f593d082c801c58571"; + url = mirror://kde/stable/4.2.2/src/kdelibs-4.2.2.tar.bz2; + sha1 = "7769bac38b27d8726c27eb3bb0b79f370f77457f"; }; buildInputs = [ diff --git a/pkgs/desktops/kde-4.2/multimedia/default.nix b/pkgs/desktops/kde-4.2/multimedia/default.nix index 77f7164e82d..d7c78330ff1 100644 --- a/pkgs/desktops/kde-4.2/multimedia/default.nix +++ b/pkgs/desktops/kde-4.2/multimedia/default.nix @@ -2,10 +2,10 @@ kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdemultimedia-4.2.1"; + name = "kdemultimedia-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdemultimedia-4.2.1.tar.bz2; - sha1 = "5382c963fae0ca6528c326b73234525e170a5c2e"; + url = mirror://kde/stable/4.2.2/src/kdemultimedia-4.2.2.tar.bz2; + sha1 = "bacbf584cd38be5234bb5a4419a275c6f4164721"; }; buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/network/default.nix b/pkgs/desktops/kde-4.2/network/default.nix index 451b50ad69e..bbb90648dd7 100644 --- a/pkgs/desktops/kde-4.2/network/default.nix +++ b/pkgs/desktops/kde-4.2/network/default.nix @@ -4,10 +4,10 @@ kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}: stdenv.mkDerivation { - name = "kdenetwork-4.2.1"; + name = "kdenetwork-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdenetwork-4.2.1.tar.bz2; - sha1 = "d6d730c167cd72d43904715014b2adc8f7d5bc1e"; + url = mirror://kde/stable/4.2.2/src/kdenetwork-4.2.2.tar.bz2; + sha1 = "335a09012602400318d6e703fdcc390f5a2f7761"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn diff --git a/pkgs/desktops/kde-4.2/pim/default.nix b/pkgs/desktops/kde-4.2/pim/default.nix index 8f36dac341b..b112d3af5ed 100644 --- a/pkgs/desktops/kde-4.2/pim/default.nix +++ b/pkgs/desktops/kde-4.2/pim/default.nix @@ -3,10 +3,10 @@ kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: stdenv.mkDerivation { - name = "kdepim-4.2.1"; + name = "kdepim-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdepim-4.2.1.tar.bz2; - sha1 = "be97f4d34eb19b08c30988e07a75c24d5ccad08c"; + url = mirror://kde/stable/4.2.2/src/kdepim-4.2.2.tar.bz2; + sha1 = "abd6d9e7777cf192aa7919dce56644e942d8e2e9"; }; CMAKE_PREFIX_PATH=kdepimlibs; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.2/pimlibs/default.nix b/pkgs/desktops/kde-4.2/pimlibs/default.nix index 134e01aa00e..6231c838f35 100644 --- a/pkgs/desktops/kde-4.2/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.2/pimlibs/default.nix @@ -2,10 +2,10 @@ kdelibs, automoc4, phonon, akonadi}: stdenv.mkDerivation { - name = "kdepimlibs-4.2.1"; + name = "kdepimlibs-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdepimlibs-4.2.1.tar.bz2; - sha1 = "150228037fcd740fec0a490149cd1980ddb8fb57"; + url = mirror://kde/stable/4.2.2/src/kdepimlibs-4.2.2.tar.bz2; + sha1 = "895ae97d393ec47386de71bbe76fb5a685d3850f"; }; buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap kdelibs automoc4 phonon akonadi ]; diff --git a/pkgs/desktops/kde-4.2/plasma-addons/default.nix b/pkgs/desktops/kde-4.2/plasma-addons/default.nix index ad9b1633772..18d2d9e04a1 100644 --- a/pkgs/desktops/kde-4.2/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.2/plasma-addons/default.nix @@ -2,10 +2,10 @@ kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeplasma-addons-4.2.1"; + name = "kdeplasma-addons-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdeplasma-addons-4.2.1.tar.bz2; - sha1 = "8e164a8e1476862392371f765372c2e168895d55"; + url = mirror://kde/stable/4.2.2/src/kdeplasma-addons-4.2.2.tar.bz2; + sha1 = "6b4afe369597b8cdeff05e1b0feda0d48aea59d6"; }; inherit kdebase_workspace; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.2/sdk/default.nix b/pkgs/desktops/kde-4.2/sdk/default.nix index 353e5ccfe72..75f22f2ab41 100644 --- a/pkgs/desktops/kde-4.2/sdk/default.nix +++ b/pkgs/desktops/kde-4.2/sdk/default.nix @@ -2,10 +2,10 @@ kdelibs, kdepimlibs, automoc4, phonon, strigi}: stdenv.mkDerivation { - name = "kdesdk-4.2.1"; + name = "kdesdk-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdesdk-4.2.1.tar.bz2; - sha1 = "dca74527bcf6e5925ec58a74196e683cc68a259a"; + url = mirror://kde/stable/4.2.2/src/kdesdk-4.2.2.tar.bz2; + sha1 = "ea610bc2cf3f5beb37f03ac6ff7822fca5234003"; }; CMAKE_PREFIX_PATH=kdepimlibs; builder=./builder.sh; diff --git a/pkgs/desktops/kde-4.2/toys/default.nix b/pkgs/desktops/kde-4.2/toys/default.nix index e1a23ce16cb..a5959d92274 100644 --- a/pkgs/desktops/kde-4.2/toys/default.nix +++ b/pkgs/desktops/kde-4.2/toys/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}: stdenv.mkDerivation { - name = "kdetoys-4.2.1"; + name = "kdetoys-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdetoys-4.2.1.tar.bz2; - sha1 = "46157a10a35d37e798faa8bb988ac1c3f2a51f07"; + url = mirror://kde/stable/4.2.2/src/kdetoys-4.2.2.tar.bz2; + sha1 = "5057ae39c77be8792fb1c23fd8cf1e3ac06942cf"; }; buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ]; } diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix index a77c2feed9d..2458e47b742 100644 --- a/pkgs/desktops/kde-4.2/utils/default.nix +++ b/pkgs/desktops/kde-4.2/utils/default.nix @@ -2,10 +2,10 @@ kdelibs, kdepimlibs, kdebindings, automoc4, phonon, qimageblitz}: stdenv.mkDerivation { - name = "kdeutils-4.2.1"; + name = "kdeutils-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdeutils-4.2.1.tar.bz2; - sha1 = "2f875d05584b25b928b38e1da2b04c073acefd35"; + url = mirror://kde/stable/4.2.2/src/kdeutils-4.2.2.tar.bz2; + sha1 = "98e388776b1c270fc6a629c94455024e08bb85b4"; }; builder = ./builder.sh; inherit system_config_printer; diff --git a/pkgs/desktops/kde-4.2/webdev/default.nix b/pkgs/desktops/kde-4.2/webdev/default.nix index 9b06650a402..6e7d0b9bea4 100644 --- a/pkgs/desktops/kde-4.2/webdev/default.nix +++ b/pkgs/desktops/kde-4.2/webdev/default.nix @@ -2,10 +2,10 @@ kdelibs, kdepimlibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdewebdev-4.2.1"; + name = "kdewebdev-4.2.2"; src = fetchurl { - url = mirror://kde/stable/4.2.1/src/kdewebdev-4.2.1.tar.bz2; - sha1 = "438bef3bb32ce53a83c6f30f65fb49d4d4e7c76a"; + url = mirror://kde/stable/4.2.2/src/kdewebdev-4.2.2.tar.bz2; + sha1 = "fe43dad60a72bcaaafa0d0384fa5635c6a9c4795"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ]; diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix index a378a9dd94b..8bb4788fd62 100644 --- a/pkgs/development/libraries/qt-4/default.nix +++ b/pkgs/development/libraries/qt-4/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "qt-4.4.3"; src = fetchurl { - url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.4.3.tar.bz2; - sha256 = "1nfdf1aj6vb7qyacsnjyjxrnaf44hz7vzykf6zra2znd87pglz51"; + url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.0.tar.bz2; + sha256 = "e1b356a54e65781ed94f19d785356a88daa8d38b9dbbca35439b80ca8c4a5be9"; }; setupHook = ./setup-hook.sh; From a0f768ad1c1d34e37c48d5d2f5b2902aa793d352 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 12:27:35 +0000 Subject: [PATCH 17/63] * Lower the default Hydra scheduling priority for Nixpkgs jobs to prevent them from crowding out all other projects for hours. This is temporary - what we really need is a fairer scheduling policy. svn path=/nixpkgs/trunk/; revision=14856 --- pkgs/top-level/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index c05140a86a1..51f318b725a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -12,7 +12,7 @@ let prio = level: job: toJob job // { schedulingPriority = level; }; toJob = x: if builtins.isAttrs x then x else - { type = "job"; systems = x; schedulingPriority = 100; }; + { type = "job"; systems = x; schedulingPriority = 20; }; /* Perform a job on the given set of platforms. The function `f' is called by Hydra for each platform, and should return some job From 98da742900ffc73645a4bb2d0fc9a607f87cc959 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 3 Apr 2009 12:32:33 +0000 Subject: [PATCH 18/63] fixed qt component name svn path=/nixpkgs/trunk/; revision=14857 --- pkgs/development/libraries/qt-4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4/default.nix b/pkgs/development/libraries/qt-4/default.nix index 8bb4788fd62..60ac0f1432b 100644 --- a/pkgs/development/libraries/qt-4/default.nix +++ b/pkgs/development/libraries/qt-4/default.nix @@ -1,7 +1,7 @@ args: with args; stdenv.mkDerivation { - name = "qt-4.4.3"; + name = "qt-4.5.0"; src = fetchurl { url = ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.0.tar.bz2; From 46d0b7be044790090e0b38ff6f9c8c83ed52fd52 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 12:34:25 +0000 Subject: [PATCH 19/63] svn path=/nixpkgs/trunk/; revision=14858 --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 0c138545f72..22fc80390ac 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -40,7 +40,7 @@ releaseTools.makeSourceTarball { checkPhase = '' # Run the regression tests in `lib'. - res="$(nix-instantiate --eval-only --strict tests.nix)" + res="$(nix-instantiate --eval-only --strict pkgs/lib/tests.nix)" if test "$res" != "List([])"; then echo "regression tests for lib failed, got: $res" exit 1 From fed7ac37983ff085dfcb6c0c45614f95d18001fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 12:44:55 +0000 Subject: [PATCH 20/63] * sqlite 3.6.12. svn path=/nixpkgs/trunk/; revision=14859 --- pkgs/development/libraries/sqlite/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index e866a204ecf..623d38b1852 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, readline, static ? false}: stdenv.mkDerivation rec { - name = "sqlite-3.6.10"; + name = "sqlite-3.6.12"; # Note: don't use the "amalgamation" source release, since it # doesn't install sqlite3.pc. src = fetchurl { url = "http://www.sqlite.org/${name}.tar.gz"; - sha256 = "00dabyjg0530ng52b8lq6hwb6h181wl27ix5l7ayib0am8sdnmr1"; + sha256 = "00cj6bda0kqqn6m3g8k4n4w1rnj76mgk47hf03j0d3w0j0g3rhln"; }; buildInputs = [readline]; @@ -17,10 +17,6 @@ stdenv.mkDerivation rec { --with-readline-inc=-I${readline}/include ''; - postInstall = '' - gcc -L$out/lib -I$out/include tool/genfkey.c -lsqlite3 -o $out/bin/genfkey - ''; - meta = { homepage = http://www.sqlite.org/; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; From 21c3b6264bfb2589c8981480fa4999e7394ef8d7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 15:51:39 +0000 Subject: [PATCH 21/63] * Add the CPAN master site as a fallback. svn path=/nixpkgs/trunk/; revision=14863 --- pkgs/build-support/fetchurl/mirrors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 613b33cffdc..cdf7ab95abc 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -165,6 +165,7 @@ rec { ftp://download.xs4all.nl/pub/mirror/CPAN/ ftp://ftp.nl.uu.net/pub/CPAN/ http://ftp.funet.fi/pub/CPAN/ + http://cpan.perl.org/ ]; # Debian. From 985178ff4b244272dd62aadd3134fd0f40087ed4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 16:00:38 +0000 Subject: [PATCH 22/63] * Latest DBIx::Class, plus some other Catalyst updates. svn path=/nixpkgs/trunk/; revision=14865 --- pkgs/top-level/all-packages.nix | 65 ++++++++++++++------------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69496f0cb73..820e4d52e3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4428,10 +4428,10 @@ let }; perlCatalystModelDBICSchema = buildPerlPackage { - name = "Catalyst-Model-DBIC-Schema-0.21"; + name = "Catalyst-Model-DBIC-Schema-0.23"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOGDAN/Catalyst-Model-DBIC-Schema-0.21.tar.gz; - sha256 = "12hi2sa5ggn2jqnhbb9i2wf602bf6c06xmcqmiki5lvh4z1pxg6x"; + url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Model-DBIC-Schema-0.23.tar.gz; + sha256 = "1rzs4czrwr8pnrj0mvfpzc8i2cbw95rx2xirw9bhqs77z2722ym4"; }; propagatedBuildInputs = [ perlCatalystRuntime perlCatalystDevel perlDBIxClass @@ -4441,10 +4441,10 @@ let }; perlCatalystRuntime = buildPerlPackage rec{ - name = "Catalyst-Runtime-5.8000_06"; + name = "Catalyst-Runtime-5.71001"; src = fetchurl { url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; - sha256 = "181fynr72q73xs78rk2hmlgqhx2n35ysv73rfd69780na1j3gkzf"; + sha256 = "1j3xsh7zi5xd8zdc63r83mwzhjfj30vhd39kgir53mq47v0y07jr"; }; propagatedBuildInputs = [ perlLWP perlClassAccessor perlClassDataInheritable perlClassInspector @@ -4465,19 +4465,6 @@ let propagatedBuildInputs = [perlCatalystRuntime perlCatalystPluginSession]; }; - perlCatalystPluginAuthenticationStoreDBIC = buildPerlPackage { - name = "Catalyst-Plugin-Authentication-Store-DBIC-0.11"; - src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Authentication-Store-DBIC-0.11.tar.gz; - sha256 = "008x5yh65bmfdz3q7gxia739aajb8nx4ly5kyl4khl2pa9fy2jn7"; - }; - propagatedBuildInputs = [ - perlCatalystRuntime perlCatalystPluginAuthentication - perlSetObject perlDBIxClass perlCatalystModelDBICSchema - perlCatalystPluginAuthorizationRoles perlCatalystPluginSessionStateCookie - ]; - }; - perlCatalystPluginAuthorizationACL = buildPerlPackage { name = "Catalyst-Plugin-Authorization-ACL-0.10"; src = fetchurl { @@ -4635,10 +4622,10 @@ let }; perlClassAccessorGrouped = buildPerlPackage rec { - name = "Class-Accessor-Grouped-0.08002"; + name = "Class-Accessor-Grouped-0.08003"; src = fetchurl { url = "mirror://cpan/authors/id/C/CL/CLACO/${name}.tar.gz"; - sha256 = "0y7dqf0k5zh8azkb181k1zbbcy14rhfd55yddhccbfp6v44yl7yr"; + sha256 = "0lvxj8fp79338p52ich0p7hi4gvvf572ks76g9kgkgfyqvmp732k"; }; propagatedBuildInputs = [perlClassInspector perlMROCompat]; }; @@ -4652,10 +4639,10 @@ let }; perlClassC3 = buildPerlPackage rec { - name = "Class-C3-0.20"; + name = "Class-C3-0.21"; src = fetchurl { url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1xmd77ghxgn4yjd25z25df0isaz3k3b685q151x0f3537kl8cln3"; + sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; }; }; @@ -4668,13 +4655,15 @@ let propagatedBuildInputs = [perlMROCompat perlTestException perlListMoreUtils]; }; - perlClassC3Componentised = buildPerlPackage { - name = "Class-C3-Componentised-1.0003"; + perlClassC3Componentised = buildPerlPackage rec { + name = "Class-C3-Componentised-1.0004"; src = fetchurl { - url = mirror://cpan/authors/id/A/AS/ASH/Class-C3-Componentised-1.0003.tar.gz; - sha256 = "0lbhzz18lfp2xa8h5cmhfnqbqzhvpx4jkvga9gzwiv9ppbdpzqdp"; + url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; + sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; }; - propagatedBuildInputs = [perlClassC3 perlClassInspector perlTestException]; + propagatedBuildInputs = [ + perlClassC3 perlClassInspector perlTestException perlMROCompat + ]; }; perlClassDataAccessor = buildPerlPackage { @@ -4710,10 +4699,10 @@ let }; perlClassMOP = buildPerlPackage rec { - name = "Class-MOP-0.76"; + name = "Class-MOP-0.80"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0hya7hyz80d65vf1llanasg0gszgjyc52842xxzgqhy4vvnwviyy"; + sha256 = "1fmimzzbfkw7vrr57p8xa3y9v55i72bknix2qk3cdrn0jmg6h648"; }; propagatedBuildInputs = [ perlMROCompat perlTaskWeaken perlTestException perlSubName perlSubIdentify @@ -4969,10 +4958,10 @@ let }; perlDBIxClass = buildPerlPackage rec { - name = "DBIx-Class-0.08012"; + name = "DBIx-Class-0.08099_08"; src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "02m5bg1zq1w1w2s3vnnjh46spn6d8xzj6b00vmlyfmf9hmrsdsxj"; + sha256 = "12kn3jylxi7n2c6ccqyrjaxxmk3lajvjv19j6rlifp4crn24cbpy"; }; propagatedBuildInputs = [ perlTestNoWarnings perlTestException perlDBI perlScopeGuard @@ -4994,10 +4983,10 @@ let }; perlDBIxClassSchemaLoader = buildPerlPackage rec { - name = "DBIx-Class-Schema-Loader-0.04005"; + name = "DBIx-Class-Schema-Loader-0.04999_06"; src = fetchurl { url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; - sha256 = "1adymxsh1q7y1d3x25mar1rz6nshag16h6bfzhwy0w50qd2vvx9l"; + sha256 = "169ydwjarq6qk48jdxcn5ks8rx9aksk9fnx07gl5mz7banw5cs6y"; }; propagatedBuildInputs = [ perlDBI perlDBDSQLite perlDataDump perlUNIVERSALrequire @@ -5005,6 +4994,7 @@ let perlClassInspector perlDBIxClass perlLinguaENInflectNumber perlClassUnload ]; + doCheck = false; # disabled for now, since some tests fail }; perlDevelGlobalDestruction = buildPerlPackage rec { @@ -5488,10 +5478,10 @@ let }; perlMoose = buildPerlPackage rec { - name = "Moose-0.68"; + name = "Moose-0.73"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "0ncpa8v0yv7lkn108943sjll3gps5nkzn6a51ngvqq1rnsd34ar1"; + sha256 = "1h1d551fbrsbr0knvcah4jyg999667ykhgbldl5rv4h7kdzsqsvz"; }; propagatedBuildInputs = [ perlTestMore perlTestException perlTaskWeaken perlListMoreUtils @@ -5736,10 +5726,10 @@ let }; perlSQLAbstract = buildPerlPackage rec { - name = "SQL-Abstract-1.50"; + name = "SQL-Abstract-1.51"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSTROUT/${name}.tar.gz"; - sha256 = "0nyc16ynks4xqa442vycs8wy9xbs0q63wm4iik8ar1axr53lyyqb"; + sha256 = "1q77yfdrkadf738zvdgarkv0136zs2shz3fdmwaaf03bhvhcbap2"; }; propagatedBuildInputs = [ perlTestDeep perlTestException perlTestWarn @@ -5852,7 +5842,6 @@ let propagatedBuildInputs = [ perlCatalystManual perlCatalystRuntime perlCatalystDevel perlCatalystPluginSession perlCatalystPluginAuthentication - perlCatalystPluginAuthenticationStoreDBIC perlCatalystAuthenticationStoreDBIxClass perlCatalystPluginAuthorizationRoles perlCatalystPluginAuthorizationACL From 644cf259a5d8253dc0ac48917bfec110db652976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 3 Apr 2009 18:46:26 +0000 Subject: [PATCH 23/63] Add GNU mcron, a `cron' implementation in Guile Scheme. svn path=/nixpkgs/trunk/; revision=14870 --- pkgs/tools/system/mcron/default.nix | 30 +++++++++++++++++++ .../system/mcron/install-vixie-programs.patch | 22 ++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/tools/system/mcron/default.nix create mode 100644 pkgs/tools/system/mcron/install-vixie-programs.patch diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix new file mode 100644 index 00000000000..3c14d207a56 --- /dev/null +++ b/pkgs/tools/system/mcron/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, guile, which, ed }: + +stdenv.mkDerivation rec { + name = "mcron-1.0.4"; + + src = fetchurl { + url = "mirror://gnu/mcron/${name}.tar.gz"; + sha256 = "0wrpi9qj50a8wfslapnkmsr6d3qx40hfw57a022m1z1syiljq4xl"; + }; + + patches = [ ./install-vixie-programs.patch ]; + + buildInputs = [ guile which ed ]; + + meta = { + description = "GNU mcron, a flexible implementation of `cron' in Guile"; + + longDescription = '' + The GNU package mcron (Mellor's cron) is a 100% compatible + replacement for Vixie cron. It is written in pure Guile, and + allows configuration files to be written in scheme (as well as + Vixie's original format) for infinite flexibility in specifying + when jobs should be run. Mcron was written by Dale Mellor. + ''; + + homepage = http://www.gnu.org/software/mcron/; + + license = "GPLv3+"; + }; +} diff --git a/pkgs/tools/system/mcron/install-vixie-programs.patch b/pkgs/tools/system/mcron/install-vixie-programs.patch new file mode 100644 index 00000000000..98cdb6d142c --- /dev/null +++ b/pkgs/tools/system/mcron/install-vixie-programs.patch @@ -0,0 +1,22 @@ +This patch allows us to install the Vixie-compatible binaries as +non-root. + +--- mcron-1.0.4/makefile.in 2008-02-21 20:55:24.000000000 +0100 ++++ mcron-1.0.4/makefile.in 2009-04-03 20:18:44.000000000 +0200 +@@ -872,15 +872,11 @@ mcron.c : main.scm crontab.scm makefile. + @rm -f mcron.escaped.scm > /dev/null 2>&1 + + install-exec-hook: +- @if [ "`id -u`" -eq "0" ]; then \ ++ @if true; then \ + rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \ + $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \ + rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \ + $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \ +- ./mkinstalldirs -m 'u=rwx' /var/cron; \ +- ./mkinstalldirs -m 'u=rwx,og=rx' /var/run; \ +- ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@; \ +- ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@/mcron; \ + else \ + echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \ + fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 820e4d52e3e..63b8ec27447 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -936,6 +936,10 @@ let inherit (gtkLibs) glib; }; + mcron = import ../tools/system/mcron { + inherit fetchurl stdenv guile which ed; + }; + mdbtools = builderDefsPackage (selectVersion ../tools/misc/mdbtools "0.6-pre1") { inherit readline pkgconfig bison; inherit (gtkLibs) glib; From f6e7c5b32648685054d3902621d28387163d3c75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 20:25:23 +0000 Subject: [PATCH 24/63] * vlc 0.9.9. svn path=/nixpkgs/trunk/; revision=14872 --- pkgs/applications/video/vlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e1b2d5d7eef..0b442744f02 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation { - name = "vlc-0.9.8a"; + name = "vlc-0.9.9"; src = fetchurl { - url = http://download.videolan.org/pub/videolan/vlc/0.9.8a/vlc-0.9.8a.tar.bz2; - sha256 = "0kw2d7yh8rzb61j1q2cvnjinj1wxc9a7smxl7ckw1vwh6y02jz0r"; + url = http://download.videolan.org/pub/videolan/vlc/0.9.9/vlc-0.9.9.tar.bz2; + sha256 = "0jg9sgwzz1p9mwnzrnfg9gpkcjd549gnkw0zjp9v2q2cclg2jknh"; }; buildInputs = [ From 4f426548f4481c520670b1850123ed99e1326270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 3 Apr 2009 21:10:26 +0000 Subject: [PATCH 25/63] Build GNU mcron. svn path=/nixpkgs/trunk/; revision=14874 --- 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 51f318b725a..fe08bdf72ac 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -181,6 +181,7 @@ in { manpages = linux; maxima = linux; mc = all; + mcron = linux; mdadm = linux; mercurial = allBut "i686-cygwin"; mesa = linux; From 7d1c471549e36f64cac9149c32a80e3a05bb1c19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 23:18:17 +0000 Subject: [PATCH 26/63] * Soprano: don't depend on the JDK. This cuts 200 MB from the KDE 4 closure. (This does remove the Sesame2 backend from Soprano.) svn path=/nixpkgs/trunk/; revision=14876 --- pkgs/desktops/kde-4.2/support/soprano/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/kde-4.2/support/soprano/default.nix b/pkgs/desktops/kde-4.2/support/soprano/default.nix index 87bac0c9050..a19270e939a 100644 --- a/pkgs/desktops/kde-4.2/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.2/support/soprano/default.nix @@ -2,10 +2,18 @@ stdenv.mkDerivation { name = "soprano-2.2.3"; + src = fetchurl { url = mirror://sourceforge/soprano/soprano-2.2.3.tar.bz2; md5 = "22c992a252144ae0a3a964ba2f6f1933"; }; - JAVA_HOME=jdk; - buildInputs = [ cmake qt4 jdk cluceneCore redland ]; + + #JAVA_HOME=jdk; + + buildInputs = [ cmake qt4 /* jdk */ cluceneCore redland ]; + + meta = { + homepage = http://soprano.sourceforge.net/; + description = "An object-oriented C++/Qt4 framework for RDF data"; + }; } From 3b514cad995c70cb41bc258834ec27f7835d36b5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Apr 2009 23:54:20 +0000 Subject: [PATCH 27/63] * Boost: cut the installed size from 257 MB (!!!) to 58 MB. It required all that space because it was building static/shared, single-thread/multi-threaded, and debug/production versions of the libraries - as well as every combination of those. Now we build only the shared, multi-threaded, production version, which needs only 8 MB. The headers account for the other 50 MB, so it might be worthwhile to split them off into a separate package (in order to reduce the runtime closure of applications that use Boost, such as KDE). * Removed some Boost versions that aren't used anymore. svn path=/nixpkgs/trunk/; revision=14877 --- pkgs/development/libraries/boost/1.34.1.nix | 17 ---------------- pkgs/development/libraries/boost/1.35.0.nix | 20 ------------------- pkgs/development/libraries/boost/1.36.0.nix | 14 ++++++++----- pkgs/development/libraries/boost/1.37.0.nix | 20 ------------------- pkgs/development/libraries/boost/1.38.0.nix | 14 ++++++++----- .../development/libraries/boost/gcc-4.2.patch | 11 ---------- pkgs/top-level/all-packages.nix | 9 ++++++--- 7 files changed, 24 insertions(+), 81 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.34.1.nix delete mode 100644 pkgs/development/libraries/boost/1.35.0.nix delete mode 100644 pkgs/development/libraries/boost/1.37.0.nix delete mode 100644 pkgs/development/libraries/boost/gcc-4.2.patch diff --git a/pkgs/development/libraries/boost/1.34.1.nix b/pkgs/development/libraries/boost/1.34.1.nix deleted file mode 100644 index 51ddf19025f..00000000000 --- a/pkgs/development/libraries/boost/1.34.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, icu, zlib, bzip2, python, version}: - -assert version == "1.34.1"; - -stdenv.mkDerivation { - name = "boost-1.34.1"; - src = fetchurl { - url = mirror://sourceforge/boost/boost_1_34_1.tar.bz2; - sha256 = "0k7cjsgg3iqy49f9nnhyp945yry0bichd88p04sg3915n1snr1hg"; - }; - buildInputs = [icu zlib bzip2 python]; - preConfigure=" - sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system release threading=multi link=shared\"@g' -i configure - "; - patches = [./gcc-4.2.patch]; - configureFlags="--with-icu=${icu}"; -} diff --git a/pkgs/development/libraries/boost/1.35.0.nix b/pkgs/development/libraries/boost/1.35.0.nix deleted file mode 100644 index 10e84fbad35..00000000000 --- a/pkgs/development/libraries/boost/1.35.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, icu, zlib, bzip2, python, version}: - -assert version == "1.35.0"; - -stdenv.mkDerivation { - name = "boost-1.35.0"; - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - }; - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_35_0.tar.bz2"; - sha256 = "f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da"; - }; - buildInputs = [icu zlib bzip2 python]; - preConfigure = - "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"--layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure"; - configureFlags = "--with-icu=${icu} --with-python=${python}"; -} diff --git a/pkgs/development/libraries/boost/1.36.0.nix b/pkgs/development/libraries/boost/1.36.0.nix index 11e600e65f3..14b7dd8da33 100644 --- a/pkgs/development/libraries/boost/1.36.0.nix +++ b/pkgs/development/libraries/boost/1.36.0.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }: - -assert version == "1.36.0"; +{stdenv, fetchurl, icu, expat, zlib, bzip2, python}: stdenv.mkDerivation { name = "boost-1.36.0"; + meta = { homepage = "http://boost.org/"; description = "Boost C++ Library Collection"; license = "boost-license"; }; + src = fetchurl { url = "mirror://sourceforge/boost/boost_1_36_0.tar.bz2"; sha256 = "1vydzfvzg0fkzixkr2jikvcc0zbh5qgw98hr6nhj0z12ppxhqjls"; }; + buildInputs = [icu expat zlib bzip2 python]; - preConfigure = - "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure"; + + preBuild = '' + makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=release threading=multi link=shared") + ''; + configureFlags = "--with-icu=${icu} --with-python=${python}"; } diff --git a/pkgs/development/libraries/boost/1.37.0.nix b/pkgs/development/libraries/boost/1.37.0.nix deleted file mode 100644 index 9b8c22d1ff7..00000000000 --- a/pkgs/development/libraries/boost/1.37.0.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }: - -assert version == "1.37.0"; - -stdenv.mkDerivation { - name = "boost-1.37.0"; - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - }; - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_37_0.tar.bz2"; - sha256 = "0wjlmkp9klz6qfx02crw2w6py8k634m3l6hd9vfavfdif2gz8bnm"; - }; - buildInputs = [icu expat zlib bzip2 python]; - preConfigure = - "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure"; - configureFlags = "--with-icu=${icu} --with-python=${python}"; -} diff --git a/pkgs/development/libraries/boost/1.38.0.nix b/pkgs/development/libraries/boost/1.38.0.nix index 1416e124471..b88e1dc1fda 100644 --- a/pkgs/development/libraries/boost/1.38.0.nix +++ b/pkgs/development/libraries/boost/1.38.0.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, version }: - -assert version == "1.38.0"; +{stdenv, fetchurl, icu, expat, zlib, bzip2, python}: stdenv.mkDerivation { name = "boost-1.38.0"; + meta = { homepage = "http://boost.org/"; description = "Boost C++ Library Collection"; license = "boost-license"; }; + src = fetchurl { url = "mirror://sourceforge/boost/boost_1_38_0.tar.bz2"; sha256 = "0rk044s4m7l4sma6anml34vxcd9w0fzcy1cy7csbzynjyida9qry"; }; + buildInputs = [icu expat zlib bzip2 python]; - preConfigure = - "sed -e 's@^BJAM_CONFIG=\"\"@BJAM_CONFIG=\"-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=debug,release threading=single,multi link=shared,static\"@g' -i configure"; + + preBuild = '' + makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=release threading=multi link=shared") + ''; + configureFlags = "--with-icu=${icu} --with-python=${python}"; } diff --git a/pkgs/development/libraries/boost/gcc-4.2.patch b/pkgs/development/libraries/boost/gcc-4.2.patch deleted file mode 100644 index 6c2210d831d..00000000000 --- a/pkgs/development/libraries/boost/gcc-4.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: trunk/tools/jam/src/build.jam -=================================================================== ---- trunk/tools/jam/src/build.jam (revision 40095) -+++ trunk/tools/jam/src/build.jam (revision 41036) -@@ -176,5 +176,5 @@ - ## GCC 2.x, 3.x, 4.x - toolset gcc gcc : "-o " : -D -- : -pedantic -+ : -pedantic -fno-strict-aliasing - [ opt --release : [ opt --symbols : -g : -s ] -O3 ] - [ opt --debug : -g -O0 -fno-inline ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63b8ec27447..fa3d5ed1d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2754,10 +2754,13 @@ let inherit fetchurl stdenv; }; - boostVersionChoice = version: selectVersion ../development/libraries/boost version { + boost_1_36_0 = import ../development/libraries/boost/1.36.0.nix { + inherit fetchurl stdenv icu expat zlib bzip2 python; + }; + + boost = import ../development/libraries/boost/1.38.0.nix { inherit fetchurl stdenv icu expat zlib bzip2 python; }; - boost = boostVersionChoice "1.38.0"; botan = builderDefsPackage (import ../development/libraries/botan) { inherit perl; @@ -8543,7 +8546,7 @@ let db4 sablotron curl libsndfile flex zip unzip libmspack getopt file neon cairo which icu jdk ant hsqldb cups openssl bison; - boost = boostVersionChoice "1.36.0"; + boost = boost_1_36_0; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (gtkLibs) gtk; }; From acf5563f1014c490ea92d90872fcdbc67cac88fc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 4 Apr 2009 00:02:38 +0000 Subject: [PATCH 28/63] * Reduce the installed size of mysql from 80 MB to 17 MB by leaving out some less important stuff, such as the statically linked embedded binaries and some test data. This is important because mysql is currently a dependency of lots of other packages, such as Qt. Of course, the real fix would be to split off the mysql client libraries into a separate package. svn path=/nixpkgs/trunk/; revision=14878 --- pkgs/servers/sql/mysql5/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix index d8f3559ed35..2f546edf1f7 100644 --- a/pkgs/servers/sql/mysql5/default.nix +++ b/pkgs/servers/sql/mysql5/default.nix @@ -11,7 +11,17 @@ stdenv.mkDerivation { }; buildInputs = [ps ncurses zlib perl openssl]; - postInstall = "ln -s mysqld_safe $out/bin/mysqld"; + + configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db"; - configureFlags = "--enable-thread-safe-client --with-embedded-server --disable-static --with-openssl=${openssl} --with-berkeley-db"; + postInstall = + '' + ln -s mysqld_safe $out/bin/mysqld + rm -rf $out/mysql-test $out/sql-bench $out/share/info + ''; + + meta = { + homepage = http://www.mysql.com/; + description = "The world's most popular open source database"; + }; } From 801b5fd701c137902faaabf8aff22ad2c26aab89 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 4 Apr 2009 00:21:21 +0000 Subject: [PATCH 29/63] * wpa_supplicant 0.6.9. svn path=/nixpkgs/trunk/; revision=14879 --- .../linux/wpa_supplicant/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 584723c9b45..3d3101016ac 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,19 +1,30 @@ {stdenv, fetchurl, openssl}: -stdenv.mkDerivation { - name = "wpa_supplicant-0.6.3"; +stdenv.mkDerivation rec { + name = "wpa_supplicant-0.6.9"; src = fetchurl { - url = http://hostap.epitest.fi/releases/wpa_supplicant-0.6.3.tar.gz; - sha256 = "f70b18243e049bbda66254388b6e94d404e747d913b8496d6e93a9c56bbf4af2"; + url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; + sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf"; }; - preBuild = " + preBuild = '' cd wpa_supplicant cp defconfig .config substituteInPlace Makefile --replace /usr/local $out - makeFlagsArray=(ALL=\"wpa_supplicant wpa_passphrase wpa_cli\") - "; + makeFlagsArray=(ALL="wpa_supplicant wpa_passphrase wpa_cli") + ''; buildInputs = [openssl]; + + postInstall = '' + ensureDir $out/share/man/man5 $out/share/man/man8 + cp doc/docbook/*.5 $out/share/man/man5/ + cp doc/docbook/*.8 $out/share/man/man8/ + ''; + + meta = { + homepage = http://hostap.epitest.fi/wpa_supplicant/; + description = "A tool for connecting to WPA and WPA2-protected wireless networks"; + }; } From 8d44988427ae9d1b98e5e1b17edcf0fb415a2bc4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 4 Apr 2009 00:59:55 +0000 Subject: [PATCH 30/63] * Samba updated to 3.3.3. Don't install SWAT - it's not very useful on NixOS. svn path=/nixpkgs/trunk/; revision=14880 --- pkgs/servers/samba/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 0e92992c372..0464943f836 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "samba-3.2.7"; + name = "samba-3.3.3"; src = fetchurl { - url = http://us3.samba.org/samba/ftp/stable/samba-3.3.2.tar.gz; - sha256 = "1b4fa9fbe7ccced6cca449c4b0b9fba65ffd2ad63b1f0bf2507e943281461477"; + url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; + sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; }; buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam acl]; @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { configureFlags = '' --with-pam - --with-smbmount + --with-cifsmount --with-aio-support --with-pam_smbpass - ${if (stdenv.gcc.libc != null) then "--with-libiconv=${stdenv.gcc.libc}" else ""} + --disable-swat + --enable-shared-libs + ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""} ''; } From bbeaa60535f0f6e22d8e6ef9aecbe151b7033fb7 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 4 Apr 2009 15:10:42 +0000 Subject: [PATCH 31/63] meta-build-env prerelease svn path=/nixpkgs/trunk/; revision=14882 --- .../compilers/meta-environment/meta-build-env/trunk.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix b/pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix new file mode 100644 index 00000000000..3866db27455 --- /dev/null +++ b/pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix @@ -0,0 +1,7 @@ +{stdenv, fetchurl}: stdenv.mkDerivation { + name = "meta-build-env-trunk"; + src = fetchurl { + url = http://hydra.nixos.org/build/9794/download/1/meta-build-env-0.1.tar.gz ; + sha256 = "1337000664114df83025e165b5af202a153654ea3226a347dc150769260c7a7b" ; + }; +} From a5185e9477ff2309e984fb85616ecd03d7aa6ce4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sat, 4 Apr 2009 15:10:58 +0000 Subject: [PATCH 32/63] meta-build-env prerelease svn path=/nixpkgs/trunk/; revision=14883 --- 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 fa3d5ed1d1a..326575f9bcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2005,6 +2005,10 @@ let inherit fetchurl stdenv ; }; + metaBuildEnvTrunk = import ../development/compilers/meta-environment/meta-build-env/trunk.nix { + inherit fetchurl stdenv ; + }; + swiProlog = composedArgsAndFun (selectVersion ../development/compilers/swi-prolog "5.6.51") { inherit fetchurl stdenv; }; From 730f8c2b4d4b12bd9bf7d1bfe14c8bcfe677c6d0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 5 Apr 2009 18:05:11 +0000 Subject: [PATCH 33/63] * Added a function to make Unix-style search paths. This generalises `makeLibraryPath'. svn path=/nixpkgs/trunk/; revision=14884 --- pkgs/lib/strings.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix index 0e90b6f6477..263e659f2ec 100644 --- a/pkgs/lib/strings.nix +++ b/pkgs/lib/strings.nix @@ -29,9 +29,16 @@ rec { concatStrings (intersperse separator list); - # Construct an RPATH containing the libraries for a set of packages, - # e.g. "${pkg1}/lib:${pkg2}/lib:...". - makeLibraryPath = paths: concatStringsSep ":" (map (path: path + "/lib") paths); + # Construct a Unix-style search path consisting of each `subDir" + # directory of the given list of packages. For example, + # `makeSearchPath "bin" ["x" "y" "z"]' returns "x/bin:y/bin:z/bin". + makeSearchPath = subDir: packages: + concatStringsSep ":" (map (path: path + "/" + subDir) packages); + + + # Construct a library search path (such as RPATH) containing the + # libraries for a set of packages, e.g. "${pkg1}/lib:${pkg2}/lib:...". + makeLibraryPath = makeSearchPath "lib"; # Dependening on the boolean `cond', return either the given string From 349fea53b70cec3a9a54744f5482c16dd5a7ab76 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 5 Apr 2009 19:47:23 +0000 Subject: [PATCH 34/63] update to 1.3.39 svn path=/nixpkgs/trunk/; revision=14890 --- pkgs/development/tools/misc/swig/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 72dd19b7af8..aa7dc4ed52b 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -6,12 +6,12 @@ assert pythonSupport -> python != null; assert javaSupport -> jdk != null; stdenv.mkDerivation { - name = "swig-1.3.33"; + name = "swig-1.3.39"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/swig/swig-1.3.33.tar.gz; - sha256 = "02rz31i642sbsngny7k98d9hxlkcb9snvbzlnz3sh0qiyr3ciggv"; + url = mirror://sourceforge/swig/swig-1.3.39.tar.gz; + sha256 = "1p0i5c52y8d7wvn5h3qf62q5ic7kgbj2vc5dm8zy07ygff9msbdv"; }; inherit perlSupport pythonSupport javaSupport; From 0b76035b66b24469f23c8c25a0fc991f0988e1d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 5 Apr 2009 21:41:13 +0000 Subject: [PATCH 35/63] Adding qtpfsgui and pfstools. Updating fftw because the src URL didn't work anymore. svn path=/nixpkgs/trunk/; revision=14892 --- .../graphics/qtpfsgui/default.nix | 27 +++++++++++++++++++ pkgs/development/libraries/fftw/default.nix | 8 +++--- pkgs/tools/graphics/pfstools/default.nix | 20 ++++++++++++++ pkgs/top-level/all-packages.nix | 12 +++++++++ 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/graphics/qtpfsgui/default.nix create mode 100644 pkgs/tools/graphics/pfstools/default.nix diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix new file mode 100644 index 00000000000..fd77524b8dc --- /dev/null +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, qt4, exiv2, openexr, fftw, libtiff, ilmbase }: + +stdenv.mkDerivation { + name = "qtpfsgui-1.9.2"; + + src = fetchurl { + url = mirror://sourceforge/qtpfsgui/qtpfsgui-1.9.2.tar.gz; + sha256 = "13kcw760136zpg3b5qhd1sw3kqplicvlsqmy3rxxn5ygm0zfqqj4"; + }; + + buildInputs = [ qt4 exiv2 openexr fftw libtiff ]; + + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + + configurePhase = '' + qmake PREFIX=$out EXIV2PATH=${exiv2}/include/exiv2 \ + OPENEXRDIR=${openexr}/include/OpenEXR \ + FFTW3DIR=${fftw}/include \ + LIBTIFFDIR=${libtiff}/include \ + ''; + + meta = { + homepage = http://qtpfsgui.sourceforge.net/; + description = "GUI frontend for some pfstools"; + license = "GPL"; + }; +} diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index f3604c7d32f..9e362076d26 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -2,8 +2,8 @@ args : with args; let localDefs = builderDefs.passthru.function { src = fetchurl { - url = ftp://ftp.fftw.org/pub/fftw/fftw-3.1.2.tar.gz; - sha256 = "1gr63hf5vvsg50b2xwqaxwpvs1y9g8l0sb91a38wpvr7zsbjxfg1"; + url = ftp://ftp.fftw.org/pub/fftw/fftw-3.2.1.tar.gz; + sha256 = "1x8jww3vflrgzjrpnnsk0020bkd9aqmfga8y31v10cqd02l46sh7"; }; buildInputs = []; configureFlags = ["--enable-shared"] @@ -13,8 +13,8 @@ args : with args; }; in with localDefs; stdenv.mkDerivation { - name = "fftw-3.1.2" + ( if args.singlePrecision then "-single" else "-float" ); - builder = writeScript "fftw-3.1.2-builder" + name = "fftw-3.2.1" + ( if args.singlePrecision then "-single" else "-float" ); + builder = writeScript "fftw-3.2.1-builder" (textClosure localDefs [doConfigure doMakeInstall doForceShare]); meta = { description = "Fastest Fourier Transform in the West library"; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix new file mode 100644 index 00000000000..2d9ab632f1c --- /dev/null +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, libtiff, openexr, imagemagick, libjpeg, qt, mesa, +freeglut, bzip2, libX11, libpng, expat }: + +stdenv.mkDerivation { + name = "pfstools-1.8.0"; + + src = fetchurl { + url = mirror://sourceforge/pfstools/pfstools-1.8.0.tar.gz; + sha256 = "19gncsfhypiaarsyhmca52yjx8cv86n31b6hxmdac8z4pczhg3gv"; + }; + + buildInputs = [ libtiff openexr imagemagick libjpeg qt mesa freeglut + bzip2 libX11 libpng expat ]; + + meta = { + homepage = http://pfstools.sourceforge.net/; + description = "Toolkit for manipulation of HDR images"; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 326575f9bcb..e38b941d52a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1090,6 +1090,13 @@ let pam = if getPkgConfig "pdsh" "pam" true then pam else null; }; + pfstools = import ../tools/graphics/pfstools { + inherit fetchurl stdenv imagemagick libjpeg libtiff mesa freeglut bzip2 libpng expat; + openexr = openexr_1_6_1; + qt = qt3; + inherit (xlibs) libX11; + }; + pinentry = import ../tools/misc/pinentry { inherit fetchurl stdenv pkgconfig ncurses; inherit (gnome) glib gtk; @@ -8643,6 +8650,11 @@ let inherit fetchurl stdenv emacs; }; + qtpfsgui = import ../applications/graphics/qtpfsgui { + inherit fetchurl stdenv exiv2 libtiff fftw qt4 ilmbase; + openexr = openexr_1_6_1; + }; + ratpoison = import ../applications/window-managers/ratpoison { inherit fetchurl stdenv fontconfig readline; inherit (xlibs) libX11 inputproto libXt libXpm libXft From 7f9d11782ef8a8af7b18c22e7f9265d807ffaf16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 5 Apr 2009 21:41:24 +0000 Subject: [PATCH 36/63] Adding panotools. svn path=/nixpkgs/trunk/; revision=14893 --- .../graphics/panotools/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/graphics/panotools/default.nix diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix new file mode 100644 index 00000000000..90bc8e64b25 --- /dev/null +++ b/pkgs/applications/graphics/panotools/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchsvn, libjpeg, libpng, libtiff, automake, libtool, autoconf }: + +stdenv.mkDerivation { + name = "panotools-r955"; + + src = fetchsvn { + url = https://panotools.svn.sourceforge.net/svnroot/panotools/trunk/libpano; + rev = 955; + }; + + configurePhase = '' + export AUTOGEN_CONFIGURE_ARGS="--prefix $out" + ./bootstrap + ''; + + buildInputs = [ libjpeg libpng libtiff automake libtool autoconf ]; + + meta = { + homepage = http://panotools.sourceforge.net/; + description = "Panorama Tools"; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e38b941d52a..88235fa2ec7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8577,6 +8577,10 @@ let spellChecking = false; }; + panotools = import ../applications/graphics/panotools { + inherit stdenv fetchsvn libpng libjpeg libtiff automake libtool autoconf; + }; + paraview = import ../applications/graphics/paraview { inherit fetchurl stdenv cmake qt4; }; From 2dd00f1a5702530263985cead85c51c7681132c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 5 Apr 2009 21:41:38 +0000 Subject: [PATCH 37/63] Adding enblend-fuse, libxmi and hugin. Maybe hugin doesn't run well enough still. svn path=/nixpkgs/trunk/; revision=14894 --- pkgs/applications/graphics/hugin/default.nix | 30 +++++++++++++++++++ pkgs/development/libraries/libxmi/default.nix | 16 ++++++++++ .../tools/graphics/enblend-enfuse/default.nix | 18 +++++++++++ pkgs/top-level/all-packages.nix | 14 +++++++++ 4 files changed, 78 insertions(+) create mode 100644 pkgs/applications/graphics/hugin/default.nix create mode 100644 pkgs/development/libraries/libxmi/default.nix create mode 100644 pkgs/tools/graphics/enblend-enfuse/default.nix diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix new file mode 100644 index 00000000000..b0bc5317ff9 --- /dev/null +++ b/pkgs/applications/graphics/hugin/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, pkgconfig, exiv2, gettext, ilmbase }: + +stdenv.mkDerivation { + name = "hugin-0.7.0"; + + src = fetchurl { + url = mirror://sourceforge/hugin/hugin-0.7.0.tar.gz; + sha256 = "0nbrvzz94gqgk2v1900lly101g0wjz4zksnh5718226n2g8zlccf"; + }; + + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + + NIX_LDFLAGS = "-lrt"; + + # I added these flags to get all the rpaths right, which I guess they are + # taken from the qt4 sources. Not very nice. + cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" + + " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" + + " -DCMAKE_SKIP_BUILD_RPATH=ON" + + " -DCMAKE_BUILD_TYPE=Release" + + " -DCMAKE_INSTALL_PREFIX=$out"; + + buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ]; + + meta = { + homepage = http://hugin.sourceforge.net/; + description = "Panoramic imaging toolchain"; + license = "GPL"; + }; +} diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix new file mode 100644 index 00000000000..fea49dc7645 --- /dev/null +++ b/pkgs/development/libraries/libxmi/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libxmi-1.2"; + + src = fetchurl { + url = mirror://gnu/libxmi/libxmi-1.2.tar.gz; + sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; + }; + + meta = { + description = "Library for rasterizing 2-D vector graphics"; + homepage = http://www.gnu.org/software/libxmi/; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix new file mode 100644 index 00000000000..d703e90d037 --- /dev/null +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, libtiff, libpng, lcms, libxmi, boost }: + +stdenv.mkDerivation { + name = "enblend-enfuse-3.2"; + + src = fetchurl { + url = mirror://sourceforge/enblend/enblend-enfuse-3.2.tar.gz; + sha256 = "0ly6fdn5ym1v6m1f4gqc6s4zqgrfcys1ypfm82g5qbhh66x6gqw4"; + }; + + buildInputs = [ libtiff libpng lcms libxmi boost ]; + + meta = { + homepage = http://enblend.sourceforge.net/; + description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; + license = "GPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88235fa2ec7..2fc35a99187 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -606,6 +606,10 @@ let inherit fetchurl stdenv emacs; }; + enblendenfuse = import ../tools/graphics/enblend-enfuse { + inherit fetchurl stdenv libtiff libpng lcms libxmi boost; + }; + enscript = import ../tools/text/enscript { inherit fetchurl stdenv; }; @@ -3588,6 +3592,10 @@ let inherit (gtkLibs) glib; }; + libxmi = import ../development/libraries/libxmi { + inherit fetchurl stdenv; + }; + libxml2 = import ../development/libraries/libxml2 { inherit fetchurl stdenv zlib python; pythonSupport = false; @@ -8284,6 +8292,12 @@ let inherit fetchurl stdenv; }; + hugin = import ../applications/graphics/hugin { + inherit stdenv fetchurl cmake panotools libtiff libpng boost pkgconfig exiv2 gettext ilmbase; + wxGTK = wxGTK28; + openexr = openexr_1_6_1; + }; + i810switch = import ../applications/misc/i810 { inherit fetchurl stdenv pciutils; }; From c36012783fde5e40132171c7230d82b8e6e055d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 5 Apr 2009 21:41:47 +0000 Subject: [PATCH 38/63] Fixing licenses for the last packages I added. svn path=/nixpkgs/trunk/; revision=14895 --- pkgs/applications/graphics/hugin/default.nix | 2 +- pkgs/applications/graphics/panotools/default.nix | 2 +- pkgs/applications/graphics/qtpfsgui/default.nix | 2 +- pkgs/tools/graphics/enblend-enfuse/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index b0bc5317ff9..f47858fcf2a 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = http://hugin.sourceforge.net/; description = "Panoramic imaging toolchain"; - license = "GPL"; + license = "GPLv2"; }; } diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 90bc8e64b25..90ede0e2d6f 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = http://panotools.sourceforge.net/; description = "Panorama Tools"; - license = "GPL"; + license = "LGPL"; }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index fd77524b8dc..e61679b113e 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { meta = { homepage = http://qtpfsgui.sourceforge.net/; description = "GUI frontend for some pfstools"; - license = "GPL"; + license = "GPLv2"; }; } diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index d703e90d037..4a9ef054417 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { meta = { homepage = http://enblend.sourceforge.net/; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; - license = "GPL"; + license = "GPLv2"; }; } From 152e2f36ec972afea283b7094ed95c224622d936 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 6 Apr 2009 08:04:57 +0000 Subject: [PATCH 39/63] Nginx update to 0.7.47 svn path=/nixpkgs/trunk/; revision=14896 --- pkgs/servers/http/nginx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index fbd2966237d..ca144ff684b 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -4,7 +4,7 @@ let fetchurl = args.fetchurl; FullDepEntry = args.FullDepEntry; - version = lib.getAttr ["version"] "0.7.23" args; + version = lib.getAttr ["version"] "0.7.47" args; buildInputs = with args; [ openssl zlib pcre libxml2 libxslt ]; @@ -12,7 +12,7 @@ in rec { src = fetchurl { url = "http://sysoev.ru/nginx/nginx-${version}.tar.gz"; - sha256 = "1fygkagzclfqygipgi140jf3aiwqn8yqxjmk181i31p4di5m46rk"; + sha256 = "0wcb5qmvlp2b9vfz8b897gk783bwp55kprxg4gss1i9r72jdp16a"; }; inherit buildInputs; From e5ed8fe009e4f6eebc8c27fdf74fcae9a5e06b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 Apr 2009 08:19:41 +0000 Subject: [PATCH 40/63] GNU IceCat 3.0.8-g1. svn path=/nixpkgs/trunk/; revision=14897 --- pkgs/applications/networking/browsers/icecat-3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 1b0a145963b..a525ef5b774 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -4,13 +4,13 @@ , freetype, fontconfig , application ? "browser" }: -let version = "3.0.7-g1"; in +let version = "3.0.8-g1"; in stdenv.mkDerivation { name = "icecat-${version}"; src = fetchurl { url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2"; - sha256 = "1xfv643prj22gy9g3sbzq13d8pv1yvzr2xi4z91r802x9rrm6grm"; + sha256 = "19lrz6kcy3n5fcw3xblgm99xcc6crm0bjrlny1917954c8mxxhji"; }; buildInputs = [ From 61a559cf972ecdd79aec4a77a2a787d078ec7cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 6 Apr 2009 08:26:13 +0000 Subject: [PATCH 41/63] Hugin: Fix `meta.license'. svn path=/nixpkgs/trunk/; revision=14898 --- pkgs/applications/graphics/hugin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index f47858fcf2a..1b96e552f31 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { homepage = http://hugin.sourceforge.net/; description = "Panoramic imaging toolchain"; - license = "GPLv2"; + license = "GPLv2+"; }; } From dab0ce81ac9d3977125a767e91dd66aa470239cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 6 Apr 2009 09:19:51 +0000 Subject: [PATCH 42/63] Fixing the hugin build, and its meta information, with help of civodul. svn path=/nixpkgs/trunk/; revision=14899 --- pkgs/applications/graphics/hugin/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 1b96e552f31..9f74f1702fc 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -15,16 +15,30 @@ stdenv.mkDerivation { # I added these flags to get all the rpaths right, which I guess they are # taken from the qt4 sources. Not very nice. cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" + - " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" + + " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" + + " -lpng12 -lpano13 -lImath -lIlmImf -lIex -lHalf -lIlmThread" + + " -ljpeg -ltiff -lz -lexiv2 -lboost_thread-mt\"" + " -DCMAKE_SKIP_BUILD_RPATH=ON" + " -DCMAKE_BUILD_TYPE=Release" + " -DCMAKE_INSTALL_PREFIX=$out"; - buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ]; + buildInputs = [ cmake panotools wxGTK libtiff libpng openexr boost pkgconfig exiv2 gettext ilmbase ]; + + dontUseCmakeConfigure = true; + + # I rewrote the configure phase to get the $out references evaluated in + # cmakeFlags + configurePhase = '' + set -x + mkdir -p build; + cd build + eval -- "cmake .. $cmakeFlags" + set +x + ''; meta = { homepage = http://hugin.sourceforge.net/; - description = "Panoramic imaging toolchain"; + description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = "GPLv2+"; }; } From 613cc80e1dc568bde9f5e425981396e6460cd64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 6 Apr 2009 09:34:28 +0000 Subject: [PATCH 43/63] Adding sha256 hash to panotools, and improving its description. svn path=/nixpkgs/trunk/; revision=14900 --- pkgs/applications/graphics/panotools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 90ede0e2d6f..579c8744681 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation { src = fetchsvn { url = https://panotools.svn.sourceforge.net/svnroot/panotools/trunk/libpano; rev = 955; + sha256 = "e896c21caa098d33f33f33f134a8c9a725686c2470fe3cd08b76cd7934a56034"; }; configurePhase = '' @@ -17,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = http://panotools.sourceforge.net/; - description = "Panorama Tools"; + description = "Free software suite for authoring and displaying virtual reality panoramas"; license = "LGPL"; }; } From 0311bb19c800721da1111405a4723e6139c92a2e Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 6 Apr 2009 13:07:18 +0000 Subject: [PATCH 44/63] adding openvpn svn path=/nixpkgs/trunk/; revision=14901 --- pkgs/tools/networking/openvpn/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/openvpn/default.nix diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix new file mode 100644 index 00000000000..7da8efcb622 --- /dev/null +++ b/pkgs/tools/networking/openvpn/default.nix @@ -0,0 +1,17 @@ +args: with args; +stdenv.mkDerivation { + name = "OpenVPN-2.1_rc15"; + + src = fetchurl { + url = http://openvpn.net/release/openvpn-2.1_rc15.tar.gz; + sha256 = "198k5lbw0bnx67hgflzlzncmdnww0wa7fll0kkirmckav93y7kv6"; + }; + + buildInputs = [ iproute lzo openssl]; + + meta = { + description="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."; + homepage="http://openvpn.net/"; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fc35a99187..15dcb40c176 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1056,6 +1056,10 @@ let pamSupport = getPkgConfig "openssh" "pam" true; }; + openvpn = import ../tools/networking/openvpn { + inherit fetchurl stdenv iproute lzo openssl; + }; + p7zip = import ../tools/archivers/p7zip { inherit fetchurl stdenv; }; From c22abb7c2a41d2e6188ad5ced8f11b96b31778db Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 6 Apr 2009 13:07:21 +0000 Subject: [PATCH 45/63] adding open source adobe flex sdk svn path=/nixpkgs/trunk/; revision=14902 --- .../compilers/adobe-flex-sdk/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/compilers/adobe-flex-sdk/default.nix diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix new file mode 100644 index 00000000000..7beea35a78a --- /dev/null +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -0,0 +1,38 @@ +args: with args; +stdenv.mkDerivation rec { + name = "adobe-flex-sdk-3.3.0.4852_mpl"; + + src = fetchurl { + url = http://flexorg.wip3.adobe.com/flexsdk/3.3.0.4852/flex_sdk_3.3.0.4852_mpl.zip; + sha256 = "1gsm774afc7zwv3hyib5n6fpdbnd0dh6z7r2amjf38fm96jw7a99"; + }; + + phases="installPhase"; + + buildInputs = [ unzip ]; + + # Why do shell scripts have \r\n ?? + # moving to /opt because jdk has lib/xercesImpl.jar as well + installPhase = '' + unzip ${src} + t=$out/opt/flex-sdk + ensureDir $t $out/bin + mv * $t + sed 's/ $//' -i $t/bin/mxmlc + rm $t/bin/*.exe + for i in $t/bin/mxmlc; do + b="$(basename "$i")"; + cat > "$out/bin/$b" << EOF + #!/bin/sh + exec $t/bin/$b "\$@" + EOF + chmod +x $out/bin/$b $t/bin/$b + done + ''; + + meta = { + description = "flex sdk flash / action script developement kit"; + homepage = "http://www.adobe.com/support/documentation/en/flex/3/releasenotes_flex3_sdk.html#installation"; + license = "MPLv1.1"; # Mozilla Public License Version 1.1 + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15dcb40c176..0364f9f3eb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1521,6 +1521,10 @@ let inherit fetchsvn stdenv coreutils m4 libtool ghc uulib uuagc llvm; }; + adobeFlexSDK33 = import ../development/compilers/adobe-flex-sdk { + inherit fetchurl stdenv unzip jre; + }; + fpc = import ../development/compilers/fpc { inherit fetchurl stdenv gawk system; }; From 80f11038319006494f8c4022c9770743f0899997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 6 Apr 2009 17:11:15 +0000 Subject: [PATCH 46/63] Fixing libxmi on x86_64. svn path=/nixpkgs/trunk/; revision=14903 --- pkgs/development/libraries/libxmi/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index fea49dc7645..764d9f15108 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, libtool}: stdenv.mkDerivation { name = "libxmi-1.2"; @@ -7,6 +7,9 @@ stdenv.mkDerivation { url = mirror://gnu/libxmi/libxmi-1.2.tar.gz; sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; }; + + # For the x86_64 linux arch to be recognized by 'configure' + preConfigure = "cp ${libtool}/share/libtool/config.sub ."; meta = { description = "Library for rasterizing 2-D vector graphics"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0364f9f3eb5..5765a606e5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3601,7 +3601,7 @@ let }; libxmi = import ../development/libraries/libxmi { - inherit fetchurl stdenv; + inherit fetchurl stdenv libtool; }; libxml2 = import ../development/libraries/libxml2 { From d0f0f035e5ccea4e5624bed873eb3c905ae45321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 6 Apr 2009 17:50:17 +0000 Subject: [PATCH 47/63] Adding dcraw. svn path=/nixpkgs/trunk/; revision=14904 --- 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 5765a606e5d..0caedea3c15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -558,6 +558,10 @@ let inherit fetchurl stdenv zlib bzip2 openssl; }; + dcraw = import ../tools/graphics/dcraw { + inherit fetchurl stdenv gettext libjpeg lcms; + }; + ddrescue = builderDefsPackage (selectVersion ../tools/system/ddrescue "1.8") {}; desktop_file_utils = import ../tools/misc/desktop-file-utils { From 2dc96ff945f71d42b33769824332eb99a8eca737 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 7 Apr 2009 13:54:52 +0000 Subject: [PATCH 48/63] removed metaBuildEnvTrunk, not necessary any more svn path=/nixpkgs/trunk/; revision=14909 --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0caedea3c15..115b3bfe60b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2028,10 +2028,6 @@ let inherit fetchurl stdenv ; }; - metaBuildEnvTrunk = import ../development/compilers/meta-environment/meta-build-env/trunk.nix { - inherit fetchurl stdenv ; - }; - swiProlog = composedArgsAndFun (selectVersion ../development/compilers/swi-prolog "5.6.51") { inherit fetchurl stdenv; }; From d4646914ced32f4a7959b683590d0852ae3a8c34 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 7 Apr 2009 13:57:26 +0000 Subject: [PATCH 49/63] removed metaBuildEnvTrunk, not necessary any more svn path=/nixpkgs/trunk/; revision=14910 --- .../compilers/meta-environment/meta-build-env/trunk.nix | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix diff --git a/pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix b/pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix deleted file mode 100644 index 3866db27455..00000000000 --- a/pkgs/development/compilers/meta-environment/meta-build-env/trunk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "meta-build-env-trunk"; - src = fetchurl { - url = http://hydra.nixos.org/build/9794/download/1/meta-build-env-0.1.tar.gz ; - sha256 = "1337000664114df83025e165b5af202a153654ea3226a347dc150769260c7a7b" ; - }; -} From 6a55db1e680e5aa4373a0bd100351bd39b3007c2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Apr 2009 13:59:30 +0000 Subject: [PATCH 50/63] * Disable missing dcraw. svn path=/nixpkgs/trunk/; revision=14911 --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 115b3bfe60b..69e5fd47fd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -558,9 +558,11 @@ let inherit fetchurl stdenv zlib bzip2 openssl; }; + /* dcraw = import ../tools/graphics/dcraw { inherit fetchurl stdenv gettext libjpeg lcms; }; + */ ddrescue = builderDefsPackage (selectVersion ../tools/system/ddrescue "1.8") {}; From 7ae8544b4c6e96ac088c0481e16c43e66268f3d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 7 Apr 2009 16:03:30 +0000 Subject: [PATCH 51/63] * ntfs-3g updated to 2009.4.4. The old version has disappeared anyway. svn path=/nixpkgs/trunk/; revision=14915 --- pkgs/misc/ntfs-3g/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/ntfs-3g/default.nix b/pkgs/misc/ntfs-3g/default.nix index a8c9af6271f..5fedd9a7386 100644 --- a/pkgs/misc/ntfs-3g/default.nix +++ b/pkgs/misc/ntfs-3g/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ntfs-3g"; - version = "2009.2.1"; + version = "2009.4.4"; name = "${pname}-${version}"; src = fetchurl { url = "${meta.homepage}/${name}.tgz"; - sha256 = "1c3qhn0i5hlyk9dky5a4jnbfkyz73d3qpymblc8mhhx642nigbj7"; + sha256 = "03qdbv0c6gfssmb2s0zzqhwp447n2hgr2qjvc0p527slj2z9xlxw"; }; preConfigure = '' From 2c3aaf09d184ae61dc753c219e786fe6c30307c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 7 Apr 2009 19:15:53 +0000 Subject: [PATCH 52/63] Adding autopano-sift-C, a C implementation of autopano-sift, made by the hugin people. svn path=/nixpkgs/trunk/; revision=14916 --- .../graphics/autopanosiftc/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/graphics/autopanosiftc/default.nix diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix new file mode 100644 index 00000000000..424d8dcaf97 --- /dev/null +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, cmake, libpng, libtiff, libjpeg, panotools, libxml2 }: + +stdenv.mkDerivation { + name = "autopano-sift-C-2.5.0"; + + src = fetchurl { + url = mirror://sourceforge/hugin/autopano-sift-C-2.5.0.tar.gz; + sha256 = "0pvkapjg7qdkjg151wjc7islly9ag8fg6bj0g5nbllv981ixjql3"; + }; + + buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ]; + + # I added these flags to get all the rpaths right, which I guess they are + # taken from the qt4 sources. Not very nice. + cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib\"" + + " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib" + + " -lpng12 -lpano13 -ljpeg -ltiff -lz -lxml2 \"" + + " -DCMAKE_SKIP_BUILD_RPATH=ON" + + " -DCMAKE_BUILD_TYPE=Release" + + " -DCMAKE_INSTALL_PREFIX=$out"; + + dontUseCmakeConfigure = true; + + # I rewrote the configure phase to get the $out references evaluated in + # cmakeFlags + configurePhase = '' + set -x + mkdir -p build; + cd build + eval -- "cmake .. $cmakeFlags" + set +x + ''; + + meta = { + homepage = http://hugin.sourceforge.net/; + description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas"; + license = "GPLv2"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69e5fd47fd4..634e6cebb8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7728,6 +7728,10 @@ let gtkGUI = false; }; + autopanosiftc = import ../applications/graphics/autopanosiftc { + inherit fetchurl stdenv cmake libpng libtiff libjpeg panotools libxml2; + }; + batik = import ../applications/graphics/batik { inherit fetchurl stdenv unzip; }; From 6f96ae757de88295289fe7724ef1c505560b8125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 7 Apr 2009 19:17:22 +0000 Subject: [PATCH 53/63] Adding dcraw again, this time with the whole nix expression. svn path=/nixpkgs/trunk/; revision=14917 --- pkgs/tools/graphics/dcraw/default.nix | 29 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/graphics/dcraw/default.nix diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix new file mode 100644 index 00000000000..d69acd9168b --- /dev/null +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, libjpeg, lcms, gettext }: + +stdenv.mkDerivation { + name = "dcraw-8.93"; + + src = fetchurl { + url = http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-8.93.tar.gz; + sha256 = "1vjqfpqr0pczrf8ap3jpar1f98gik9is9v34sv1ridcxx87rniqz"; + }; + + buildInputs = [ libjpeg lcms gettext ]; + + patchPhase = '' + sed -i -e s@/usr/local@$out@ install + ''; + + buildPhase = '' + ensureDir $out/bin + set +e + sh install + set -e + ''; + + meta = { + homepage = http://www.cybercom.net/~dcoffin/dcraw/; + description = "Decoder for many camera raw picture formats"; + license = "free"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 634e6cebb8a..e37ca7d48fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -558,11 +558,9 @@ let inherit fetchurl stdenv zlib bzip2 openssl; }; - /* dcraw = import ../tools/graphics/dcraw { inherit fetchurl stdenv gettext libjpeg lcms; }; - */ ddrescue = builderDefsPackage (selectVersion ../tools/system/ddrescue "1.8") {}; From 686147d0f69895d8688eadcf8aecd9d19a2c5b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 8 Apr 2009 07:29:42 +0000 Subject: [PATCH 54/63] Making bc use readline. I prefer bc with readline. svn path=/nixpkgs/trunk/; revision=14919 --- pkgs/tools/misc/bc/default.nix | 8 ++++++-- pkgs/tools/misc/bc/readlinefix.patch | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/misc/bc/readlinefix.patch diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 48de3879d39..da0ff24700c 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex}: +{stdenv, fetchurl, flex, readline}: stdenv.mkDerivation { name = "bc-1.0.6"; @@ -7,5 +7,9 @@ stdenv.mkDerivation { md5 = "d44b5dddebd8a7a7309aea6c36fda117"; }; - buildInputs = [flex]; + patches = [ ./readlinefix.patch ]; + + configureFlags = "--with-readline"; + + buildInputs = [flex readline]; } diff --git a/pkgs/tools/misc/bc/readlinefix.patch b/pkgs/tools/misc/bc/readlinefix.patch new file mode 100644 index 00000000000..74a66e90615 --- /dev/null +++ b/pkgs/tools/misc/bc/readlinefix.patch @@ -0,0 +1,11 @@ +diff -Naur bc-1.06.orig/bc/scan.l bc-1.06/bc/scan.l +--- bc-1.06.orig/bc/scan.l 2000-09-13 13:25:47.000000000 -0500 ++++ bc-1.06/bc/scan.l 2002-07-09 14:36:34.000000000 -0500 +@@ -143,7 +143,6 @@ + + /* Definitions for readline access. */ + extern FILE *rl_instream; +-_PROTOTYPE(char *readline, (char *)); + + /* rl_input puts upto MAX characters into BUF with the number put in + BUF placed in *RESULT. If the yy input file is the same as diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e37ca7d48fa..7f36cf1ae8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -422,7 +422,7 @@ let }; bc = import ../tools/misc/bc { - inherit fetchurl stdenv flex; + inherit fetchurl stdenv flex readline; }; bfr = import ../tools/misc/bfr { From 5ebbf908781d32e84f7256fc9d9a498b24e956d9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 8 Apr 2009 09:41:18 +0000 Subject: [PATCH 55/63] Added embedded server option which is required by applications such as amarok svn path=/nixpkgs/trunk/; revision=14923 --- pkgs/servers/sql/mysql5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql5/default.nix b/pkgs/servers/sql/mysql5/default.nix index 2f546edf1f7..4666530929e 100644 --- a/pkgs/servers/sql/mysql5/default.nix +++ b/pkgs/servers/sql/mysql5/default.nix @@ -1,4 +1,4 @@ -args: with args; +{stdenv, fetchurl, ps, ncurses, zlib, perl, openssl}: # Note: zlib is not required; MySQL can use an internal zlib. @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ps ncurses zlib perl openssl]; - configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db"; + configureFlags = "--enable-thread-safe-client --disable-static --with-openssl=${openssl} --with-berkeley-db --with-embedded-server"; postInstall = '' From 8ddd79ca2ec216cdfd7ad7834c366129ec437537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 8 Apr 2009 10:09:14 +0000 Subject: [PATCH 56/63] Making cdecl compile with readline. svn path=/nixpkgs/trunk/; revision=14941 --- pkgs/development/tools/cdecl/cdecl-2.5.patch | 4 ++-- pkgs/development/tools/cdecl/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/cdecl/cdecl-2.5.patch b/pkgs/development/tools/cdecl/cdecl-2.5.patch index b66ee1a2c4e..4b00849f372 100644 --- a/pkgs/development/tools/cdecl/cdecl-2.5.patch +++ b/pkgs/development/tools/cdecl/cdecl-2.5.patch @@ -7,10 +7,10 @@ index 9e85686..b8e6e02 100644 # add -DUSE_READLINE To compile in support for the GNU readline library. -CFLAGS= -s -O2 -DUSE_READLINE -+ ++CFLAGS=-DUSE_READLINE CC= gcc -LIBS= -lreadline -ltermcap -+ ++LIBS= -lreadline -lncursesw ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++ -BINDIR= /usr/bin -MANDIR= /usr/man/man1 diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 65377508d9f..c2682391c55 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, yacc, flex, readline}: +{stdenv, fetchurl, yacc, flex, readline, ncurses}: stdenv.mkDerivation { name = "cdecl-2.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { preBuild = " makeFlags=\"PREFIX=$out\" "; - buildInputs = [yacc flex readline]; + buildInputs = [yacc flex readline ncurses]; meta = { description = "Translator English -- C/C++ declarations"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f36cf1ae8e..20c5daf9c1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -480,7 +480,7 @@ let }; cdecl = import ../development/tools/cdecl { - inherit fetchurl stdenv yacc flex readline; + inherit fetchurl stdenv yacc flex readline ncurses; }; cdrdao = import ../tools/cd-dvd/cdrdao { From a148295295aa18ca543fed3c7f998e184bf35f7e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 Apr 2009 13:28:15 +0000 Subject: [PATCH 57/63] * W3C::LinkChecker, which contains the checklink tool. svn path=/nixpkgs/trunk/; revision=14944 --- pkgs/top-level/all-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20c5daf9c1a..c9db2d027c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5624,6 +5624,14 @@ let }; }; + perlPerl5lib = buildPerlPackage rec { + name = "perl5lib-1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NO/NOBULL/${name}.tar.gz"; + sha256 = "1b6fgs8wy2a7ff8rr1qdvdghhvlpr1pv760k4i2c8lq1hhjnkf94"; + }; + }; + perlPerlIOeol = buildPerlPackage { name = "PerlIO-eol-0.14"; src = fetchurl { @@ -6182,6 +6190,21 @@ let }; }; + perlW3CLinkChecker = buildPerlPackage rec { + name = "W3C-LinkChecker-4.5"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SC/SCOP/${name}.tar.gz"; + sha256 = "0j2zlg57g0y9hqy8n35x5rfkpm7rnfjlwny5g0zaxwrl62ndkbm9"; + }; + propagatedBuildInputs = [ + perlLWP perlConfigGeneral perlNetIP perlTermReadKey perlPerl5lib + ]; + meta = { + homepage = http://validator.w3.org/checklink; + description = "A tool to check links and anchors in Web pages or full Web sites"; + }; + }; + perlWWWMechanize = buildPerlPackage rec { name = "WWW-Mechanize-1.54"; src = fetchurl { From 47217f9ada79f4d8173a78becf47b50c187e30ec Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 Apr 2009 13:49:26 +0000 Subject: [PATCH 58/63] * Build checklink with SSL support. svn path=/nixpkgs/trunk/; revision=14950 --- pkgs/top-level/all-packages.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9db2d027c5..6d7abfc8d34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4848,6 +4848,15 @@ let }; }; + perlCryptSSLeay = buildPerlPackage rec { + name = "Crypt-SSLeay-0.57"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DL/DLAND/${name}.tar.gz"; + sha256 = "1f0i5y99ly39vf86jpzwqz8mkz1460vryv85jgqmfx007p781s0l"; + }; + makeMakerFlags = "--lib=${openssl}/lib"; + }; + perlDataDump = buildPerlPackage { name = "Data-Dump-1.11"; src = fetchurl { @@ -5468,10 +5477,10 @@ let }; perlLWP = buildPerlPackage rec { - name = "libwww-perl-5.823"; + name = "libwww-perl-5.825"; src = fetchurl { url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; - sha256 = "1pz65p02dcy1yf4l1zhhwjmnh6fvf8q71nsmhjpc5lydsf35h1ql"; + sha256 = "1wb7br1n86571xz19l20cc5ysy1lx3rhvlk02g5517919z3jxvhw"; }; propagatedBuildInputs = [perlURI perlHTMLParser perlHTMLTagset]; }; @@ -6198,6 +6207,7 @@ let }; propagatedBuildInputs = [ perlLWP perlConfigGeneral perlNetIP perlTermReadKey perlPerl5lib + perlCryptSSLeay ]; meta = { homepage = http://validator.w3.org/checklink; From 813a3b6c6d761f4d472f45515ada421972f4f137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 8 Apr 2009 20:05:59 +0000 Subject: [PATCH 59/63] Adding freepv, without its mozilla plug-in. svn path=/nixpkgs/trunk/; revision=14954 --- pkgs/applications/graphics/freepv/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/graphics/freepv/default.nix diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix new file mode 100644 index 00000000000..1e414faf2f0 --- /dev/null +++ b/pkgs/applications/graphics/freepv/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng, + libXxf86vm }: + +stdenv.mkDerivation { + name = "freepv-0.3.0_beta1"; + + src = fetchurl { + url = mirror://sourceforge/freepv/freepv-0.3.0_beta1.tar.gz; + sha256 = "084qqa361np73anvqrv78ngw8hjxglmdm3akkpszbwnzniw89qla"; + }; + + buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng + libXxf86vm ]; + + patchPhase = '' + sed -i -e '/GECKO/d' CMakeLists.txt + sed -i -e '/mozilla/d' src/CMakeLists.txt + ''; + + # I added these flags to get all the rpaths right, which I guess they are + # taken from the qt4 sources. Not very nice. + cmakeFlags = " -DCMAKE_EXE_LINKER_FLAGS=\"" + + " -lpng12 -lXxf86vm -ljpeg -lz -lglut -lGLU -lxml2 -lX11\"" + + " -DCMAKE_SKIP_BUILD_RPATH=ON" + + " -DCMAKE_BUILD_TYPE=Release" + + " -DCMAKE_INSTALL_PREFIX=$out"; + + dontUseCmakeConfigure = true; + + # I rewrote the configure phase to get the $out references evaluated in + # cmakeFlags + configurePhase = '' + set -x + mkdir -p build; + cd build + eval -- "cmake .. $cmakeFlags" + set +x + ''; + + meta = { + description = "Open source panorama viewer using GL"; + homepage = http://freepv.sourceforge.net/; + license = "LGPL"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d7abfc8d34..c32691abda9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8252,6 +8252,11 @@ let jre = jdk; }; + freepv = import ../applications/graphics/freepv { + inherit fetchurl stdenv mesa freeglut libjpeg zlib cmake libxml2 libpng; + inherit (xlibs) libX11 libXxf86vm; + }; + fspot = import ../applications/graphics/f-spot { inherit fetchurl stdenv perl perlXMLParser pkgconfig mono libexif libjpeg sqlite lcms libgphoto2 monoDLLFixer; From 9f2a2a6a84f5c7d18f7684e6d0e7f349d6a1a503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 8 Apr 2009 20:06:03 +0000 Subject: [PATCH 60/63] Adding qhull, and updating octaves. svn path=/nixpkgs/trunk/; revision=14955 --- .../interpreters/octave/default.nix | 10 +++--- pkgs/development/interpreters/octave/hg.nix | 12 +++---- pkgs/development/libraries/qhull/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 +++++-- 4 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/libraries/qhull/default.nix diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 787682f1e2c..ae75e222c09 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, g77, readline, ncurses, perl, flex}: +{stdenv, fetchurl, g77, readline, ncurses, perl, flex, texinfo, qhull}: assert readline != null && ncurses != null && flex != null; assert g77.langF77; stdenv.mkDerivation { - name = "octave-2.9.6"; + name = "octave-3.0.4"; src = fetchurl { - url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.6.tar.bz2; - md5 = "10f07dbc0951a7318502a9f1e51e6388"; + url = ftp://ftp.octave.org/pub/octave/octave-3.0.4.tar.bz2; + sha256 = "1rkpzig0r0zrm73avxgai0zqkz9hv4js57i1xxdzcm22qw22szaj"; }; - buildInputs = [g77 readline ncurses perl flex]; + buildInputs = [g77 readline ncurses perl flex texinfo qhull]; configureFlags = "--enable-readline --enable-dl --disable-static --enable-shared"; } diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix index 037a2ab66b0..f4ecde662aa 100644 --- a/pkgs/development/interpreters/octave/hg.nix +++ b/pkgs/development/interpreters/octave/hg.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, g77, readline, ncurses, perl, flex, - bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive}: + bison, autoconf, automake, sourceByName, getConfig, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}: assert readline != null && ncurses != null && flex != null; assert g77.langF77; -let commonBuildInputs = [g77 readline ncurses perl glibc]; in +let commonBuildInputs = [g77 readline ncurses perl glibc qhull libX11 texinfo]; in stdenv.mkDerivation ({ NIX_LDFLAGS = "-lpthread"; @@ -26,7 +26,7 @@ stdenv.mkDerivation ({ ./autogen.sh export HOME=$TMP ''; - buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texinfo texLive ] + buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texLive ] ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ]; # it does build, but documentation doesn't.. So just remove that directory # from the buildfile @@ -38,10 +38,10 @@ stdenv.mkDerivation ({ make ''; } else { - name = "octave-3.1.51"; + name = "octave-3.1.55"; src = fetchurl { - url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-3.1.51.tar.bz2; - sha256 = "0v0khhpmydyimvdl2rswfd0jrcqa9rhd3cyi60zhqv2hi0bhmkh8"; + url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-3.1.55.tar.bz2; + sha256 = "1lm4v85kdic4n5yxwzrdb0v6dc6nw06ljgx1q8hfkmi146kpg7s6"; }; buildInputs = commonBuildInputs ++ [ flex bison autoconf automake python ] ++ lib.optionals (getConfig ["octave" "atlas"] true) [ python atlas ]; diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix new file mode 100644 index 00000000000..522c0cb7535 --- /dev/null +++ b/pkgs/development/libraries/qhull/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "qhull-2003.1"; + src = fetchurl { + url = http://www.qhull.org/download/qhull-2003.1-src.tgz; + sha256 = "1ah6yhh8qxqmvjcpmijibxcw8gjwvdcrb9g7j2rkawazq95a2j0s"; + }; + + NIX_CFLAGS_COMPILE = "-fno-strict-aliasing " + + (if stdenv.system == "x86_64-linux" then "-fPIC" else ""); + + patchPhase = '' + cd src + sed -i -e "s@/usr/local@$out@" Makefile; + sed -i -e "s@man/man1@share/man/man1@" Makefile; + ''; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/include/qhull + ensureDir $out/lib + ensureDir $out/share/man/man1 + cp *.h $out/include/qhull + cp libqhull.a $out/lib + ''; + + meta = { + homepage = http://www.qhull.org/; + description = "Computes the convex hull, Delaunay triangulation, ..."; + license = "free"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c32691abda9..2e676c9d64a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1152,6 +1152,10 @@ let inherit stdenv fetchurl python antlr; }; + qhull = import ../development/libraries/qhull { + inherit stdenv fetchurl; + }; + qtparted = import ../tools/misc/qtparted { inherit fetchurl stdenv e2fsprogs ncurses readline parted zlib qt3; inherit (xlibs) libX11 libXext; @@ -2116,15 +2120,17 @@ let }; octave = import ../development/interpreters/octave { - inherit stdenv fetchurl readline ncurses perl flex; + inherit stdenv fetchurl readline ncurses perl flex qhull texinfo; g77 = g77_42; }; # mercurial (hg) bleeding edge version octaveHG = import ../development/interpreters/octave/hg.nix { - inherit fetchurl readline ncurses perl flex atlas getConfig glibc; + inherit fetchurl readline ncurses perl flex atlas getConfig glibc qhull; inherit automake autoconf bison gperf lib python gnuplot texinfo texLive; # for dev Version - stdenv = overrideGCC stdenv gcc40; + inherit stdenv; + inherit (xlibs) libX11; + #stdenv = overrideGCC stdenv gcc40; g77 = g77_42; inherit (bleedingEdgeRepos) sourceByName; }; From 645279d54441f1796e532ed6ab1954146c44cae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 8 Apr 2009 22:08:05 +0000 Subject: [PATCH 61/63] Updating atlas svn path=/nixpkgs/trunk/; revision=14957 --- pkgs/development/libraries/science/math/atlas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 037de754a27..b1025a32ff4 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,10 +1,10 @@ args: with args; stdenv.mkDerivation { - name = "atlas-3.8.2"; + name = "atlas-3.9.9"; src = fetchurl { - url = http://kent.dl.sourceforge.net/sourceforge/math-atlas/atlas3.8.2.tar.bz2; - sha256 = "1avbfppzgiws3nvqr7isr5a5pfbk3g4gfgd89xhyiywixjj3f7c6"; + url = http://kent.dl.sourceforge.net/sourceforge/math-atlas/atlas3.9.9.tar.bz2; + sha256 = "0apbiqr0hlb38mrnlij0szsraxvxqfqainmp59xqj94pndx5s3yk"; }; # configure outside of the source directory From 4962864417775803ab32a92eacf6857e77fffa70 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Apr 2009 08:12:16 +0000 Subject: [PATCH 62/63] * Fixed the mount-cifs source URL (copied from the stdenv-branch). svn path=/nixpkgs/trunk/; revision=14958 --- pkgs/build-support/vm/default.nix | 9 +++------ pkgs/os-specific/linux/mount-cifs/default.nix | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index d8d2a8db522..42bc2f5652d 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -13,14 +13,11 @@ rec { rootModules = ["cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8"]; }; - + + # !!! should use the mount_cifs package in all-packages.nix here. mountCifs = (makeStaticBinaries stdenv).mkDerivation { name = "mount.cifs"; - src = fetchurl { - name = "mount.cifs.c"; - url = "http://websvn.samba.org/cgi-bin/viewcvs.cgi/*checkout*/branches/SAMBA_3_0/source/client/mount.cifs.c?rev=6103"; - sha256 = "19205gd3pv8g519hlbjaw559wqgf0h2vkln9xgqaqip2h446qarp"; - }; + src = mount_cifs.src; buildInputs = [nukeReferences]; buildCommand = '' ensureDir $out/bin diff --git a/pkgs/os-specific/linux/mount-cifs/default.nix b/pkgs/os-specific/linux/mount-cifs/default.nix index d8c901b77f4..490e6e05cba 100644 --- a/pkgs/os-specific/linux/mount-cifs/default.nix +++ b/pkgs/os-specific/linux/mount-cifs/default.nix @@ -4,9 +4,8 @@ stdenv.mkDerivation { name = "mount.cifs"; src = fetchurl { - name = "mount.cifs.c"; - url = "http://websvn.samba.org/cgi-bin/viewcvs.cgi/*checkout*/branches/SAMBA_3_0/source/client/mount.cifs.c?rev=6103"; - sha256 = "19205gd3pv8g519hlbjaw559wqgf0h2vkln9xgqaqip2h446qarp"; + url = http://nixos.org/tarballs/mount_cifs-20090330.c; + sha256 = "1d9v3qzic3d12vna8g7d1zsl1piwm20f6xhck319rbfkrdg0smnl"; }; buildCommand = '' From f2867f237ba197579f0f64dfd70711affac02ae0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Apr 2009 08:43:46 +0000 Subject: [PATCH 63/63] * Boost: provide a variant boostFull that has all the static, debug, and single-threaded libraries. svn path=/nixpkgs/trunk/; revision=14959 --- pkgs/development/libraries/boost/1.38.0.nix | 27 +++++++++++++++++++-- pkgs/top-level/all-packages.nix | 9 ++++++- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boost/1.38.0.nix b/pkgs/development/libraries/boost/1.38.0.nix index b88e1dc1fda..0a01ca80e78 100644 --- a/pkgs/development/libraries/boost/1.38.0.nix +++ b/pkgs/development/libraries/boost/1.38.0.nix @@ -1,4 +1,27 @@ -{stdenv, fetchurl, icu, expat, zlib, bzip2, python}: +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +}: + +let + + variant = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableRelease "release" ++ + stdenv.lib.optional enableDebug "debug"); + + threading = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableSingleThreaded "single" ++ + stdenv.lib.optional enableMultiThreaded "multi"); + + link = stdenv.lib.concatStringsSep "," + (stdenv.lib.optional enableShared "shared" ++ + stdenv.lib.optional enableStatic "static"); + +in stdenv.mkDerivation { name = "boost-1.38.0"; @@ -17,7 +40,7 @@ stdenv.mkDerivation { buildInputs = [icu expat zlib bzip2 python]; preBuild = '' - makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=release threading=multi link=shared") + makeFlagsArray=(BJAM_CONFIG="-sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=system variant=${variant} threading=${threading} link=${link}") ''; configureFlags = "--with-icu=${icu} --with-python=${python}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e676c9d64a..4a0969e7e6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2787,10 +2787,17 @@ let inherit fetchurl stdenv icu expat zlib bzip2 python; }; - boost = import ../development/libraries/boost/1.38.0.nix { + boost = makeOverridable (import ../development/libraries/boost/1.38.0.nix) { inherit fetchurl stdenv icu expat zlib bzip2 python; }; + # A Boost build with all library variants enabled. Very large (about 250 MB). + boostFull = appendToName "full" (boost.override { + enableDebug = true; + enableSingleThreaded = true; + enableStatic = true; + }); + botan = builderDefsPackage (import ../development/libraries/botan) { inherit perl; };