From bba637c718f23f5eb0e0f554c4b083a2089d7dd3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 Apr 2010 10:42:29 +0000 Subject: [PATCH 001/342] pkgs/development/interpreters/python/3.1: renamed this package to "python3" Python version 3.x is really quite different from 2.x. Using a new name for the package prevents Nix from performing unintended updates to the 3.x version. svn path=/nixpkgs/trunk/; revision=21264 --- pkgs/development/interpreters/python/3.1/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/3.1/default.nix b/pkgs/development/interpreters/python/3.1/default.nix index 8f3a94e137e..963a4aec26c 100644 --- a/pkgs/development/interpreters/python/3.1/default.nix +++ b/pkgs/development/interpreters/python/3.1/default.nix @@ -12,8 +12,9 @@ , sw_vers ? null }: -# I haven't spend much time on this derivation. So some of these settings may not apply to python-3.1 -# +# This derivation is mostly identical to the one that builds Python 2.x. +# Some of these settings may not apply to the latest version. A general +# cleanup might be worthwile. assert zlibSupport -> zlib != null; assert gdbmSupport -> gdbm != null; @@ -47,7 +48,7 @@ let in stdenv.mkDerivation ( { - name = "python-${version}"; + name = "python3-${version}"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; From 9fce3b7efc060a07f97fb2d4054de1fdbf326aef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Apr 2010 11:58:59 +0000 Subject: [PATCH 002/342] * Zabbix updated to 1.8.2. svn path=/nixpkgs/trunk/; revision=21267 --- pkgs/servers/monitoring/zabbix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 0e708df55f3..1206eb97ba0 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0z4a5lbpgszc2vfg2hc30c1l3l1lbihinqx2sygxf9r5y9k7fj7g"; + sha256 = "10gx47kckjrwl6ssq8ky896gbscwnqc6gxvhsbqcdhai8m2h07ds"; }; preConfigure = From 776d8267c6948207a3b15243628f21c16ce58a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 23 Apr 2010 12:38:34 +0000 Subject: [PATCH 003/342] Added a couple of comments to ghc expression and myself as maintainer, in preparation for adding ghc-6.12.2 ... svn path=/nixpkgs/trunk/; revision=21268 --- pkgs/development/compilers/ghc/6.12.1.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix index b54001a70ea..20a3a606be8 100644 --- a/pkgs/development/compilers/ghc/6.12.1.nix +++ b/pkgs/development/compilers/ghc/6.12.1.nix @@ -5,6 +5,7 @@ stdenv.mkDerivation rec { name = "ghc-${version}"; + # TODO: Does this have to be here, or can it go to meta? homepage = "http://haskell.org/ghc"; src = fetchurl { @@ -34,11 +35,14 @@ stdenv.mkDerivation rec { meta = { inherit homepage; description = "The Glasgow Haskell Compiler"; - maintainers = [stdenv.lib.maintainers.marcweber]; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + ]; platforms = stdenv.lib.platforms.linux; }; - + # TODO: requires a comment as to what it does and why it is needed. passthru = { corePackages = [ [ "Cabal" "1.8.0.2" ] From 7f8c11af2ff8921820a95e6b4ff87866a918226c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 23 Apr 2010 18:56:15 +0000 Subject: [PATCH 004/342] Remove obsolete pkgs.synaptics package svn path=/nixpkgs/trunk/; revision=21278 --- pkgs/misc/synaptics/default.nix | 24 ------------------------ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 30 deletions(-) delete mode 100644 pkgs/misc/synaptics/default.nix diff --git a/pkgs/misc/synaptics/default.nix b/pkgs/misc/synaptics/default.nix deleted file mode 100644 index c809046130d..00000000000 --- a/pkgs/misc/synaptics/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "synaptics-0.14.6"; - - src = fetchurl { - url = http://web.telia.com/~u89404340/touchpad/files/synaptics-0.14.6.tar.bz2; - md5 = "1102cd575045640a064ab6f9b1e391af"; - }; - - preBuild = "export NIX_CFLAGS_COMPILE=\"\${NIX_CFLAGS_COMPILE} -I${pixman}/include/pixman-1\"; - sed -e '/local-[>]motion_history_proc/d; /local-[>]history_size/d;' -i synaptics.c - sed -e '/ALLINCLUDES = /iX_INCLUDES_ROOT = /homeless-shelter' -i Makefile - sed -e 's@^CFLAGS =.*@& -DDBG=//@' -i Makefile - sed -e 's/miPointerGetMotionBufferSize()/&,2/' -i synaptics.c - sed -e 's/miPointerGetMotionEvents/GetMotionHistory/' -i synaptics.c - sed -e 's/miPointerGetMotionBufferSize/GetMotionHistorySize/' -i synaptics.c - "; - makeFlags="DESTDIR=\${out} PREFIX=/ "; - buildInputs = [libX11 pkgconfig xorgserver libXi libXext pixman xf86inputevdev]; - - meta = { - description = "Driver for synaptics touchpad."; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f34cb0c8218..fe971c37fa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9199,12 +9199,6 @@ let inherit stdenv fetchurl cups zlib; }; - synaptics = import ../misc/synaptics { - inherit fetchurl stdenv pkgconfig; - inherit (xlibs) libX11 libXi libXext pixman xf86inputevdev; - inherit (xorg) xorgserver; - }; - tetex = import ../misc/tex/tetex { inherit fetchurl stdenv flex bison zlib libpng ncurses ed; }; From 0e7e20042be3d9888362fe6a8dd457b85369925d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 23 Apr 2010 21:15:48 +0000 Subject: [PATCH 005/342] Add the GNU Linear Programming Kit (GLPK). Contributed by Brian Gough . svn path=/nixpkgs/trunk/; revision=21284 --- pkgs/development/libraries/glpk/default.nix | 29 +++++++++++++++++++++ pkgs/lib/maintainers.nix | 1 + pkgs/top-level/all-packages.nix | 4 +++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/glpk/default.nix diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix new file mode 100644 index 00000000000..88b5e93dfcf --- /dev/null +++ b/pkgs/development/libraries/glpk/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "glpk-4.43"; + + src = fetchurl { + url = "mirror://gnu/glpk/${name}.tar.gz"; + sha256 = "3be5f9c2cc355b39570ddb1b86a2ccc40fb52f81588f953f22c2ed29e3278e27"; + }; + + doCheck = true; + + meta = { + description = "The GNU Linear Programming Kit"; + + longDescription = + '' The GNU Linear Programming Kit is intended for solving large + scale linear programming problems by means of the revised + simplex method. It is a set of routines written in the ANSI C + programming language and organized in the form of a library. + ''; + + homepage = http://www.gnu.org/software/glpk/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 678c061eb87..1efeabc4b54 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -7,6 +7,7 @@ all = "Nix Committers "; andres = "Andres Loeh "; astsmtl = "Alexander Tsamutali "; + bjg = "Brian Gough "; eelco = "Eelco Dolstra "; ludo = "Ludovic Courtès "; marcweber = "Marc Weber "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe971c37fa9..5778619c286 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3832,6 +3832,10 @@ let '' # */ ; + glpk = import ../development/libraries/glpk { + inherit fetchurl stdenv; + }; + gmime = import ../development/libraries/gmime { inherit fetchurl stdenv pkgconfig zlib glib; }; From a3bac131c36640c3f5f46b5784038e5fb2ab8745 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 24 Apr 2010 00:12:51 +0000 Subject: [PATCH 006/342] sakura: Updated to 2.3.8. svn path=/nixpkgs/trunk/; revision=21287 --- pkgs/applications/misc/sakura/default.nix | 12 ++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 3f1737f5557..0ae81fcf00f 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,15 +1,11 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext }: +{ stdenv, fetchurl, cmake, pkgconfig, gtk, vte, pixman, gettext, perl }: stdenv.mkDerivation rec { - name = "sakura-2.3.6"; + name = "sakura-2.3.8"; src = fetchurl { url = "http://www.pleyades.net/david/projects/sakura/${name}.tar.bz2"; - sha256 = "0g6v1filixy4zcz1fabjz0zpdicgzxkc8rh06jxfch5pk9dq4x5j"; + sha256 = "1gfjh1xxqgna0njh0pd4srnbmj67ir4b13slrdri6bm80shfbz8l"; }; - # FIXME - patchPhase = '' - sed -i "s:INSTALL (FILES sakura.1:#INSTALL (FILES sakura.1:" CMakeLists.txt - ''; - buildInputs = [ cmake pkgconfig gtk vte pixman gettext ]; + buildInputs = [ cmake pkgconfig gtk vte pixman gettext perl ]; meta = { homepage = "http://www.pleyades.net/david/sakura.php"; description = "A terminal emulator based on GTK and VTE"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5778619c286..288fa8badfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8014,7 +8014,7 @@ let }; sakura = import ../applications/misc/sakura { - inherit stdenv fetchurl cmake pkgconfig gettext; + inherit stdenv fetchurl cmake pkgconfig gettext perl; inherit (gtkLibs) gtk; inherit (gnome) vte; inherit (xlibs) pixman; From 831196dad1075540df0ff0c6d34737d5eaa16eb3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 24 Apr 2010 09:36:03 +0000 Subject: [PATCH 007/342] Fix qtscriptgenerator build svn path=/nixpkgs/trunk/; revision=21288 --- pkgs/development/libraries/qtscriptgenerator/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 75bd7b4dc7f..8b257d299bf 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation { cd generator qmake make - ./generator + # Set QTDIR, see http://code.google.com/p/qtscriptgenerator/issues/detail?id=38 + QTDIR=${qt4} ./generator cd ../qtbindings qmake make From 5e0a05e4dcc5622d4c6db34f58e5ba65639153e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 11:08:24 +0000 Subject: [PATCH 008/342] stdenv: Add `isx86_64'. svn path=/nixpkgs/trunk/; revision=21292 --- pkgs/stdenv/generic/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fa9c18b2c37..4b988ef524a 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -100,6 +100,10 @@ let || result.system == "i686-freebsd" || result.system == "i686-openbsd" || result.system == "i386-sunos"; + isx86_64 = result.system == "x86_64-linux" + || result.system == "x86_64-darwin" + || result.system == "x86_64-freebsd" + || result.system == "x86_64-openbsd"; is64bit = result.system == "x86_64-linux" || result.system == "x86_64-darwin"; From 4fcbad84761211d1da4ca1ed9695cefe0d302e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 11:09:53 +0000 Subject: [PATCH 009/342] GNU/MIT Scheme: Build from the binary distributions when available. svn path=/nixpkgs/trunk/; revision=21293 --- .../compilers/mit-scheme/default.nix | 37 +++++++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 629aec850d8..9ddd3b6791d 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,16 +1,37 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, gnum4 }: -let version = "9.0.1"; in +let + version = "9.0.1"; + bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); +in stdenv.mkDerivation { name = "mit-scheme-${version}"; - src = fetchurl { - url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril"; - }; + # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from + # the platform-specific tarballs, which contain pre-built binaries. It + # leads to more efficient code than when building the tarball that contains + # generated C code instead of those binaries. + src = + if stdenv.isi686 + then fetchurl { + url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; + sha256 = "0cfj3bawjdnpa7cbqh2f23hfpjpmryypmzkhndvdbi79a65fl0n2"; + } else if stdenv.isx86_64 + then fetchurl { + url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; + sha256 = "0p188d7n0iqdgvra6qv5apvcsv0z2p97ry7xz5216zkc364i6mmr"; + } else fetchurl { + url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; + sha256 = "1g2mifrx0bvag0hlrbk81rkrlm1pbn688zw8b9d2i0sl5g2p1ril"; + }; preConfigure = "cd src"; - buildPhase = "./etc/make-liarc.sh --prefix=$out"; + buildPhase = + if bootstrapFromC + then "./etc/make-liarc.sh --prefix=$out" + else "make compile-microcode"; + + buildInputs = [ gnum4 ]; # XXX: The `check' target doesn't exist. doCheck = false; @@ -31,6 +52,6 @@ stdenv.mkDerivation { license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 288fa8badfd..84f277ae39c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2379,7 +2379,7 @@ let }; mitscheme = import ../development/compilers/mit-scheme { - inherit fetchurl stdenv; + inherit fetchurl stdenv gnum4; }; mono = import ../development/compilers/mono { From 1f3943541b9708e5c4673427c7a4433771a37042 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 24 Apr 2010 12:39:10 +0000 Subject: [PATCH 010/342] urbanterror: Enabled OpenAL and curl support. svn path=/nixpkgs/trunk/; revision=21294 --- pkgs/games/urbanterror/default.nix | 42 ++++++++++++++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index c5e562ced53..dc870c79aba 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, SDL, mesa, curl, openal }: +{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; version = "4.1"; @@ -16,16 +16,15 @@ stdenv.mkDerivation rec { unzip $src1 unzip $src2 ''; - # FIXME - #patchPhase = '' - # cd ioUrbanTerrorClientSource - # substituteInPlace code/client/snd_openal.c \ - # --replace libopenal.so.0 ${openal}/lib/libopenal.so - # substituteInPlace code/client/cl_curl.h \ - # --replace libcurl.so.3 ${curl}/lib/libcurl.so - # cd .. - #''; - buildInputs = [ unzip SDL mesa ]; + configurePhase = '' + cd ioUrbanTerrorClientSource + echo "USE_OPENAL = 1" > Makefile.local + echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local + echo "USE_CURL = 1" >> Makefile.local + echo "USE_CURL_DLOPEN = 0" >> Makefile.local + cd .. + ''; + buildInputs = [ unzip SDL mesa openal curl ]; buildPhase = '' for d in ioUrbanTerrorClientSource ioUrbanTerrorServerSource do @@ -44,18 +43,23 @@ stdenv.mkDerivation rec { "$destDir/ioUrTded" cp -rv UrbanTerror/q3ut4 "$destDir" cat << EOF > "$out/bin/urbanterror" -#!/bin/sh -cd "$destDir" -exec ./ioUrbanTerror "\$@" -EOF + #!/bin/sh + cd "$destDir" + exec ./ioUrbanTerror "\$@" + EOF chmod +x "$out/bin/urbanterror" cat << EOF > "$out/bin/urbanterror-ded" -#!/bin/sh -cd "$destDir" -exec ./ioUrTded "\$@" -EOF + #!/bin/sh + cd "$destDir" + exec ./ioUrTded "\$@" + EOF chmod +x "$out/bin/urbanterror-ded" ''; + postFixup = '' + p=$out/opt/urbanterror/ioUrbanTerror + cur_rpath=$(patchelf --print-rpath $p) + patchelf --set-rpath $cur_rpath:${mesa}/lib $p + ''; meta = { description = "A multiplayer tactical FPS on top of Quake 3 engine"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84f277ae39c..97d245b5058 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8678,7 +8678,7 @@ let }; urbanterror = import ../games/urbanterror { - inherit fetchurl stdenv unzip SDL mesa curl openal; + inherit fetchurl stdenv unzip SDL mesa openal curl; }; ut2004demo = import ../games/ut2004demo { From 4f9ffa5e5921fbc00f9312bcbcfa3a0613edb0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 16:02:08 +0000 Subject: [PATCH 011/342] GNU/MIT Scheme: Attempt to fix Cygwin builds. svn path=/nixpkgs/trunk/; revision=21295 --- pkgs/development/compilers/mit-scheme/default.nix | 3 +++ .../compilers/mit-scheme/ucontext-cygwin.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 9ddd3b6791d..0cfbcc95922 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { buildInputs = [ gnum4 ]; + patches = + stdenv.lib.optional (stdenv.system == "i686-cygwin") ./ucontext-cygwin.patch; + # XXX: The `check' target doesn't exist. doCheck = false; diff --git a/pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch b/pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch new file mode 100644 index 00000000000..2bc279ff4a7 --- /dev/null +++ b/pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch @@ -0,0 +1,13 @@ +Make `ucontext_t' definition visible on Cygwin. See +. + +--- mit-scheme-9.0.1/src/microcode/uxtrap.h 2010-02-09 01:09:53.000000000 +0100 ++++ mit-scheme-9.0.1/src/microcode/uxtrap.h 2010-04-24 17:55:01.000000000 +0200 +@@ -27,6 +27,7 @@ USA. + #define SCM_UXTRAP_H + + #include "os.h" ++#include + + /* Machine/OS-dependent section (long) */ + From f45cfbe272abd3d290346e69d255f30813d1f17b Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 24 Apr 2010 17:34:58 +0000 Subject: [PATCH 012/342] conkeror: New nixpkg. svn path=/nixpkgs/trunk/; revision=21296 --- .../networking/browsers/conkeror/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/browsers/conkeror/default.nix diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix new file mode 100644 index 00000000000..e0d62792918 --- /dev/null +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation { + name = "conkeror-0.9.2"; + src = fetchurl { + url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.tar.gz; + sha256 = "179rkf32p83dzgfjghc4kglb03h8aivddliynsydr6zxy8c4p28f"; + }; + installPhase = '' + cp -r . $out + ''; + meta = { + description = "A keyboard-oriented, customizable, extensible web browser"; + longDescription = '' + Conkeror is a keyboard-oriented, highly-customizable, highly-extensible + web browser based on Mozilla XULRunner, written mainly in JavaScript, + and inspired by exceptional software such as Emacs and vi. Conkeror + features a sophisticated keyboard system, allowing users to run commands + and interact with content in powerful and novel ways. It is + self-documenting, featuring a powerful interactive help system. + ''; + homepage = http://conkeror.org/; + license = [ "MPLv1.1" "GPLv2" "LGPLv2.1" ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97d245b5058..c9165223fda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7029,6 +7029,13 @@ let wxGTK = wxGTK26; }; + conkeror = xulrunnerWrapper { + launcher = "conkeror"; + application = import ../applications/networking/browsers/conkeror { + inherit stdenv fetchurl; + }; + }; + cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) { inherit cmake patchelf; imagemagick=imagemagick; From 755d7d88833083167c86447c9b63ac74f71f9c47 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sat, 24 Apr 2010 19:09:33 +0000 Subject: [PATCH 013/342] conkeror: Switched to zip snapshots, because tarballs are different on every fetchurl. svn path=/nixpkgs/trunk/; revision=21298 --- pkgs/applications/networking/browsers/conkeror/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index e0d62792918..d7e87e4015b 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "conkeror-0.9.2"; src = fetchurl { - url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.tar.gz; - sha256 = "179rkf32p83dzgfjghc4kglb03h8aivddliynsydr6zxy8c4p28f"; + url = http://repo.or.cz/w/conkeror.git/snapshot/efacc207b0d6c7b3899fc584c9f48547b18da076.zip; + sha256 = "1bkrrskrmhpx2xp90zgi5jrz4akynkxv2nzk5hzg0a17ikdi5ql8"; }; + buildInputs = [ unzip ]; installPhase = '' cp -r . $out ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9165223fda..22224a4daa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7032,7 +7032,7 @@ let conkeror = xulrunnerWrapper { launcher = "conkeror"; application = import ../applications/networking/browsers/conkeror { - inherit stdenv fetchurl; + inherit stdenv fetchurl unzip; }; }; From 8e905083ae1029131de3054245cb04d526244c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 21:02:37 +0000 Subject: [PATCH 014/342] pwdutils 3.2.6. svn path=/nixpkgs/trunk/; revision=21299 --- pkgs/os-specific/linux/pwdutils/default.nix | 43 +++++++++++++++++---- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix index 0d771599d64..906a51fc74c 100644 --- a/pkgs/os-specific/linux/pwdutils/default.nix +++ b/pkgs/os-specific/linux/pwdutils/default.nix @@ -1,14 +1,43 @@ {stdenv, fetchurl, pam, openssl, libnscd}: - -stdenv.mkDerivation { - name = "pwdutils-3.1.3"; - + +stdenv.mkDerivation rec { + name = "pwdutils-3.2.6"; + src = fetchurl { - url = mirror://kernel/linux/utils/net/NIS/pwdutils-3.1.3.tar.bz2; - md5 = "b18c601e282d8695cbb5ddd87eaa473c"; + url = "mirror://kernel/linux/utils/net/NIS/${name}.tar.bz2"; + sha256 = "1pyawvv9x0hiachn1mb257s6hm92dh1ykczgp7ik8z6jl020z3n7"; }; buildInputs = [pam openssl libnscd]; - configureFlags = "--disable-ldap"; + patchPhase = + '' for i in src/tst-* + do + sed -i "$i" -e's|/bin/bash|/bin/sh|g' + done + ''; + + configurePhase = + '' ./configure --prefix="$out" --exec-prefix="$out/bin" \ + --libdir="$out/lib" --disable-static \ + --disable-ldap + ''; + + # FIXME: The test suite seems to make assumptions that don't hold in Nix + # chroots. + doCheck = false; + + meta = { + description = "Linux pwdutils, utilities to manage passwd information"; + + longDescription = + '' Pwdutils is a collection of utilities to manage the passwd + information stored in local files, NIS, NIS+ or LDAP and can replace + the shadow suite complete. + ''; + + license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + }; } From 9534d10db63bca745cfdd34d18a56b4eceee7cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 21:02:42 +0000 Subject: [PATCH 015/342] pwdutils: Use GnuTLS instead of OpenSSL. svn path=/nixpkgs/trunk/; revision=21300 --- pkgs/os-specific/linux/pwdutils/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix index 906a51fc74c..617368fa79f 100644 --- a/pkgs/os-specific/linux/pwdutils/default.nix +++ b/pkgs/os-specific/linux/pwdutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pam, openssl, libnscd}: +{ stdenv, fetchurl, pam, gnutls, libnscd }: stdenv.mkDerivation rec { name = "pwdutils-3.2.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pyawvv9x0hiachn1mb257s6hm92dh1ykczgp7ik8z6jl020z3n7"; }; - buildInputs = [pam openssl libnscd]; + buildInputs = [ pam gnutls libnscd ]; patchPhase = '' for i in src/tst-* @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix="$out" --exec-prefix="$out/bin" \ --libdir="$out/lib" --disable-static \ - --disable-ldap + --disable-ldap --enable-gnutls ''; # FIXME: The test suite seems to make assumptions that don't hold in Nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22224a4daa5..625f133fcdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6358,7 +6358,7 @@ let }; pwdutils = import ../os-specific/linux/pwdutils { - inherit fetchurl stdenv pam openssl libnscd; + inherit fetchurl stdenv pam gnutls libnscd; }; qemu_kvm = import ../os-specific/linux/qemu-kvm { From 805d99ffc7f3bbe7214f02ee6a7ba7d1e080bcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 21:02:52 +0000 Subject: [PATCH 016/342] Reverting "GNU/MIT Scheme: Attempt to fix Cygwin builds." svn path=/nixpkgs/trunk/; revision=21301 --- pkgs/development/compilers/mit-scheme/default.nix | 3 --- .../compilers/mit-scheme/ucontext-cygwin.patch | 13 ------------- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 0cfbcc95922..9ddd3b6791d 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -33,9 +33,6 @@ stdenv.mkDerivation { buildInputs = [ gnum4 ]; - patches = - stdenv.lib.optional (stdenv.system == "i686-cygwin") ./ucontext-cygwin.patch; - # XXX: The `check' target doesn't exist. doCheck = false; diff --git a/pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch b/pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch deleted file mode 100644 index 2bc279ff4a7..00000000000 --- a/pkgs/development/compilers/mit-scheme/ucontext-cygwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -Make `ucontext_t' definition visible on Cygwin. See -. - ---- mit-scheme-9.0.1/src/microcode/uxtrap.h 2010-02-09 01:09:53.000000000 +0100 -+++ mit-scheme-9.0.1/src/microcode/uxtrap.h 2010-04-24 17:55:01.000000000 +0200 -@@ -27,6 +27,7 @@ USA. - #define SCM_UXTRAP_H - - #include "os.h" -+#include - - /* Machine/OS-dependent section (long) */ - From a89f709a91a4630aa007bff38c68ec99d4b62f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 24 Apr 2010 21:03:00 +0000 Subject: [PATCH 017/342] GNU/MIT Scheme: Restrict to GNU/* and FreeBSD. svn path=/nixpkgs/trunk/; revision=21302 --- pkgs/development/compilers/mit-scheme/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index 9ddd3b6791d..8a277f9b89e 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation { license = "GPLv2+"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.all; + + # Build fails on Cygwin and Darwin: + # . + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; }; } From b48dfda990ac7223411f2f13826b4b597abe2b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 25 Apr 2010 17:27:21 +0000 Subject: [PATCH 018/342] Added ghc-6.12.2. svn path=/nixpkgs/trunk/; revision=21303 --- pkgs/development/compilers/ghc/6.12.2.nix | 84 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 19 +++-- pkgs/top-level/release.nix | 7 ++ 3 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/ghc/6.12.2.nix diff --git a/pkgs/development/compilers/ghc/6.12.2.nix b/pkgs/development/compilers/ghc/6.12.2.nix new file mode 100644 index 00000000000..13e85fcc6a4 --- /dev/null +++ b/pkgs/development/compilers/ghc/6.12.2.nix @@ -0,0 +1,84 @@ +{stdenv, fetchurl, ghc, perl, gmp, ncurses}: + +stdenv.mkDerivation rec { + version = "6.12.2"; + + name = "ghc-${version}"; + + # TODO: Does this have to be here, or can it go to meta? + homepage = "http://haskell.org/ghc"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "7f1e39f0b3ddaca35b55cd430ca058d1c4678445a7177391c9cb6342b7c41a30"; + }; + + buildInputs = [ghc perl gmp ncurses]; + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + ''; + + configureFlags=[ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + inherit homepage; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + ]; + platforms = stdenv.lib.platforms.linux; + }; + + # TODO: requires a comment as to what it does and why it is needed. + passthru = { + corePackages = [ + [ "Cabal" "1.8.0.2" ] + [ "array" "0.3.0.0" ] + [ "base" "3.0.3.2" ] + [ "base" "4.2.0.0" ] + [ "bin-package-db" "0.0.0.0" ] + [ "bytestring" "0.9.1.5" ] + [ "containers" "0.3.0.0" ] + [ "directory" "1.0.1.0" ] + [ "dph-base" "0.4.0" ] + [ "dph-par" "0.4.0" ] + [ "dph-prim-interface" "0.4.0" ] + [ "dph-prim-par" "0.4.0" ] + [ "dph-prim-seq" "0.4.0" ] + [ "dph-seq" "0.4.0" ] + [ "extensible-exceptions" "0.1.1.1" ] + [ "ffi" "1.0" ] + [ "filepath" "1.1.0.3" ] + [ "ghc" "6.12.1" ] + [ "ghc-binary" "0.5.0.2" ] + [ "ghc-prim" "0.2.0.0" ] + [ "haskell98" "1.0.1.1" ] + [ "hpc" "0.5.0.4" ] + [ "integer-gmp" "0.2.0.0" ] + [ "old-locale" "1.0.0.2" ] + [ "old-time" "1.0.0.3" ] + [ "pretty" "1.0.1.1" ] + [ "process" "1.0.1.2" ] + [ "random" "1.0.0.2" ] + [ "rts" "1.0" ] + [ "syb" "0.1.0.2" ] + [ "template-haskell" "2.4.0.0" ] + [ "time" "1.1.4" ] + [ "unix" "2.4.0.0" ] + [ "utf8-string" "0.3.4" ] + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 625f133fcdc..6e4d88f409b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2257,13 +2257,13 @@ let }; }; - haskellPackages_ghc6103 = recurseIntoAttrs (import ./haskell-packages.nix { + haskellPackages_ghc6103 = import ./haskell-packages.nix { inherit pkgs; ghc = import ../development/compilers/ghc/6.10.3.nix { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; }; - }); + }; haskellPackages_ghc6104 = recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; @@ -2282,14 +2282,25 @@ let }; }); - haskellPackages_ghcHEAD = import ./haskell-packages.nix { + haskellPackages_ghc6122 = lowPrio (import ./haskell-packages.nix { + inherit pkgs; + ghc = import ../development/compilers/ghc/6.12.2.nix { + inherit fetchurl stdenv perl ncurses gmp; + ghc = ghc6101Binary; + }; + }); + + # currently not pointing to the actual HEAD, so disabled + /* + haskellPackages_ghcHEAD = lowPrio (import ./haskell-packages.nix { inherit pkgs; ghc = import ../development/compilers/ghc/6.11.nix { inherit fetchurl stdenv perl ncurses gmp libedit; inherit (haskellPackages) happy alex; # hope these aren't required for the final version ghc = ghc6101Binary; }; - }; + }); + */ haxeDist = import ../development/compilers/haxe { inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index d5f29f6d784..3b14e9477f7 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -418,11 +418,18 @@ with (import ./release-lib.nix); leksah = linux; lhs2tex = ghcSupported; haskellPlatform = linux; /* OpenGL/mesa seems to fail on darwin */ + haskellPlatform2010100 = linux; xmonad = linux; }; haskellPackages_ghc6121 = { ghc = ghcSupported; + haskellPlatform2010100 = linux; + }; + + haskellPackages_ghc6122 = { + ghc = ghcSupported; + haskellPlatform2010100 = linux; }; kde3 = { From 160e4165f7b65ecb8aae94dace26fa6d6419894f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 25 Apr 2010 17:30:55 +0000 Subject: [PATCH 019/342] Added myself as maintainer for the Haskell Platform. svn path=/nixpkgs/trunk/; revision=21304 --- .../libraries/haskell/haskell-platform/2010.1.0.0.nix | 1 + pkgs/development/libraries/haskell/haskell-platform/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix index 8d34277d846..73b076947d2 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self : { ]; meta = { description = "Haskell Platform meta package"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix index 691e6c5e198..87b5173620c 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/default.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self : { ]; meta = { description = "Haskell Platform meta package"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) From 70c389a2ad2f5449785db4bd8d09dfb3d47e4531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sun, 25 Apr 2010 18:26:01 +0000 Subject: [PATCH 020/342] 2010-version of platform should only be used with ghc-6.12.* svn path=/nixpkgs/trunk/; revision=21306 --- pkgs/top-level/release.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3b14e9477f7..74a0c3f46fb 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -418,7 +418,6 @@ with (import ./release-lib.nix); leksah = linux; lhs2tex = ghcSupported; haskellPlatform = linux; /* OpenGL/mesa seems to fail on darwin */ - haskellPlatform2010100 = linux; xmonad = linux; }; From a2b68a97c51b716a7e1118f55e04acac1d0b055d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 26 Apr 2010 06:55:02 +0000 Subject: [PATCH 021/342] Added gitit to release.nix svn path=/nixpkgs/trunk/; revision=21312 --- 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 74a0c3f46fb..6e6a0a12df9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -419,6 +419,7 @@ with (import ./release-lib.nix); lhs2tex = ghcSupported; haskellPlatform = linux; /* OpenGL/mesa seems to fail on darwin */ xmonad = linux; + gitit = linux; }; haskellPackages_ghc6121 = { From 106ba391805c343cafe0ae2ae31cbfc0de57f745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Apr 2010 08:45:23 +0000 Subject: [PATCH 022/342] Add GNU Shishi and GNU Radius. Contributed by Brian Gough . svn path=/nixpkgs/trunk/; revision=21313 --- pkgs/servers/radius/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/servers/shishi/default.nix | 36 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++++++++ 3 files changed, 77 insertions(+) create mode 100644 pkgs/servers/radius/default.nix create mode 100644 pkgs/servers/shishi/default.nix diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix new file mode 100644 index 00000000000..5533469a1da --- /dev/null +++ b/pkgs/servers/radius/default.nix @@ -0,0 +1,33 @@ +{ fetchurl, stdenv, m4, groff, readline }: + +stdenv.mkDerivation rec { + name = "radius-1.6.1"; + + src = fetchurl { + url = "mirror://gnu/radius/${name}.tar.gz"; + sha256 = "1l4k17zkbjsmk8mqrjjymagq8a8kwgrain9mcb5zp8jaf1qbclrh"; + }; + + buildInputs = [ m4 groff readline ] ; + + doCheck = true; + + meta = { + description = "GNU Radius remote authentication and accounting system"; + + longDescription = + '' Radius is a server for remote user authentication and + accounting. Its primary use is for Internet Service + Providers, though it may as well be used on any network that + needs a centralized authentication and/or accounting service + for its workstations. The package includes an authentication + and accounting server and administrator tools. + ''; + + homepage = http://www.gnu.org/software/radius/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix new file mode 100644 index 00000000000..8b81f5290d0 --- /dev/null +++ b/pkgs/servers/shishi/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, libtasn1, libgcrypt, gnutls }: + +stdenv.mkDerivation rec { + name = "shishi-0.0.43"; + + src = fetchurl { + url = "ftp://alpha.gnu.org/gnu/shishi/${name}.tar.gz"; + sha256 = "17hj4lklvprws6r5bhavi43yj3bz8sv554gcqvvsjrsq8w3qjxm0"; + }; + + buildInputs = [ libtasn1 libgcrypt gnutls ] ; + + doCheck = true; + + meta = { + description = "GNU Shishi, free implementation of the Kerberos 5 network security system"; + + longDescription = + '' GNU Shishi is an implementation of the Kerberos 5 network + authentication system, as specified in RFC 4120. Shishi can be + used to authenticate users in distributed systems. + + Shishi contains a library ('libshishi') that can be used by + application developers to add support for Kerberos 5. Shishi + contains a command line utility ('shishi') that is used by + users to acquire and manage tickets (and more). The server + side, a Key Distribution Center, is implemented by 'shishid'. + ''; + + homepage = http://www.gnu.org/software/shishi/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e4d88f409b..eca83066b52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5629,11 +5629,19 @@ let inherit xmpppy python makeWrapper fetchcvs; }; + radius = import ../servers/radius { + inherit fetchurl stdenv m4 groff readline; + }; + samba = makeOverridable (import ../servers/samba) { inherit stdenv fetchurl readline openldap pam kerberos popt iniparser libunwind acl fam; }; + shishi = import ../servers/shishi { + inherit fetchurl stdenv libtasn1 libgcrypt gnutls; + }; + squids = recurseIntoAttrs( import ../servers/squid/squids.nix { inherit fetchurl stdenv perl lib composableDerivation; }); From 9009a04e383b8e29d8ae789f259dd3709a61efba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Apr 2010 08:47:20 +0000 Subject: [PATCH 023/342] GNU Patch: Fix `stdenvNative' GNU/Linux builds. Reported by Brian Gough . svn path=/nixpkgs/trunk/; revision=21314 --- pkgs/tools/text/gnupatch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index cd2a67f6993..547e3625811 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "patch-2.6.1"; src = - if !(stdenv ? glibc) + if !stdenv.isLinux then fetchurl { # Temporary fix for # http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html . From a174ff34b8dab7f1a54cbb0223a0dcfe88059c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Apr 2010 08:59:25 +0000 Subject: [PATCH 024/342] Add GNU SASL, GNU GSS-API, and GNU Rush. Contributed by Brian Gough . svn path=/nixpkgs/trunk/; revision=21315 --- pkgs/development/libraries/gsasl/default.nix | 29 ++++++++++++++++ pkgs/development/libraries/gss/default.nix | 29 ++++++++++++++++ pkgs/shells/rush/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 +++++++ 4 files changed, 106 insertions(+) create mode 100644 pkgs/development/libraries/gsasl/default.nix create mode 100644 pkgs/development/libraries/gss/default.nix create mode 100644 pkgs/shells/rush/default.nix diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix new file mode 100644 index 00000000000..2e81a4806f8 --- /dev/null +++ b/pkgs/development/libraries/gsasl/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "gsasl-1.4.4"; + + src = fetchurl { + url = "mirror://gnu/gsasl/${name}.tar.gz"; + sha256 = "0xd9irff42dd5i4cr74dy0yd9ijjv9nkg6c2l1328grsn8zifwdc"; + }; + + doCheck = true; + + meta = { + description = "GNU SASL, Simple Authentication and Security Layer library"; + + longDescription = + '' GNU SASL is a library that implements the IETF Simple + Authentication and Security Layer (SASL) framework and + some SASL mechanisms. SASL is used in network servers + (e.g. IMAP, SMTP, etc.) to authenticate peers. + ''; + + homepage = http://www.gnu.org/software/gsasl/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix new file mode 100644 index 00000000000..bf47c79f750 --- /dev/null +++ b/pkgs/development/libraries/gss/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "gss-1.0.0"; + + src = fetchurl { + url = "mirror://gnu/gss/${name}.tar.gz"; + sha256 = "0rcbzg19m7bddvbhjqv1iwyydkj61czb0xr691mkj0i5p4d4bakk"; + }; + + doCheck = true; + + meta = { + description = "GNU GSS Generic Security Service"; + + longDescription = + '' GSS is an implementation of the Generic Security Service Application + Program Interface (GSS-API). GSS-API is used by network servers to + provide security services, e.g., to authenticate SMTP/IMAP clients + against SMTP/IMAP servers. + ''; + + homepage = http://www.gnu.org/software/gss/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix new file mode 100644 index 00000000000..dd1b47f5619 --- /dev/null +++ b/pkgs/shells/rush/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "rush-1.6"; + + src = fetchurl { + url = "mirror://gnu/rush/${name}.tar.gz"; + sha256 = "1j9h1imql05cijav6hr9jigcmy1br8fs9vahvh6y7pf53k4lcfrv"; + }; + + doCheck = true; + + meta = { + description = "GNU Rush, Restricted User Shell"; + + longDescription = + '' GNU Rush is a Restricted User Shell, designed for sites + providing limited remote access to their resources, such as + svn or git repositories, scp, or the like. Using a + sophisticated configuration file, Rush gives you complete + control over the command lines that users execute, as well as + over the usage of system resources, such as virtual memory, + CPU time, etc. + + In particular, it allows remote programs to be run in a chrooted + environment, which is important with such programs as + sftp-server or scp, that lack this ability. + ''; + + homepage = http://www.gnu.org/software/rush/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eca83066b52..6bd998df1a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1906,6 +1906,10 @@ let inherit fetchurl stdenv ncurses; }; + rush = import ../shells/rush { + inherit fetchurl stdenv; + }; + zsh = import ../shells/zsh { inherit fetchurl stdenv ncurses coreutils; }; @@ -3915,6 +3919,10 @@ let inherit fetchurl stdenv libgpgerror pkgconfig pth gnupg gnupg2 glib; }; + gsasl = import ../development/libraries/gsasl { + inherit stdenv fetchurl; + }; + gsl = import ../development/libraries/gsl { inherit fetchurl stdenv; }; @@ -3923,6 +3931,10 @@ let inherit fetchurl stdenv m4 bison flex openssl zlib; }; + gss = import ../development/libraries/gss { + inherit stdenv fetchurl; + }; + gtkimageview = import ../development/libraries/gtkimageview { inherit fetchurl stdenv pkgconfig; inherit (gnome) gtk; From fff97995f369d77a2907dfd9bedb3dea5e297859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 26 Apr 2010 09:30:53 +0000 Subject: [PATCH 025/342] pwdutils: Fix compilation with recent glibc. svn path=/nixpkgs/trunk/; revision=21318 --- pkgs/os-specific/linux/pwdutils/default.nix | 5 ++- .../linux/pwdutils/sys-stat-h.patch | 37 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/pwdutils/sys-stat-h.patch diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix index 617368fa79f..6be17ca0812 100644 --- a/pkgs/os-specific/linux/pwdutils/default.nix +++ b/pkgs/os-specific/linux/pwdutils/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ pam gnutls libnscd ]; - patchPhase = + patches = [ ./sys-stat-h.patch ]; + + postPatch = '' for i in src/tst-* do sed -i "$i" -e's|/bin/bash|/bin/sh|g' @@ -38,6 +40,7 @@ stdenv.mkDerivation rec { license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch b/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch new file mode 100644 index 00000000000..5b5bc8440d5 --- /dev/null +++ b/pkgs/os-specific/linux/pwdutils/sys-stat-h.patch @@ -0,0 +1,37 @@ +Fix builds with current glibc git, which appears to be stricter +about . + +--- pwdutils-3.2.6/src/useradd.c~ 2008-10-16 13:46:07.000000000 +0200 ++++ pwdutils-3.2.6/src/useradd.c 2010-04-26 11:24:43.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include + +--- pwdutils-3.2.6/src/userdel.c~ 2006-11-29 14:20:39.000000000 +0100 ++++ pwdutils-3.2.6/src/userdel.c 2010-04-26 11:26:08.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include + +diff -ubB --show-c-function pwdutils-3.2.6/src/usermod.c\~ pwdutils-3.2.6/src/usermod.c +--- pwdutils-3.2.6/src/usermod.c~ 2006-11-29 14:20:41.000000000 +0100 ++++ pwdutils-3.2.6/src/usermod.c 2010-04-26 11:27:41.000000000 +0200 +@@ -18,6 +18,7 @@ + #include "config.h" + #endif + ++#include + #include + #include + #include + From a011b43d1f29467aad2e09801724fcfc4df8ae00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Apr 2010 18:36:53 +0000 Subject: [PATCH 026/342] * Reverted r21314 because it causes all of Nixpkgs on Linux to be rebuilt. Not sure why though. Maybe "isLinux" is not set in the bootstrap stdenv. svn path=/nixpkgs/trunk/; revision=21327 --- pkgs/tools/text/gnupatch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 547e3625811..cd2a67f6993 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "patch-2.6.1"; src = - if !stdenv.isLinux + if !(stdenv ? glibc) then fetchurl { # Temporary fix for # http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html . From de5c9fd9bc5863e823072a554bbb78d37fbcd8aa Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 26 Apr 2010 20:06:00 +0000 Subject: [PATCH 027/342] update to 1.0.6 svn path=/nixpkgs/trunk/; revision=21328 --- 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 b84ef841efc..89ec101610c 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation { - name = "vlc-1.0.5"; + name = "vlc-1.0.6"; src = fetchurl { - url = http://download.videolan.org/pub/videolan/vlc/1.0.5/vlc-1.0.5.tar.bz2; - sha256 = "1kbd43y6sy6lg1xgl1j4mid6rdx6sszkm8c14hwqrfvgjd69kwgp"; + url = http://download.videolan.org/pub/videolan/vlc/1.0.6/vlc-1.0.6.tar.bz2; + sha256 = "0hhqbr0hwm07pimdy4rfmf3k3d6iz6icmrndirnp888hg8z968gm"; }; buildInputs = [ From a4842e0987f28debc34dedeeecec455e77fe3477 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 26 Apr 2010 20:39:08 +0000 Subject: [PATCH 028/342] Really add policykit support to kdebase-workspace svn path=/nixpkgs/trunk/; revision=21329 --- pkgs/desktops/kde-4.4/base-workspace/default.nix | 15 ++++++++++----- pkgs/desktops/kde-4.4/default.nix | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index 6f682e3029d..48a70a01d11 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -2,7 +2,7 @@ , qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost -, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt +, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt, policykit }: stdenv.mkDerivation { @@ -11,10 +11,15 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2; sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc"; }; - buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs kdepimlibs kdebindings libpthreadstubs boost libusb stdenv.gcc.libc - libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver - lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt ]; - builder = ./builder.sh; + buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst + kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp + libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 + phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs + policykit ]; + patchPhase='' + sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \ + plasma/generic/scriptengines/python/CMakeLists.txt + ''; meta = { description = "KDE Workspace"; longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 9623f309fc9..868887b3123 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -69,7 +69,7 @@ pkgs.recurseIntoAttrs (rec { ### BASE kdebase_workspace = import ./base-workspace { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4; - inherit (pkgs) lm_sensors libxklavier libusb boost consolekit; + inherit (pkgs) lm_sensors libxklavier libusb boost consolekit policykit; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; From 8bf3f76256f56e3aad91a690882e78e768aafb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 26 Apr 2010 20:39:51 +0000 Subject: [PATCH 029/342] Let GHC wrapper inherit meta from the wrapped expression. svn path=/nixpkgs/trunk/; revision=21330 --- pkgs/development/compilers/ghc/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index 50633123491..d14d26fc3fe 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation { GHCGetPackages = ./ghc-get-packages.sh; inherit ghc; + inherit (ghc) meta; ghcVersion = ghc.version; } From 9ae4b8b11ca3c5f99ca88b49c49bb4250bd85857 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 27 Apr 2010 04:38:41 +0000 Subject: [PATCH 030/342] wpa_supplicant: enable qt gui, deprecate old broken derivation building gui svn path=/nixpkgs/trunk/; revision=21332 --- .../linux/wpa_supplicant/default.nix | 30 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 11 +++++-- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 5e2e4b2972c..be7c5a38c2a 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,12 @@ -{stdenv, fetchurl, openssl, qt4 ? null}: +{stdenv, fetchurl, openssl +, guiSupport ? false +, qt4}: + +assert !guiSupport || qt4 != null; + +let + buildDirs = "wpa_supplicant wpa_passphrase wpa_cli"; +in stdenv.mkDerivation rec { name = "wpa_supplicant-0.7.2"; @@ -13,19 +21,33 @@ stdenv.mkDerivation rec { cp defconfig .config echo CONFIG_DEBUG_SYSLOG=y >> .config substituteInPlace Makefile --replace /usr/local $out - makeFlagsArray=(ALL="wpa_supplicant wpa_passphrase wpa_cli ${if qt4 == null then "" else "wpa_gui-qt4"}") + makeFlagsArray=(ALL="${buildDirs} ${if guiSupport then "wpa_gui-qt4" else ""}") ''; - buildInputs = [openssl qt4]; + buildInputs = [openssl] + ++ stdenv.lib.optional guiSupport qt4; + + # qt gui doesn't install because the executable is named differently from directory name + # so never include wpa_gui_-qt4 in buildDirs when running make install + preInstall = if guiSupport then '' + makeFlagsArray=(ALL="${buildDirs}") + '' else null; 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/ - ''; + '' + + (if guiSupport then '' + pwd + cp wpa_gui-qt4/wpa_gui $out/sbin + '' else ""); meta = { homepage = http://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bd998df1a3..4a09fcc2617 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6547,13 +6547,20 @@ let inherit fetchurl stdenv; }; - wpa_supplicant = import ../os-specific/linux/wpa_supplicant { + wpa_supplicant = makeOverridable (import ../os-specific/linux/wpa_supplicant) { inherit fetchurl stdenv openssl; + inherit qt4; + guiSupport = false; }; + # prebuild binaries: + wpa_supplicant_gui = wpa_supplicant.override { guiSupport = true; }; - wpa_supplicant_gui_qt4 = import ../os-specific/linux/wpa_supplicant/gui-qt4.nix { + # deprecated, but contains icon ? Does no longer build + /* didn't build Sun Apr 25 20:34:18 CEST 2010 + wpa_supplicant_gui_qt4_old = import ../os-specific/linux/wpa_supplicant/gui-qt4.nix { inherit fetchurl stdenv qt4 imagemagick inkscape; }; + */ xf86_input_wacom = import ../os-specific/linux/xf86-input-wacom { inherit stdenv fetchurl ncurses pkgconfig file; From 7802763b45f50137dcdd2c6191b41a4a87fe64ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Apr 2010 09:43:22 +0000 Subject: [PATCH 031/342] Linux nfs-utils 1.2.2. svn path=/nixpkgs/trunk/; revision=21336 --- pkgs/os-specific/linux/nfs-utils/default.nix | 30 +++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 90b9068eacc..14be5f196f8 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,18 +1,29 @@ -{ fetchurl, stdenv, tcpWrapper, libuuid }: +{ fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }: stdenv.mkDerivation rec { - name = "nfs-utils-1.2.0"; + name = "nfs-utils-1.2.2"; src = fetchurl { url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "1ld1f6wcm53pza3zy768y1y8xa01zq3bnjyy1j3z62yd7a5lcffb"; + sha256 = "07nhr7ds5ic4x81l9qphrlmi4ifxl28xzr1zpzvg334ncrv2fizx"; }; # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'. - buildInputs = [ tcpWrapper libuuid ]; + buildInputs = [ tcpWrapper utillinuxng libcap ]; - # FIXME: Currently too lazy to build the dependencies needed for NFSv4. - configureFlags = "--disable-gss --disable-nfsv4 --with-statedir=/var/lib/nfs"; + # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. + configureFlags = + [ "--disable-gss" "--disable-nfsv4" "--disable-nfsv41" "--disable-tirpc" + "--with-statedir=/var/lib/nfs" + ]; + + patchPhase = + '' for i in "tests/"*.sh + do + sed -i "$i" -e's|/bin/bash|/bin/sh|g' + chmod +x "$i" + done + ''; preBuild = '' @@ -20,7 +31,9 @@ stdenv.mkDerivation rec { installFlags="statedir=$TMPDIR" # hack to make `make install' work ''; - meta = { + doCheck = true; + + meta = { description = "Linux user-space NFS utilities"; longDescription = '' @@ -31,5 +44,8 @@ stdenv.mkDerivation rec { homepage = http://nfs.sourceforge.net/; license = "GPLv2"; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a09fcc2617..fa2a5967b12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5731,7 +5731,7 @@ let }; nfsUtils = import ../os-specific/linux/nfs-utils { - inherit fetchurl stdenv tcpWrapper libuuid; + inherit fetchurl stdenv tcpWrapper utillinuxng libcap; }; acpi = import ../os-specific/linux/acpi { From 76b699eb220c20acbc301e5b1787c98b2ffd2aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 27 Apr 2010 09:43:26 +0000 Subject: [PATCH 032/342] pam_login: Fix build on recent glibc. svn path=/nixpkgs/trunk/; revision=21337 --- pkgs/os-specific/linux/pam_login/default.nix | 2 ++ pkgs/os-specific/linux/pam_login/sys-stat-h.patch | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/os-specific/linux/pam_login/sys-stat-h.patch diff --git a/pkgs/os-specific/linux/pam_login/default.nix b/pkgs/os-specific/linux/pam_login/default.nix index 724e316a15a..f1d2eb6bc44 100644 --- a/pkgs/os-specific/linux/pam_login/default.nix +++ b/pkgs/os-specific/linux/pam_login/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1w2hpwjhmwjhf8rg789xpl0hibahqlr3ccivfy3m4kgrm5gf04kv"; }; + patches = [ ./sys-stat-h.patch ]; + # To overcome a gcc 4.4 warning: # "#ident is a deprecated GCC extension" patchPhase = '' diff --git a/pkgs/os-specific/linux/pam_login/sys-stat-h.patch b/pkgs/os-specific/linux/pam_login/sys-stat-h.patch new file mode 100644 index 00000000000..163fd7ce8e2 --- /dev/null +++ b/pkgs/os-specific/linux/pam_login/sys-stat-h.patch @@ -0,0 +1,12 @@ +Include the needed since recent glibc is stricter about that. + +--- pam_login-3.35/src/login.c~ 2007-05-04 14:07:49.000000000 +0200 ++++ pam_login-3.35/src/login.c 2010-04-27 11:38:13.000000000 +0200 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include + #include + #include + #include From 68d9e26bcbffabe5b3781cdb18b33bafb797e19c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Apr 2010 09:52:36 +0000 Subject: [PATCH 033/342] * Linux 2.6.32.12, 2.6.33.3. svn path=/nixpkgs/trunk/; revision=21338 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-2.6.33.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 954e580f356..013dc24332c 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -199,11 +199,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.11"; + version = "2.6.32.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "0zqf8ihsw454acj186m1bham1ahpcf0q616sgb00wngz3qif22cw"; + sha256 = "1qzlj2i2nn0qbzpfm0l7j26y44xkcbya91jirjvly2saknnxkpw2"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix index 34fa3e2f9fc..ca57f49b030 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix @@ -197,11 +197,11 @@ in import ./generic.nix ( rec { - version = "2.6.33.2"; + version = "2.6.33.3"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "105xjc8dadqry97qgbnwbnrk4n86cjgf9rdyjp1ljcaifkj9qwva"; + sha256 = "117pw6xcvf76zwh6xch0v5akykwjp73lnkqlryy3wgv86vcsvwvm"; }; config = configWithPlatform stdenv.platform; From 18849f0f24e12ce14fc55b04c6130f7e6ced2a01 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Apr 2010 10:46:41 +0000 Subject: [PATCH 034/342] * `--exec-prefix=$out/bin' causes programs to be installed in $out/bin/bin and $out/bin/sbin, which breaks NixOS (see e.g. http://hydra.nixos.org/build/380092). svn path=/nixpkgs/trunk/; revision=21339 --- pkgs/os-specific/linux/pwdutils/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/pwdutils/default.nix b/pkgs/os-specific/linux/pwdutils/default.nix index 6be17ca0812..98b9ab70735 100644 --- a/pkgs/os-specific/linux/pwdutils/default.nix +++ b/pkgs/os-specific/linux/pwdutils/default.nix @@ -19,11 +19,7 @@ stdenv.mkDerivation rec { done ''; - configurePhase = - '' ./configure --prefix="$out" --exec-prefix="$out/bin" \ - --libdir="$out/lib" --disable-static \ - --disable-ldap --enable-gnutls - ''; + configureFlags = "--disable-ldap --enable-gnutls --exec-prefix=$(out)"; # FIXME: The test suite seems to make assumptions that don't hold in Nix # chroots. From 311dc9299e4ba74a76875e8a4a0bd84cfdb6162a Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 27 Apr 2010 14:42:49 +0000 Subject: [PATCH 035/342] update to 8.99 svn path=/nixpkgs/trunk/; revision=21347 --- pkgs/tools/graphics/dcraw/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 2d18a875221..74a9ffca74a 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libjpeg, lcms, gettext }: stdenv.mkDerivation { - name = "dcraw-8.98"; + name = "dcraw-8.99"; src = fetchurl { - url = http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-8.98.tar.gz; - sha256 = "0vb375m1s5b1d72d9a5apcyxz2b9zl0pycj700yhy2zsfx804kmp"; + url = http://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-8.99.tar.gz; + sha256 = "0w557lsrj8fs666cxzhhv1rigmy705bnkn94rn856dwck59l3ipq"; }; buildInputs = [ libjpeg lcms gettext ]; From 5623a59669d9b530ea5170dbfef734b5a47bbf5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 27 Apr 2010 14:55:31 +0000 Subject: [PATCH 036/342] Haskell Platform 2010.1.0.0 low priority until ghc-6.12 becomes default. svn path=/nixpkgs/trunk/; revision=21348 --- pkgs/top-level/haskell-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9d4f276d9b3..14329b9067c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -288,7 +288,7 @@ rec { inherit cabal haskellSrcExts; }; - haskellPlatform2010100 = import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix { + haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix { inherit cabal ghc fgl haskellSrc html stm xhtml happy; @@ -308,7 +308,7 @@ rec { regexPosix = regexPosix0941; haddock = haddock272; inherit (pkgs) fetchurl; - }; + }); haskellPlatform = import ../development/libraries/haskell/haskell-platform { inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline @@ -887,7 +887,7 @@ rec { }; # does not compile with ghc-6.8.3 - haddock210 = pkgs.stdenv.lib.lowPrio (import ../development/tools/documentation/haddock/haddock-2.1.0.nix { + haddock210 = pkgs.lowPrio (import ../development/tools/documentation/haddock/haddock-2.1.0.nix { inherit cabal; }); From 1db4053fcc180a1781e3cdaa143c2342d4c754c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 27 Apr 2010 16:34:56 +0000 Subject: [PATCH 037/342] Added profiling option to cabal generic builder. svn path=/nixpkgs/trunk/; revision=21349 --- .../libraries/haskell/cabal/cabal.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index 7ee0cfcccb9..1fa893d59e5 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -1,6 +1,6 @@ # generic builder for Cabal packages -attrs : +{stdenv, fetchurl, lib, ghc, enableLibraryProfiling ? false, ...} : { mkDerivation = transform : @@ -17,11 +17,11 @@ attrs : # all packages with haskell- to avoid name clashes for libraries; # if that is not desired (for applications), name can be set to # fname. - name = "haskell-${self.pname}-ghc${attrs.ghc.ghc.version}-${self.version}"; + name = "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}"; # the default download location for Cabal packages is Hackage, # you still have to specify the checksum - src = attrs.fetchurl { + src = fetchurl { url = "http://hackage.haskell.org/packages/archive/${self.pname}/${self.version}/${self.fname}.tar.gz"; inherit (self) sha256; }; @@ -29,7 +29,7 @@ attrs : # default buildInputs are just ghc, if more buildInputs are required # buildInputs can be extended by the client by using extraBuildInputs, # but often propagatedBuildInputs is preferable anyway - buildInputs = [attrs.ghc] ++ self.extraBuildInputs; + buildInputs = [ghc] ++ self.extraBuildInputs; extraBuildInputs = []; # we make sure that propagatedBuildInputs is defined, so that we don't @@ -39,6 +39,10 @@ attrs : # library directories that have to be added to the Cabal files extraLibDirs = []; + libraryProfiling = + if enableLibraryProfiling then ["--enable-library-profiling"] + else ["--disable-library-profiling"]; + # compiles Setup and configures configurePhase = '' eval "$preConfigure" @@ -55,7 +59,7 @@ attrs : done done - ./Setup configure --verbose --prefix="$out" $extraLibDirs $configureFlags + ./Setup configure --verbose --prefix="$out" $libraryProfiling $extraLibDirs $configureFlags eval "$postConfigure" ''; @@ -82,7 +86,7 @@ attrs : ensureDir $out/bin # necessary to get it added to PATH - local confDir=$out/lib/ghc-pkgs/ghc-${attrs.ghc.ghc.version} + local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version} local installedPkgConf=$confDir/${self.fname}.installedconf local pkgConf=$confDir/${self.fname}.conf ensureDir $confDir @@ -100,7 +104,7 @@ attrs : # We inherit stdenv and ghc so that they can be used # in Cabal derivations. - inherit (attrs) stdenv ghc; + inherit stdenv ghc; }; - in attrs.stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f); + in stdenv.mkDerivation ((rec { f = dtransform f // transform f; }).f); } From 8a036d8eb1572650fbd05255e795960adc9743e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 27 Apr 2010 16:35:01 +0000 Subject: [PATCH 038/342] Library profiling for cabal packages can now be enabled via a config option. svn path=/nixpkgs/trunk/; revision=21350 --- pkgs/development/libraries/haskell/cabal/cabal.nix | 5 ++++- pkgs/top-level/all-packages.nix | 6 ++++++ pkgs/top-level/haskell-packages.nix | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index 1fa893d59e5..ba841ff281a 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -17,7 +17,10 @@ # all packages with haskell- to avoid name clashes for libraries; # if that is not desired (for applications), name can be set to # fname. - name = "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}"; + name = if enableLibraryProfiling then + "haskell-${self.pname}-ghc${ghc.ghc.version}-profiling-${self.version}" + else + "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}"; # the default download location for Cabal packages is Hackage, # you still have to specify the checksum diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa2a5967b12..56d948cb95c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2247,6 +2247,7 @@ let haskellPackages_ghc6101 = import ./haskell-packages.nix { inherit pkgs; + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; ghc = import ../development/compilers/ghc/6.10.1.nix { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; @@ -2255,6 +2256,7 @@ let haskellPackages_ghc6102 = import ./haskell-packages.nix { inherit pkgs; + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; ghc = import ../development/compilers/ghc/6.10.2.nix { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; @@ -2263,6 +2265,7 @@ let haskellPackages_ghc6103 = import ./haskell-packages.nix { inherit pkgs; + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; ghc = import ../development/compilers/ghc/6.10.3.nix { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; @@ -2271,6 +2274,7 @@ let haskellPackages_ghc6104 = recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; ghc = import ../development/compilers/ghc/6.10.4.nix { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; @@ -2280,6 +2284,7 @@ let # make this ghc default when it's supported by the Haskell Platform haskellPackages_ghc6121 = lowPrio (import ./haskell-packages.nix { inherit pkgs; + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; ghc = import ../development/compilers/ghc/6.12.1.nix { inherit fetchurl stdenv perl ncurses gmp; ghc = ghc6101Binary; @@ -2288,6 +2293,7 @@ let haskellPackages_ghc6122 = lowPrio (import ./haskell-packages.nix { inherit pkgs; + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; ghc = import ../development/compilers/ghc/6.12.2.nix { inherit fetchurl stdenv perl ncurses gmp; ghc = ghc6101Binary; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 14329b9067c..425b6754a11 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{pkgs, ghc}: +{pkgs, ghc, enableLibraryProfiling ? false}: let ghcReal = pkgs.lowPrio ghc; in @@ -21,7 +21,7 @@ rec { cabal = import ../development/libraries/haskell/cabal/cabal.nix { inherit (pkgs) stdenv fetchurl lib; - inherit ghc; + inherit ghc enableLibraryProfiling; }; From 932b3d3b797228b6460a617dd56394cafdb7e7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 27 Apr 2010 18:21:07 +0000 Subject: [PATCH 039/342] Some cleanup regarding GHC and profiling support. svn path=/nixpkgs/trunk/; revision=21351 --- .../libraries/haskell/cabal/cabal.nix | 4 +- pkgs/top-level/all-packages.nix | 79 ++++++++----------- 2 files changed, 35 insertions(+), 48 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index ba841ff281a..fc719e032ac 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -1,6 +1,6 @@ # generic builder for Cabal packages -{stdenv, fetchurl, lib, ghc, enableLibraryProfiling ? false, ...} : +{stdenv, fetchurl, lib, ghc, enableLibraryProfiling ? false} : { mkDerivation = transform : @@ -18,7 +18,7 @@ # if that is not desired (for applications), name can be set to # fname. name = if enableLibraryProfiling then - "haskell-${self.pname}-ghc${ghc.ghc.version}-profiling-${self.version}" + "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}-profiling" else "haskell-${self.pname}-ghc${ghc.ghc.version}-${self.version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56d948cb95c..629dc126912 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2180,8 +2180,8 @@ let # GHC binaries are around for bootstrapping purposes - #ghc = haskellPackages.ghc; - + # If we'd want to reactivate the 6.6 and 6.8 series of ghc, we'd + # need to reenable an old binary such as this. /* ghc642Binary = lowPrio (import ../development/compilers/ghc/6.4.2-binary.nix { inherit fetchurl stdenv ncurses gmp; @@ -2201,8 +2201,11 @@ let # For several compiler versions, we export a large set of Haskell-related # packages. + # This should point to the current default version. haskellPackages = haskellPackages_ghc6104; + # Old versions of ghc that currently don't build because the binary + # is broken. /* haskellPackages_ghc642 = import ./haskell-packages.nix { inherit pkgs; @@ -2245,62 +2248,46 @@ let }); */ - haskellPackages_ghc6101 = import ./haskell-packages.nix { + # Helper functions to abstract away from repetitive instantiations. + haskellPackagesFun610 = ghcPath : profDefault : import ./haskell-packages.nix { inherit pkgs; - enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; - ghc = import ../development/compilers/ghc/6.10.1.nix { + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; + ghc = import ghcPath { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; }; }; - haskellPackages_ghc6102 = import ./haskell-packages.nix { + haskellPackagesFun612 = ghcPath : profDefault : import ./haskell-packages.nix { inherit pkgs; - enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; - ghc = import ../development/compilers/ghc/6.10.2.nix { - inherit fetchurl stdenv perl ncurses gmp libedit; - ghc = ghc6101Binary; - }; - }; - - haskellPackages_ghc6103 = import ./haskell-packages.nix { - inherit pkgs; - enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; - ghc = import ../development/compilers/ghc/6.10.3.nix { - inherit fetchurl stdenv perl ncurses gmp libedit; - ghc = ghc6101Binary; - }; - }; - - haskellPackages_ghc6104 = recurseIntoAttrs (import ./haskell-packages.nix { - inherit pkgs; - enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; - ghc = import ../development/compilers/ghc/6.10.4.nix { - inherit fetchurl stdenv perl ncurses gmp libedit; - ghc = ghc6101Binary; - }; - }); - - # make this ghc default when it's supported by the Haskell Platform - haskellPackages_ghc6121 = lowPrio (import ./haskell-packages.nix { - inherit pkgs; - enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; - ghc = import ../development/compilers/ghc/6.12.1.nix { + enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; + ghc = import ghcPath { inherit fetchurl stdenv perl ncurses gmp; ghc = ghc6101Binary; }; - }); + }; - haskellPackages_ghc6122 = lowPrio (import ./haskell-packages.nix { - inherit pkgs; - enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] false; - ghc = import ../development/compilers/ghc/6.12.2.nix { - inherit fetchurl stdenv perl ncurses gmp; - ghc = ghc6101Binary; - }; - }); + # Currently active GHC versions. + haskellPackages_ghc6101 = + haskellPackagesFun610 ../development/compilers/ghc/6.10.1.nix false; - # currently not pointing to the actual HEAD, so disabled + haskellPackages_ghc6102 = + haskellPackagesFun610 ../development/compilers/ghc/6.10.2.nix false; + + haskellPackages_ghc6103 = + haskellPackagesFun610 ../development/compilers/ghc/6.10.3.nix false; + + haskellPackages_ghc6104 = recurseIntoAttrs + (haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false); + + # We will soon switch to either ghc-6.12.1 or ghc-6.12.2 as default. + haskellPackages_ghc6121 = lowPrio + (haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false); + + haskellPackages_ghc6122 = lowPrio + (haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false); + + # Currently not pointing to the actual HEAD, therefore disabled /* haskellPackages_ghcHEAD = lowPrio (import ./haskell-packages.nix { inherit pkgs; From d2b3e548a126b9202f7f6ce68bfbaa91ad910dda Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Apr 2010 18:39:00 +0000 Subject: [PATCH 040/342] OpenSSL-1.0.0 Big rebuild (though not stdenv-update). Security update, do not revert, please. svn path=/nixpkgs/trunk/; revision=21352 --- .../libraries/openssl/darwin-arch.patch | 42 ++++++++----------- .../development/libraries/openssl/default.nix | 6 +-- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index 5cbc90b9ebf..8fae470313a 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,24 +1,18 @@ -diff -rc openssl-0.9.8k/Configure openssl-0.9.8k-new/Configure -*** openssl-0.9.8k/Configure Mon Feb 16 09:44:22 2009 ---- openssl-0.9.8k-new/Configure Fri Nov 27 13:41:58 2009 -*************** -*** 518,526 **** - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX ---- 518,526 ---- - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX +This patch was originally added by rob. +urkud have ported this patch to openssl-1.0.0 without diving into details (what +does it fix etc.) +--- a/Configure ++++ b/Configure +@@ -549,9 +549,9 @@ my %table=( + "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", + "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + + ##### A/UX diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4d0e0cd8afb..53fc3c31d37 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -7,15 +7,13 @@ let in stdenv.mkDerivation rec { - name = "openssl-0.9.8l"; + name = "openssl-1.0.0"; src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; - sha1 = "d3fb6ec89532ab40646b65af179bb1770f7ca28f"; + sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; }; - patches = [ ./darwin-arch.patch ]; - buildNativeInputs = [ perl ]; configureScript = "./config"; From ae8d4501b65ad6be7d83b3da60672c39e1b8ffcb Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 27 Apr 2010 18:44:23 +0000 Subject: [PATCH 041/342] adding maybeEnv. This will replace from-env.nix in nixos and will be reused in copySystemConfiguration svn path=/nixpkgs/trunk/; revision=21353 --- pkgs/lib/misc.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/lib/misc.nix b/pkgs/lib/misc.nix index 2cfd15735a7..0a8c61d6c85 100644 --- a/pkgs/lib/misc.nix +++ b/pkgs/lib/misc.nix @@ -9,6 +9,11 @@ with import ./strings.nix; rec { + # returns default if env var is not set + maybeEnv = name: default: + let value = builtins.getEnv name; in + if value == "" then default else value; + defaultMergeArg = x : y: if builtins.isAttrs y then y else From 375900a6e76debabe6b999d9fb7a2c95aff4488d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Apr 2010 19:05:43 +0000 Subject: [PATCH 042/342] Add comment, use the patch for darwin svn path=/nixpkgs/trunk/; revision=21354 --- pkgs/development/libraries/openssl/darwin-arch.patch | 4 +--- pkgs/development/libraries/openssl/default.nix | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index 8fae470313a..db2ddbb815e 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,6 +1,4 @@ -This patch was originally added by rob. -urkud have ported this patch to openssl-1.0.0 without diving into details (what -does it fix etc.) +The patch is specific to nix: MacOS gcc supports -arch. --- a/Configure +++ b/Configure @@ -549,9 +549,9 @@ my %table=( diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 53fc3c31d37..5c7fd37eb8e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,7 +6,7 @@ let stdenv.cross; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "openssl-1.0.0"; src = fetchurl { @@ -37,3 +37,9 @@ stdenv.mkDerivation rec { description = "A cryptographic library that implements the SSL and TLS protocols"; }; } +// +(if stdenv.isDarwin then { + patches = ./darwin-arch.patch; +} +else { }) +) From f892a8efaacafceff15a216eb1c4c4d0955b0b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 27 Apr 2010 19:51:37 +0000 Subject: [PATCH 043/342] Darcs updated to 2.4.1; now ghc-6.12-compatible. svn path=/nixpkgs/trunk/; revision=21355 --- .../version-management/darcs/darcs-2.nix | 12 ++++++++---- .../libraries/haskell/hashed-storage/default.nix | 9 +++++---- pkgs/top-level/haskell-packages.nix | 3 ++- pkgs/top-level/release.nix | 2 ++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/darcs/darcs-2.nix b/pkgs/applications/version-management/darcs/darcs-2.nix index dd54bfa112b..c399c523f89 100644 --- a/pkgs/applications/version-management/darcs/darcs-2.nix +++ b/pkgs/applications/version-management/darcs/darcs-2.nix @@ -1,16 +1,20 @@ -{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage} : +{cabal, html, mtl, parsec, regexCompat, curl, haskeline, hashedStorage, zlib} : cabal.mkDerivation (self : { pname = "darcs"; name = self.fname; - version = "2.3.1"; - sha256 = "14821bb2db4975cb4db2c5cc4f085069b936da591b7b71592befc9e07f17d214"; + version = "2.4.1"; + sha256 = "6ac0e84d2eca160e6e33755679dfb185d9b5f9f5bdc43f99db326210aabbc4aa"; - extraBuildInputs = [html parsec regexCompat curl haskeline hashedStorage]; + extraBuildInputs = [ + html parsec regexCompat curl haskeline hashedStorage zlib + ]; meta = { homepage = http://darcs.net/; description = "Patch-based version management system"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index de189369772..ff89b3b8f10 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -1,12 +1,13 @@ -{cabal, mtl, zlib, mmap}: +{cabal, mtl, zlib, mmap, binary, dataenc}: cabal.mkDerivation (self : { pname = "hashed-storage"; - version = "0.3.8"; - sha256 = "1f379dcb00a56c0b330eeabb1f069ef294bcf1f3dc18980e93b8b228e577fdb1"; - propagatedBuildInputs = [mtl zlib mmap]; + version = "0.4.11"; + sha256 = "c719f9b86c5a517324ce3448fcb4b6377ccbfa085268b396bec47b8bbcfbde1b"; + propagatedBuildInputs = [mtl zlib mmap binary dataenc]; meta = { description = "Hashed file storage support code"; + maintainers = [self.stdenv.lib.maintainers.andres]; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 425b6754a11..c94ee35b784 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -261,7 +261,7 @@ rec { }; hashedStorage = import ../development/libraries/haskell/hashed-storage { - inherit cabal mtl zlib mmap; + inherit cabal mtl zlib mmap binary dataenc; }; haskeline = import ../development/libraries/haskell/haskeline { @@ -940,6 +940,7 @@ rec { darcs = import ../applications/version-management/darcs/darcs-2.nix { inherit cabal html mtl parsec regexCompat haskeline hashedStorage; + zlib = zlib0520; inherit (pkgs) curl; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 6e6a0a12df9..a0a33abbea4 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -423,11 +423,13 @@ with (import ./release-lib.nix); }; haskellPackages_ghc6121 = { + darcs = ghcSupported; ghc = ghcSupported; haskellPlatform2010100 = linux; }; haskellPackages_ghc6122 = { + darcs = ghcSupported; ghc = ghcSupported; haskellPlatform2010100 = linux; }; From 293cde6747933ce86512ad59d8ba0e73d2e9773e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Apr 2010 21:54:38 +0000 Subject: [PATCH 044/342] Fix neon build Use pkg-config to find openssl svn path=/nixpkgs/trunk/; revision=21391 --- pkgs/development/libraries/neon/0.28.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix index c41474b39b6..8e717ff52d8 100644 --- a/pkgs/development/libraries/neon/0.28.nix +++ b/pkgs/development/libraries/neon/0.28.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 +{ stdenv, fetchurl, libxml2, pkgconfig , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null , static ? false @@ -17,13 +17,14 @@ stdenv.mkDerivation rec { sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6"; }; - buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; + buildInputs = [libxml2 pkgconfig openssl] + ++ stdenv.lib.optional compressionSupport zlib; configureFlags = '' ${if shared then "--enable-shared" else "--disable-shared"} ${if static then "--enable-static" else "--disable-static"} ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"} + ${if sslSupport then "--with-ssl" else "--without-ssl"} --enable-shared ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 629dc126912..41fadf1fc1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4723,7 +4723,7 @@ let }; neon028 = import ../development/libraries/neon/0.28.nix { - inherit fetchurl stdenv libxml2 zlib openssl; + inherit fetchurl stdenv libxml2 zlib openssl pkgconfig; compressionSupport = true; sslSupport = true; }; From 415f0fdc9f9bb73294fc0223a4246879f55fac8f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 27 Apr 2010 22:05:00 +0000 Subject: [PATCH 045/342] Also fix neon-0.26 build svn path=/nixpkgs/trunk/; revision=21392 --- pkgs/development/libraries/neon/0.26.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix index c6dde2253bc..6b06e54e73d 100644 --- a/pkgs/development/libraries/neon/0.26.nix +++ b/pkgs/development/libraries/neon/0.26.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 +{ stdenv, fetchurl, libxml2, pkgconfig , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null }: @@ -14,11 +14,13 @@ stdenv.mkDerivation { sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj"; }; - buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; + buildInputs = [libxml2] + ++ stdenv.lib.optional compressionSupport zlib + ++ (if sslSupport then [ openssl pkgconfig ] else []); configureFlags = '' ${if compressionSupport then "--with-zlib" else "--without-zlib"} - ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"} + ${if sslSupport then "--with-ssl" else "--without-ssl"} --enable-shared ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41fadf1fc1d..11f70630778 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4717,7 +4717,7 @@ let neon = neon026; neon026 = import ../development/libraries/neon/0.26.nix { - inherit fetchurl stdenv libxml2 zlib openssl; + inherit fetchurl stdenv libxml2 zlib openssl pkgconfig; compressionSupport = true; sslSupport = true; }; From d5601ee60eb8a6a59f5d700c125743bbd5211038 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 28 Apr 2010 08:40:12 +0000 Subject: [PATCH 046/342] Install libraries to $out/lib instead of $out/lib64 This should fix a lot of builds svn path=/nixpkgs/trunk/; revision=21393 --- pkgs/development/libraries/openssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5c7fd37eb8e..a3448e2641d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (rec { configureScript = "./config"; - configureFlags = "shared"; + configureFlags="--libdir=lib shared"; crossAttrs = { - configurePhase = '' + preConfigure='' export cross=$crossSystem- - ./Configure --prefix=$out ${opensslCrossSystem} shared ''; + configureFlags="--libdir=lib ${opensslCrossSystem} shared"; buildPhase = '' make CC=$crossConfig-gcc \ AR="$crossConfig-ar r" \ From b7151c4e2c64146bc325b6a4ee6c13241c9ae51b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 28 Apr 2010 08:40:19 +0000 Subject: [PATCH 047/342] Add neon-0.29.x, make it default Also stop using "default" neon in all-packages.nix. Minor versions are not source-compatible, so a package should state needed version explicitly. svn path=/nixpkgs/trunk/; revision=21394 --- pkgs/development/libraries/neon/0.29.nix | 37 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 19 ++++++++---- 2 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/neon/0.29.nix diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix new file mode 100644 index 00000000000..df952a25315 --- /dev/null +++ b/pkgs/development/libraries/neon/0.29.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, libxml2, pkgconfig +, compressionSupport ? true, zlib ? null +, sslSupport ? true, openssl ? null +, static ? false +, shared ? true +}: + +assert compressionSupport -> zlib != null; +assert sslSupport -> openssl != null; +assert static || shared; + +stdenv.mkDerivation rec { + name = "neon-0.29.3"; + + src = fetchurl { + url = "http://www.webdav.org/neon/${name}.tar.gz"; + sha256 = "1d1c6zhr00yvg0fbhpkq8kmsq9cchr112ii9rl39gdybyflh9444"; + }; + + buildInputs = [libxml2 pkgconfig openssl] + ++ stdenv.lib.optional compressionSupport zlib; + + configureFlags = '' + ${if shared then "--enable-shared" else "--disable-shared"} + ${if static then "--enable-static" else "--disable-static"} + ${if compressionSupport then "--with-zlib" else "--without-zlib"} + ${if sslSupport then "--with-ssl" else "--without-ssl"} + --enable-shared + ''; + + passthru = {inherit compressionSupport sslSupport;}; + + meta = { + description = "An HTTP and WebDAV client library"; + homepage = http://www.webdav.org/neon/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11f70630778..603e980afc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1636,7 +1636,8 @@ let }; sitecopy = import ../tools/networking/sitecopy { - inherit fetchurl stdenv neon openssl; + inherit fetchurl stdenv openssl; + neon = neon026; }; privoxy = import ../tools/networking/privoxy { @@ -1792,7 +1793,8 @@ let }; wdfs = import ../tools/filesystems/wdfs { - inherit stdenv fetchurl neon fuse pkgconfig glib; + inherit stdenv fetchurl fuse pkgconfig glib; + neon = neon026; }; wdiff = import ../tools/text/wdiff { @@ -4714,7 +4716,7 @@ let unicode = (system != "i686-cygwin" && crossSystem == null); }; - neon = neon026; + neon = neon029; neon026 = import ../development/libraries/neon/0.26.nix { inherit fetchurl stdenv libxml2 zlib openssl pkgconfig; @@ -4728,6 +4730,12 @@ let sslSupport = true; }; + neon029 = import ../development/libraries/neon/0.29.nix { + inherit fetchurl stdenv libxml2 zlib openssl pkgconfig; + compressionSupport = true; + sslSupport = true; + }; + nethack = builderDefsPackage (import ../games/nethack) { inherit ncurses flex bison; }; @@ -7890,12 +7898,13 @@ let openoffice = import ../applications/office/openoffice { inherit fetchurl stdenv pam python tcsh libxslt perl zlib libjpeg expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron - curl libsndfile flex zip unzip libmspack getopt file neon cairo + curl libsndfile flex zip unzip libmspack getopt file cairo which icu jdk ant cups openssl bison boost gperf cppunit; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (gtkLibs) gtk; inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; + neon = neon026; }; opera = import ../applications/networking/browsers/opera { @@ -8130,7 +8139,7 @@ let subversion = makeOverridable (import ../applications/version-management/subversion/default.nix) { inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite; - neon = neon028; + neon = neon029; bdbSupport = getConfig ["subversion" "bdbSupport"] true; httpServer = getConfig ["subversion" "httpServer"] false; httpSupport = getConfig ["subversion" "httpSupport"] true; From 882c847590632e2193923d04ece6795856d14c5e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 28 Apr 2010 09:38:46 +0000 Subject: [PATCH 048/342] enable neon version check in svn svn path=/nixpkgs/trunk/; revision=21395 --- pkgs/applications/version-management/subversion/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 2dae1b344fc..da7e72669c6 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} --with-zlib=${zlib} --with-sqlite=${sqlite} - --disable-neon-version-check ''; preBuild = '' From 0089b865e9979a1c50a606d065364c45fd783780 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 28 Apr 2010 09:38:55 +0000 Subject: [PATCH 049/342] Upgrade to heimdal-1.3.2 svn path=/nixpkgs/trunk/; revision=21396 --- pkgs/development/libraries/kerberos/heimdal.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 9f7305f2d3e..6cdd1016690 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,14 +1,14 @@ -args: with args; +{stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl} : stdenv.mkDerivation rec { - name = "heimdal-1.0.2"; + name = "heimdal-1.3.2"; src = fetchurl { urls = [ "http://www.h5l.org/dist/src/${name}.tar.gz" "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" ]; - sha256 = "1h4x41lpv2abpv5l3yjd58pfzs0kkp5sbnih9iykhwd6sii1iig5"; + sha256 = "0qwcq79nffsv9iyz4cf854l85i3x1cq79rxb34prpmjbfvs3ynwn"; }; ## ugly, X should be made an option From 8a1dd10d81c3b9bd60c5bbd3dcb1d6aae8047363 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 28 Apr 2010 09:39:01 +0000 Subject: [PATCH 050/342] samba: make kerberos optional svn path=/nixpkgs/trunk/; revision=21397 --- pkgs/servers/samba/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 64b7c5fc7de..5f8ba337eab 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, readline, pam, openldap, kerberos, popt -, iniparser, libunwind, fam, acl +{ stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam +, acl +, useKerberos ? false, kerberos ? null # Eg. smbclient and smbspool require a smb.conf file. # If you set configDir to "" an empty configuration file @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; }; - buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam acl]; + buildInputs = [readline pam openldap popt iniparser libunwind fam acl] + ++ stdenv.lib.optional useKerberos kerberos; preConfigure = "cd source"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 603e980afc3..264be85efa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5648,7 +5648,7 @@ let samba = makeOverridable (import ../servers/samba) { inherit stdenv fetchurl readline openldap pam kerberos popt iniparser - libunwind acl fam; + libunwind acl fam; }; shishi = import ../servers/shishi { From 3fe67eca31edfeb2d9c84d489b7360bfcbb20647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 Apr 2010 10:09:40 +0000 Subject: [PATCH 051/342] Updating wxGTK 2.8 svn path=/nixpkgs/trunk/; revision=21398 --- pkgs/development/libraries/wxGTK-2.8/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 0bdec709e13..cc899d7b003 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -9,11 +9,11 @@ assert gtk.libpng != null; assert gtk.libpng.zlib != null; stdenv.mkDerivation { - name = "wxGTK-2.8.10"; + name = "wxGTK-2.8.11"; src = fetchurl { - url = mirror://sourceforge/wxwindows/wxGTK-2.8.10.tar.gz; - sha256 = "1hygkrwa71kzdbz029igkxsqyb14y6vsllqafjgm9b7v91nq49r8"; + url = mirror://sourceforge/wxwindows/wxGTK-2.8.11.tar.gz; + sha256 = "149waiwwzw238avkhj8vmm1394nw45fa02b7cf1mqwc3jdd1pfz6"; }; buildInputs = [ From 7c038cdc06a1c4973ee44bfdd9e38f38358ed602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Apr 2010 12:36:53 +0000 Subject: [PATCH 052/342] Add MPC. svn path=/nixpkgs/trunk/; revision=21399 --- pkgs/development/libraries/mpc/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/mpc/default.nix diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix new file mode 100644 index 00000000000..e5ae5b76323 --- /dev/null +++ b/pkgs/development/libraries/mpc/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, gmp, mpfr }: + +stdenv.mkDerivation rec { + name = "mpc-0.8.1"; + + src = fetchurl { + url = "http://www.multiprecision.org/mpc/download/${name}.tar.gz"; + sha256 = "1r73zqw8lnf0bkfsxn0znbwbfyacg94pd0l4aaixh7r5awvn0r76"; + }; + + buildInputs = [ gmp mpfr ]; + + doCheck = true; + + meta = { + description = "MPC, a library for multiprecision complex arithmetic with exact rounding"; + + longDescription = + '' MPC is a C library for the arithmetic of complex numbers with + arbitrarily high precision and correct rounding of the result. It is + built upon and follows the same principles as GNU MPFR. + ''; + + homepage = http://mpc.multiprecision.org/; + license = "LGPLv2+"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 264be85efa6..a2c2a1ac664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4701,6 +4701,10 @@ let inherit fetchurl stdenv ilbc mediastreamer pkgconfig; }; + mpc = import ../development/libraries/mpc { + inherit fetchurl stdenv gmp mpfr; + }; + mpich2 = import ../development/libraries/mpich2 { inherit fetchurl stdenv python perl; }; From a2bd7f82d7c506d5ef1dcd375544c7b1e4e0d8b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Apr 2010 12:36:58 +0000 Subject: [PATCH 053/342] Add libelf. svn path=/nixpkgs/trunk/; revision=21400 --- pkgs/development/libraries/libelf/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libelf/default.nix diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix new file mode 100644 index 00000000000..339e97b9673 --- /dev/null +++ b/pkgs/development/libraries/libelf/default.nix @@ -0,0 +1,23 @@ +{ fetchurl, stdenv }: + +stdenv.mkDerivation rec { + name = "libelf-0.8.13"; + + src = fetchurl { + url = "http://www.mr511.de/software/${name}.tar.gz"; + sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"; + }; + + doCheck = true; + + meta = { + description = "Libelf, an ELF object file access library"; + + homepage = http://www.mr511.de/software/english.html; + + license = "LGPLv2+"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c2a1ac664..8ad2d4fb48f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4261,6 +4261,10 @@ let inherit fetchurl stdenv ncurses; }; + libelf = import ../development/libraries/libelf { + inherit fetchurl stdenv; + }; + liblo = import ../development/libraries/liblo { inherit fetchurl stdenv; }; From 689914a5b2f10e62575fd77f5fdfae338609dcdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Apr 2010 12:37:02 +0000 Subject: [PATCH 054/342] update-gcc.sh: Add support for Ada. svn path=/nixpkgs/trunk/; revision=21401 --- pkgs/development/compilers/gcc-4.4/update-gcc.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.4/update-gcc.sh b/pkgs/development/compilers/gcc-4.4/update-gcc.sh index d4fff825f61..c93035296fc 100755 --- a/pkgs/development/compilers/gcc-4.4/update-gcc.sh +++ b/pkgs/development/compilers/gcc-4.4/update-gcc.sh @@ -20,16 +20,17 @@ options["core"]="/* langC */ true" options["g++"]="langCC" options["fortran"]="langFortran" options["java"]="langJava" +options["ada"]="langAda" cat > "$out"< Date: Wed, 28 Apr 2010 12:37:06 +0000 Subject: [PATCH 055/342] pam_login: Really apply `sys-stat-h.patch'. svn path=/nixpkgs/trunk/; revision=21402 --- pkgs/os-specific/linux/pam_login/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam_login/default.nix b/pkgs/os-specific/linux/pam_login/default.nix index f1d2eb6bc44..46da3053d20 100644 --- a/pkgs/os-specific/linux/pam_login/default.nix +++ b/pkgs/os-specific/linux/pam_login/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # To overcome a gcc 4.4 warning: # "#ident is a deprecated GCC extension" - patchPhase = '' + postPatch = '' sed -i s/-Werror// configure ''; From 5929f9d3bdb2094a85202d55d5e2c50ee3c82ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 28 Apr 2010 12:37:11 +0000 Subject: [PATCH 056/342] GCC 4.5.0. svn path=/nixpkgs/trunk/; revision=21403 --- pkgs/development/compilers/gcc-4.5/builder.sh | 171 ++++++++++++ .../development/compilers/gcc-4.5/default.nix | 264 ++++++++++++++++++ .../compilers/gcc-4.5/ghdl-ortho-cflags.patch | 111 ++++++++ .../compilers/gcc-4.5/gnat-cflags.patch | 33 +++ .../gcc-4.5/java-jvgenmain-link.patch | 17 ++ .../compilers/gcc-4.5/no-sys-dirs.patch | 54 ++++ .../compilers/gcc-4.5/pr41818.patch | 26 ++ .../development/compilers/gcc-4.5/sources.nix | 26 ++ .../compilers/gcc-4.5/update-gcc.sh | 1 + pkgs/top-level/all-packages.nix | 21 ++ 10 files changed, 724 insertions(+) create mode 100644 pkgs/development/compilers/gcc-4.5/builder.sh create mode 100644 pkgs/development/compilers/gcc-4.5/default.nix create mode 100644 pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch create mode 100644 pkgs/development/compilers/gcc-4.5/gnat-cflags.patch create mode 100644 pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch create mode 100644 pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch create mode 100644 pkgs/development/compilers/gcc-4.5/pr41818.patch create mode 100644 pkgs/development/compilers/gcc-4.5/sources.nix create mode 120000 pkgs/development/compilers/gcc-4.5/update-gcc.sh diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc-4.5/builder.sh new file mode 100644 index 00000000000..b9724e7ad50 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/builder.sh @@ -0,0 +1,171 @@ +source $stdenv/setup + + +export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy +mkdir $NIX_FIXINC_DUMMY + + +# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad +# Thing. +export CPP="gcc -E" + +if test "$staticCompiler" = "1"; then + EXTRA_LDFLAGS="-static" +else + EXTRA_LDFLAGS="" +fi + +if test "$noSysDirs" = "1"; then + + if test -e $NIX_GCC/nix-support/orig-libc; then + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + + else + # Hack: support impure environments. + extraFlags="-isystem /usr/include" + extraLDFlags="-L/usr/lib64 -L/usr/lib" + glibc_libdir="/usr/lib" + export NIX_FIXINC_DUMMY=/usr/include + fi + + extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY $extraFlags" + extraLDFlags="--strip-debug -L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" + + EXTRA_FLAGS="$extraFlags" + for i in $extraLDFlags; do + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" + done + + if test -n "$targetConfig"; then + # Cross-compiling, we need gcc not to read ./specs in order to build + # the g++ compiler (after the specs for the cross-gcc are created). + # Having LIBRARY_PATH= makes gcc read the specs from ., and the build + # breaks. Having this variable comes from the default.nix code to bring + # gcj in. + unset LIBRARY_PATH + unset CPATH + if test -z "$crossStageStatic"; then + EXTRA_FLAGS_TARGET="-g0 -O2 -B${libcCross}/lib -idirafter ${libcCross}/include" + EXTRA_LDFLAGS_TARGET="-Wl,-L${libcCross}/lib" + fi + else + EXTRA_FLAGS_TARGET="$EXTRA_FLAGS" + EXTRA_LDFLAGS_TARGET="$EXTRA_LDFLAGS" + fi + + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find + # the startfiles. + # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx + # for the startfiles. + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + CFLAGS_FOR_TARGET="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \ + FLAGS_FOR_TARGET="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \ + LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + LDFLAGS_FOR_TARGET="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \ + ) + + if test -z "$targetConfig"; then + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ + BOOT_LDFLAGS="$EXTRA_FLAGS_TARGET $EXTRA_LDFLAGS_TARGET" \ + ) + fi + + if test -n "$targetConfig" -a "$crossStageStatic" == 1; then + # We don't want the gcc build to assume there will be a libc providing + # limits.h in this stagae + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + LIMITS_H_TEST=false \ + ) + else + makeFlagsArray=( \ + "${makeFlagsArray[@]}" \ + LIMITS_H_TEST=true \ + ) + fi +fi + +if test -n "$targetConfig"; then + # The host strip will destroy some important details of the objects + dontStrip=1 +fi + +preConfigure() { + if test -n "$newlibSrc"; then + tar xvf "$newlibSrc" -C .. + ln -s ../newlib-*/newlib newlib + # Patch to get armvt5el working: + sed -i -e 's/ arm)/ arm*)/' newlib/configure.host + fi + # Bug - they packaged zlib + if test -d "zlib"; then + # This breaks the build without-headers, which should build only + # the target libgcc as target libraries. + # See 'configure:5370' + rm -Rf zlib + fi + + # Perform the build in a different directory. + mkdir ../build + cd ../build + configureScript=../$sourceRoot/configure +} + + +postInstall() { + # Remove precompiled headers for now. They are very big and + # probably not very useful yet. + find $out/include -name "*.gch" -exec rm -rf {} \; -prune + + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools + rm -rf $out/lib/gcc/*/*/install-tools + + # Get rid of some "fixed" header files + rm -rf $out/lib/gcc/*/*/include/root + + # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. + for i in $out/bin/*-gcc*; do + if cmp -s $out/bin/gcc $i; then + ln -sfn gcc $i + fi + done + + for i in $out/bin/*-c++* $out/bin/*-g++*; do + if cmp -s $out/bin/g++ $i; then + ln -sfn g++ $i + fi + done + + eval "$postInstallGhdl" +} + + +if test -z "$targetConfig"; then + if test -z "$profiledCompiler"; then + buildFlags="bootstrap $buildFlags" + else + buildFlags="profiledbootstrap $buildFlags" + fi +fi + +genericBuild diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix new file mode 100644 index 00000000000..a70de4f4e50 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -0,0 +1,264 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langFortran ? false, langTreelang ? false +, langJava ? false +, langAda ? false +, langVhdl ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, texinfo ? null +, gmp, mpfr, mpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework +, bison ? null, flex ? null +, zlib ? null, boehmgc ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null +, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null +, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, gnatboot ? null +, enableMultilib ? false +, name ? "gcc" +, cross ? null +, binutilsCross ? null +, libcCross ? null +, crossStageStatic ? true +, gnat ? null +}: + +assert langTreelang -> bison != null && flex != null; +assert langJava -> zip != null && unzip != null + && zlib != null && boehmgc != null; +assert langAda -> gnatboot != null; +assert langVhdl -> gnat != null; + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +with stdenv.lib; + +let version = "4.5.0"; + javaEcj = fetchurl { + # The `$(top_srcdir)/ecj.jar' file is automatically picked up at + # `configure' time. + + # XXX: Eventually we might want to take it from upstream. + url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; + sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; + }; + + # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a + # binary distribution here to allow the whole chain to be bootstrapped. + javaAntlr = fetchurl { + url = http://www.antlr.org/download/antlr-3.1.3.jar; + sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09"; + }; + + xlibs = [ + libX11 libXt libSM libICE libXtst libXrender libXrandr libXi + xproto renderproto xextproto inputproto randrproto + ]; + + javaAwtGtk = langJava && gtk != null; + + /* Cross-gcc settings */ + gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; + gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; + gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; + withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; + withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; + withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + + crossConfigureFlags = + "--target=${cross.config}" + + withArch + + withCpu + + withAbi + + (if crossStageStatic then + " --disable-libssp --disable-nls" + + " --without-headers" + + " --disable-threads " + + " --disable-libmudflap " + + " --disable-libgomp " + + " --disable-shared" + + " --disable-decimal-float" # libdecnumber requires libc + " --disable-multilib" + else + " --with-headers=${libcCross}/include" + + " --enable-__cxa_atexit" + + " --enable-long-long" + + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float" # No final libdecnumber (it may work only in 386) + ); + stageNameAddon = if (crossStageStatic) then "-stage-static" else + "-stage-final"; + crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + +in + +# We need all these X libraries when building AWT with GTK+. +assert gtk != null -> (filter (x: x == null) xlibs) == []; + +stdenv.mkDerivation ({ + name = "${name}-${version}" + crossNameAddon; + + builder = ./builder.sh; + + src = (import ./sources.nix) { + inherit fetchurl optional version; + inherit langC langCC langFortran langJava langAda; + }; + + patches = + [ ] + ++ optional noSysDirs ./no-sys-dirs.patch + # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its + # target libraries and tools. + ++ optional langAda ./gnat-cflags.patch + ++ optional langVhdl ./ghdl-ortho-cflags.patch + ++ optional (cross != null && cross.arch == "sparc64") ./pr41818.patch; + + inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + libcCross; + + buildInputs = [ texinfo gmp mpfr mpc libelf gettext which ] + ++ (optional (ppl != null) ppl) + ++ (optional (cloogppl != null) cloogppl) + ++ (optionals langTreelang [bison flex]) + ++ (optional (zlib != null) zlib) + ++ (optional (boehmgc != null) boehmgc) + ++ (optionals langJava [zip unzip]) + ++ (optionals javaAwtGtk [gtk pkgconfig libart_lgpl] ++ xlibs) + ++ (optionals (cross != null) [binutilsCross]) + ++ (optionals langAda [gnatboot]) + ++ (optionals langVhdl [gnat]) + ; + + configureFlags = " + ${if enableMultilib then "" else "--disable-multilib"} + ${if enableShared then "" else "--disable-shared"} + ${if ppl != null then "--with-ppl=${ppl}" else ""} + ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} + ${if langJava then "--with-ecj-jar=${javaEcj}" else ""} + ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} + ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} + --with-gmp=${gmp} + --with-mpfr=${mpfr} + --with-mpc=${mpc} + ${if (libelf != null) then "--with-libelf=${libelf}" else ""} + --disable-libstdcxx-pch + --without-included-gettext + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langFortran "fortran" + ++ optional langJava "java" + ++ optional langTreelang "treelang" + ++ optional langAda "ada" + ++ optional langVhdl "vhdl" + ) + ) + } + ${if langAda then " --enable-libada" else ""} + ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} + ${if cross != null then crossConfigureFlags else ""} + "; + + targetConfig = if (cross != null) then cross.config else null; + + # Needed for the cross compilation to work + AR = "ar"; + LD = "ld"; + CC = "gcc"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find + # the library headers and binaries, regarless of the language being + # compiled. + + # Note: When building the Java AWT GTK+ peer, the build system doesn't + # honor `--with-gmp' et al., e.g., when building + # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just + # add them to $CPATH and $LIBRARY_PATH in this case. + # + # Likewise, the LTO code doesn't find zlib. + + CPATH = concatStrings + (intersperse ":" (map (x: x + "/include") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ]))); + + LIBRARY_PATH = concatStrings + (intersperse ":" (map (x: x + "/lib") + (optionals (zlib != null) [ zlib ] + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ]))); + + + passthru = { inherit langC langCC langAda langFortran langTreelang langVhdl + enableMultilib; }; + + meta = { + homepage = http://gcc.gnu.org/; + license = "GPLv3+"; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}"; + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well + as libraries for these languages (libstdc++, libgcj, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = [ + stdenv.lib.maintainers.ludo + stdenv.lib.maintainers.viric + ]; + + # Volunteers needed for the {Cyg,Dar}win ports of *PPL. + # gnatboot is not available out of linux platforms, so we disable the darwin build + # for the gnat (ada compiler). + platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; + }; +} +// (if langVhdl then rec { + name = "ghdl-0.29"; + + ghdlSrc = fetchurl { + url = "http://ghdl.free.fr/ghdl-0.29.tar.bz2"; + sha256 = "15mlinr1lwljwll9ampzcfcrk9bk0qpdks1kxlvb70xf9zhh2jva"; + }; + + # Ghdl has some timestamps checks, storing file timestamps in '.cf' files. + # As we will change the timestamps to 1970-01-01 00:00:01, we also set the + # content of that .cf to that value. This way ghdl does not complain on + # the installed object files from the basic libraries (ieee, ...) + postInstallGhdl = '' + pushd $out + find . -name "*.cf" -exec \ + sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \; + popd + ''; + + postUnpack = '' + tar xvf ${ghdlSrc} + mv ghdl-*/vhdl gcc*/gcc + rm -Rf ghdl-* + ''; + + meta = { + homepage = "http://ghdl.free.fr/"; + license = "GPLv2+"; + description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; + +} else {})) diff --git a/pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch new file mode 100644 index 00000000000..901534591c8 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/ghdl-ortho-cflags.patch @@ -0,0 +1,111 @@ +diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in +index 8f481df..681ac59 100644 +--- a/gcc/vhdl/Make-lang.in ++++ b/gcc/vhdl/Make-lang.in +@@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../ + AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ + -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ + -I$(AGCC_GCCSRC_DIR)/libcpp/include +-AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) ++AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS) $(INCLUDES) + + AGCC_LOCAL_OBJS=ortho-lang.o + +@@ -140,7 +140,7 @@ ghdl$(exeext): force + + # Ghdl libraries. + ghdllib: ghdl$(exeext) $(GCC_PASSES) force +- $(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib ++ $(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib + + # Build hooks: + +diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in +index d754c6c..07abc4a 100644 +--- a/gcc/vhdl/Makefile.in ++++ b/gcc/vhdl/Makefile.in +@@ -80,7 +80,8 @@ T_CPPFLAGS = + X_ADAFLAGS = + T_ADAFLAGS = + +-ADAC = $(CC) ++# Never use the bootstrapped compiler, as it may not be built for ada ++ADAC = gcc + + ECHO = echo + CHMOD = chmod +diff --git a/gcc/vhdl/ortho-lang.c b/gcc/vhdl/ortho-lang.c +index 84aeb92..8eddd42 100644 +--- a/gcc/vhdl/ortho-lang.c ++++ b/gcc/vhdl/ortho-lang.c +@@ -16,6 +16,7 @@ + #include "options.h" + #include "real.h" +-#include "tree-gimple.h" ++#include "gimple.h" ++#include "tree.h" + #include "function.h" + #include "cgraph.h" + #include "target.h" +@@ -680,38 +681,10 @@ type_for_mode (enum machine_mode mode, int unsignedp) + + const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; + +-/* Tree code classes. */ +- +-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, +- +-const enum tree_code_class tree_code_type[] = { +-#include "tree.def" +- 'x' +-}; +-#undef DEFTREECODE +- +-/* Table indexed by tree code giving number of expression +- operands beyond the fixed part of the node structure. +- Not used for types or decls. */ +- +-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, +- +-const unsigned char tree_code_length[] = { +-#include "tree.def" +- 0 +-}; +-#undef DEFTREECODE +- +-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) NAME, +-const char * const tree_code_name[] = { +-#include "tree.def" +- "@@dummy" +-}; +-#undef DEFTREECODE + + union lang_tree_node + GTY((desc ("0"), +- chain_next ("(union lang_tree_node *) GENERIC_NEXT (&%h.generic)"))) ++ chain_next ("(union lang_tree_node *) TREE_CHAIN (&%h.generic)"))) + { + union tree_node GTY ((tag ("0"))) generic; + }; +@@ -1162,7 +1135,7 @@ new_access_type (tree dtype) + res = make_node (POINTER_TYPE); + TREE_TYPE (res) = NULL_TREE; + /* Seems necessary. */ +- TYPE_MODE (res) = Pmode; ++ SET_TYPE_MODE (res, Pmode); + layout_type (res); + return res; + } +diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in +index e201f64..f36fb97 100644 +--- a/gcc/vhdl/Make-lang.in ++++ b/gcc/vhdl/Make-lang.in +@@ -132,7 +132,7 @@ ghdl1$(exeext): $(AGCC_OBJS) $(AGCC_DEPS) force + -cargs $(CFLAGS) $(GHDL_ADAFLAGS) + $(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aOvhdl ortho_gcc-main \ + -bargs -E -cargs $(CFLAGS) $(GHDL_ADAFLAGS) \ +- -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) ++ -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS) + + # The driver for ghdl. + ghdl$(exeext): force diff --git a/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch b/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch new file mode 100644 index 00000000000..e85e5076be6 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/gnat-cflags.patch @@ -0,0 +1,33 @@ +diff --git a/libada/Makefile.in b/libada/Makefile.in +index f5057a0..337e0c6 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -55,7 +55,7 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) + WARN_CFLAGS = @warn_cflags@ + + TARGET_LIBGCC2_CFLAGS= +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \ + -DIN_RTS @have_getipinfo@ + +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -105,7 +105,7 @@ ADAFLAGS = -W -Wall -gnatpg -gnata + SOME_ADAFLAGS =-gnata + FORCE_DEBUG_ADAFLAGS = -g + GNATLIBFLAGS = -gnatpg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -1838,7 +1838,7 @@ ADA_INCLUDE_SRCS =\ + + LIBGNAT=../$(RTSDIR)/libgnat.a + +-GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES) ++GCC_LINK=$(CC) -static-libgcc $(CFLAGS_FOR_TARGET) $(ADA_INCLUDES) + + # when compiling the tools, the runtime has to be first on the path so that + # it hides the runtime files lying with the rest of the sources diff --git a/pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch new file mode 100644 index 00000000000..2612e8bfbbb --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/java-jvgenmain-link.patch @@ -0,0 +1,17 @@ +The `jvgenmain' executable must be linked against `vec.o', among others, +since it uses its vector API. + +--- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 ++++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 16:11:41.000000000 +0200 +@@ -109,9 +109,9 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ + $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) + +-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) ++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) + rm -f $@ +- $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(BUILD_RTL) $(LIBS) + + # + # Build hooks: diff --git a/pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch b/pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch new file mode 100644 index 00000000000..8128fa87da5 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/no-sys-dirs.patch @@ -0,0 +1,54 @@ +diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c +--- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 ++++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 +@@ -41,6 +41,10 @@ + # undef CROSS_INCLUDE_DIR + #endif + ++#undef LOCAL_INCLUDE_DIR ++#undef SYSTEM_INCLUDE_DIR ++#undef STANDARD_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c +--- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 ++++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 +@@ -1478,10 +1478,10 @@ + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#define STANDARD_STARTFILE_PREFIX_1 "" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#define STANDARD_STARTFILE_PREFIX_2 "" + #endif + + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ +--- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 ++++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 +@@ -378,7 +378,11 @@ + MD5_H = $(srcdir)/../include/md5.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +-NATIVE_SYSTEM_HEADER_DIR = /usr/include ++# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent ++# `fixinc' from fixing header files in /usr/include. However, ++# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set ++# it to some dummy directory. ++NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +@@ -3277,7 +3281,7 @@ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ +- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ ++ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ + -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ + -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ + -DPREFIX=\"$(prefix)/\" \ diff --git a/pkgs/development/compilers/gcc-4.5/pr41818.patch b/pkgs/development/compilers/gcc-4.5/pr41818.patch new file mode 100644 index 00000000000..98731c46067 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/pr41818.patch @@ -0,0 +1,26 @@ +From . This fixes compilation +of the sparc64-linux-gnu cross-compiler with shared libraries. + +--- trunk/Makefile.in 2010/01/07 19:21:46 155705 ++++ trunk/Makefile.in 2010/01/07 19:53:50 155706 +@@ -259,7 +259,7 @@ + # directories built for the target. + TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" + # This is the list of variables to export in the environment when +-# configuring subdirectories for the host system. ++# configuring subdirectories for the target system. + BASE_TARGET_EXPORTS = \ + $(BASE_EXPORTS) \ + AR="$(AR_FOR_TARGET)"; export AR; \ +@@ -281,7 +281,10 @@ + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); ++@if gcc-bootstrap ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ ++@endif gcc-bootstrap ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); + + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ diff --git a/pkgs/development/compilers/gcc-4.5/sources.nix b/pkgs/development/compilers/gcc-4.5/sources.nix new file mode 100644 index 00000000000..4a9201d08eb --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/sources.nix @@ -0,0 +1,26 @@ +/* Automatically generated by `update-gcc.sh', do not edit. + For GCC 4.5.0. */ +{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }: + +assert version == "4.5.0"; +optional /* langC */ true (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; + sha256 = "19ykzyd938d4pblsihrsalk9ch1s23z57s0r5an8sqs7acv51r0g"; +}) ++ +optional langCC (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; + sha256 = "0hialil4v2hi7klr14x6h5z7b9ryzzy9kchr96s2p9hmsm7famlk"; +}) ++ +optional langFortran (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; + sha256 = "0anby974dikygjmxr6h1pd9s24fdps84fki1dijzhqqvq6lr3hbb"; +}) ++ +optional langJava (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; + sha256 = "0mlbxyhj7svjgby5vrpc49l2vk0k0878nlx0ap6jqq7xdyysvlcn"; +}) ++ +optional langAda (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; + sha256 = "1yar842bixmh2n9siy8s383lg8mz611xjdbbacgcznwab601czzv"; +}) ++ +[] diff --git a/pkgs/development/compilers/gcc-4.5/update-gcc.sh b/pkgs/development/compilers/gcc-4.5/update-gcc.sh new file mode 120000 index 00000000000..dd7bcd60c1b --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/update-gcc.sh @@ -0,0 +1 @@ +../gcc-4.4/update-gcc.sh \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ad2d4fb48f..18b90e1cbbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2059,6 +2059,13 @@ let profiledCompiler = true; })); + gcc45 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.5) { + inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib + ppl cloogppl + gettext which noSysDirs; + profiledCompiler = true; + })); + gccApple = wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc-apple else import ../development/compilers/gcc-apple64) { inherit fetchurl stdenv noSysDirs; @@ -2126,6 +2133,20 @@ let libXrandr xproto renderproto xextproto inputproto randrproto; }); + gcj45 = wrapGCC (gcc45.gcc.override { + name = "gcj"; + langJava = true; + langFortran = false; + langCC = true; + langC = false; + profiledCompiler = false; + inherit zip unzip zlib boehmgc gettext pkgconfig; + inherit (gtkLibs) gtk; + inherit (gnome) libart_lgpl; + inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender + libXrandr xproto renderproto xextproto inputproto randrproto; + }); + gnat = gnat44; gnat44 = wrapGCC (gcc44_real.gcc.override { From 6b8de64183f5ae7155258483c422661d892a3c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 Apr 2010 15:01:02 +0000 Subject: [PATCH 057/342] Revert "Install libraries to $out/lib instead of $out/lib64" This reverts commit 50429b2b63a3ad540e8fcd96be0cdaac46a27da2. svn path=/nixpkgs/trunk/; revision=21407 --- pkgs/development/libraries/openssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a3448e2641d..5c7fd37eb8e 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (rec { configureScript = "./config"; - configureFlags="--libdir=lib shared"; + configureFlags = "shared"; crossAttrs = { - preConfigure='' + configurePhase = '' export cross=$crossSystem- + ./Configure --prefix=$out ${opensslCrossSystem} shared ''; - configureFlags="--libdir=lib ${opensslCrossSystem} shared"; buildPhase = '' make CC=$crossConfig-gcc \ AR="$crossConfig-ar r" \ From e5ce3e5c8cd197153aca27fa7c6b62019fea51d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 28 Apr 2010 15:01:06 +0000 Subject: [PATCH 058/342] Revert "OpenSSL-1.0.0" changes, due to the new API breaking too much packages, which still have not released new versions compatible with openssl 1.0.0 I downgraded to 0.9.8n, that also has the security hole fix. svn path=/nixpkgs/trunk/; revision=21408 --- .../libraries/openssl/darwin-arch.patch | 40 +++++++++++-------- .../development/libraries/openssl/default.nix | 15 +++---- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index db2ddbb815e..5cbc90b9ebf 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,16 +1,24 @@ -The patch is specific to nix: MacOS gcc supports -arch. ---- a/Configure -+++ b/Configure -@@ -549,9 +549,9 @@ my %table=( - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX +diff -rc openssl-0.9.8k/Configure openssl-0.9.8k-new/Configure +*** openssl-0.9.8k/Configure Mon Feb 16 09:44:22 2009 +--- openssl-0.9.8k-new/Configure Fri Nov 27 13:41:58 2009 +*************** +*** 518,526 **** + "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", + "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + + ##### A/UX +--- 518,526 ---- + "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", + "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + + ##### A/UX diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5c7fd37eb8e..47a698ddbc5 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,14 +6,17 @@ let stdenv.cross; in -stdenv.mkDerivation (rec { - name = "openssl-1.0.0"; +stdenv.mkDerivation rec { + name = "openssl-0.9.8n"; src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; - sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; + sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh"; }; + # I disable the patch temporarily, as it does not apply to 0.9.8n + # patches = [ ./darwin-arch.patch ]; + buildNativeInputs = [ perl ]; configureScript = "./config"; @@ -37,9 +40,3 @@ stdenv.mkDerivation (rec { description = "A cryptographic library that implements the SSL and TLS protocols"; }; } -// -(if stdenv.isDarwin then { - patches = ./darwin-arch.patch; -} -else { }) -) From 8a79919093ebcacd81b2cf1b750e93b6b94c7d5c Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 28 Apr 2010 20:02:40 +0000 Subject: [PATCH 059/342] fix flash player debug build svn path=/nixpkgs/trunk/; revision=21411 --- pkgs/applications/editors/eclipse/default.nix | 2 ++ .../browsers/mozilla-plugins/flashplayer-10/default.nix | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 7085d703b5c..225c94faa87 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -55,5 +55,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.eclipse.org/; description = "A extensible multi-language software development environment"; + longDescription = '' + ''; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix index 42aea3dffcd..8bbe3396c47 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix @@ -77,10 +77,7 @@ stdenv.mkDerivation { libXext libXrender libXt gtk glib pango atk ]; - buildPhase = stdenv.lib.optionalString debug - '' - tar xfz plugin/debugger/libflashplayer.so.tar.gz - ''; + buildPhase = ":"; meta = { description = "Adobe Flash Player browser plugin"; From 69bfabd3287701f828e068cc3b38dbe66d7955da Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Thu, 29 Apr 2010 08:19:13 +0000 Subject: [PATCH 060/342] re-enabled darwin patch, gcc-darwin does not support -arch flag svn path=/nixpkgs/trunk/; revision=21412 --- .../libraries/openssl/darwin-arch.patch | 32 +++++++++++-------- .../development/libraries/openssl/default.nix | 7 ++-- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index 5cbc90b9ebf..f17a40395d6 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,24 +1,30 @@ -diff -rc openssl-0.9.8k/Configure openssl-0.9.8k-new/Configure -*** openssl-0.9.8k/Configure Mon Feb 16 09:44:22 2009 ---- openssl-0.9.8k-new/Configure Fri Nov 27 13:41:58 2009 +Removed -arch flags for darwin as they are not supported by gcc-darwin. + +diff -rc openssl-0.9.8n/Configure openssl-0.9.8n-new/Configure +*** openssl-0.9.8n/Configure Mon Nov 9 15:14:26 2009 +--- openssl-0.9.8n-new/Configure Thu Apr 29 10:16:15 2010 *************** -*** 518,526 **** +*** 523,533 **** + + ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ! "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### A/UX ---- 518,526 ---- +--- 523,533 ---- + + ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common: -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin64-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### A/UX diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 47a698ddbc5..4e567cf6577 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,7 +6,7 @@ let stdenv.cross; in -stdenv.mkDerivation rec { +stdenv.mkDerivation ( rec { name = "openssl-0.9.8n"; src = fetchurl { @@ -14,9 +14,6 @@ stdenv.mkDerivation rec { sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh"; }; - # I disable the patch temporarily, as it does not apply to 0.9.8n - # patches = [ ./darwin-arch.patch ]; - buildNativeInputs = [ perl ]; configureScript = "./config"; @@ -39,4 +36,4 @@ stdenv.mkDerivation rec { homepage = http://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; }; -} +} // (if stdenv.isDarwin then { patches = [./darwin-arch.patch]; } else {}) ) From 410536177b0c853410300e7a553aef8754a10646 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 08:53:43 +0000 Subject: [PATCH 061/342] pkgs/applications/misc/ikiwiki: strip trailing white space svn path=/nixpkgs/trunk/; revision=21413 --- pkgs/applications/misc/ikiwiki/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index a05668d246f..36104082f76 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -34,16 +34,16 @@ stdenv.mkDerivation rec { postInstall = '' for a in $out/bin/*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perl}/bin:$out/bin \ - ${lib.optionalString (git != null) + ${lib.optionalString (git != null) ''--prefix PATH : ${git}/bin \''} - ${lib.optionalString (monotone != null) + ${lib.optionalString (monotone != null) ''--prefix PATH : ${monotone}/bin \''} ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; - meta = { + meta = { description = "Wiki compiler, storing pages and history in a RCS"; homepage = http://ikiwiki.info/; license = "GPLv2+"; From 74e8f87d00ad1fafa53a935610b01cb4384041d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 08:53:52 +0000 Subject: [PATCH 062/342] pkgs/applications/misc/ikiwiki: bumped to version 3.20100427 svn path=/nixpkgs/trunk/; revision=21414 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 36104082f76..60d8a86c696 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "ikiwiki_3.20100312"; + name = "ikiwiki_3.20100427"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz"; - sha256 = "1pzjl4iplizzspsl237996j1ma6yp9jagbqf3d43kbhv1ai0v3ci"; + sha256 = "b00567628657c52ed5a5388e47af370b0f2cdfa82d3eaf1b0020f0e07d218b8f"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From d22b66cffc5f6d5b946c24b04f782cbe3e11748a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 08:53:58 +0000 Subject: [PATCH 063/342] pkgs/top-level/all-packages.nix: added ikiwiki.{git,monotone} options to $NIXPKGS_CONFIG Set "ikiwiki = { git = true; monotone = true; };" in $NIXPKGS_CONFIG to enable support for git and monotone in ikiwiki. If left unconfigured, the default is to include support for git, but not for monotone. svn path=/nixpkgs/trunk/; revision=21415 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18b90e1cbbc..d16fd196735 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7653,8 +7653,8 @@ let inherit fetchurl stdenv perl gettext makeWrapper lib; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext; - inherit git; # The RCS should be optional - monotone = null; + git = if getPkgConfig "ikiwiki" "git" true then git else null; + monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null; extraUtils = []; }; From 68d6efe22cbb4a714074a44e346c6bcd41881487 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 08:54:02 +0000 Subject: [PATCH 064/342] pkgs/top-level/all-packages.nix: strip trailing white space svn path=/nixpkgs/trunk/; revision=21416 --- pkgs/top-level/all-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d16fd196735..b8527c1e8a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2744,7 +2744,7 @@ let arch = if stdenv.isDarwin then darwinArchUtility else null; sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; }); - + pyrex = pyrex095; pyrex095 = import ../development/interpreters/pyrex/0.9.5.nix { @@ -4811,7 +4811,7 @@ let pkgconfig xineLib; inherit (gtkLibs) gtk glib; inherit (gst_all) gstreamer; - stdenv = stdenv2; + stdenv = stdenv2; }; # this ctl version is needed by openexr_viewers @@ -5533,11 +5533,11 @@ let inherit fetchurl stdenv erlang spidermonkey icu getopt curl; }; - + felix = import ../servers/felix { inherit stdenv fetchurl; }; - + felix_remoteshell = import ../servers/felix/remoteshell.nix { inherit stdenv fetchurl; }; @@ -7354,7 +7354,7 @@ let inherit fetchurl stdenv perl pkgconfig libpcap flex bison; inherit (gtkLibs) gtk; }; - + wvdial = import ../os-specific/linux/wvdial { inherit stdenv fetchurl wvstreams pkgconfig; }; From 411b6600ba53523b5eeaa7b3f69368a3e89b88f8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 09:35:05 +0000 Subject: [PATCH 065/342] pkgs/applications/misc/ikiwiki: dropped unnecessary empty line in shell code svn path=/nixpkgs/trunk/; revision=21417 --- pkgs/applications/misc/ikiwiki/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 60d8a86c696..6ddf0c89fd3 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ${lib.optionalString (monotone != null) ''--prefix PATH : ${monotone}/bin \''} ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} - done ''; From a20694d00420e8293822ad6b16fcf669f38efe45 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 09:35:09 +0000 Subject: [PATCH 066/342] pkgs/applications/misc/ikiwiki: renamed package from ikiwiki_3.20100427 to ikiwiki-3.20100427 to make it conform with Nix conventions svn path=/nixpkgs/trunk/; revision=21418 --- pkgs/applications/misc/ikiwiki/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 6ddf0c89fd3..fb7bf88ca9b 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -6,11 +6,15 @@ , extraUtils ? [] }: -stdenv.mkDerivation rec { - name = "ikiwiki_3.20100427"; +let + name = "ikiwiki"; + version = "3.20100427"; +in +stdenv.mkDerivation { + name = "${name}-${version}"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}.tar.gz"; + url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; sha256 = "b00567628657c52ed5a5388e47af370b0f2cdfa82d3eaf1b0020f0e07d218b8f"; }; From 325efe1b5eb5f03251c5cda4be1f234505f73812 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 09:35:12 +0000 Subject: [PATCH 067/342] pkgs/top-level/perl-packages.nix: strip trailing white space svn path=/nixpkgs/trunk/; revision=21419 --- pkgs/top-level/perl-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bb455efa790..4ab8f065316 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -641,7 +641,7 @@ rec { sha256 = "0fazl71hrc0r56gnc7vzwz9283p7h62gc8wsna7zgyfvrajjnhwl"; }; }; - + CompressRawBzip2 = import ../development/perl-modules/Compress-Raw-Bzip2 { inherit fetchurl buildPerlPackage; inherit (pkgs) bzip2; @@ -1718,7 +1718,7 @@ rec { }; propagatedBuildInputs = [Moose MooseXTypes TestException]; }; - + MooseXParamsValidate = buildPerlPackage rec { name = "MooseX-Params-Validate-0.10"; src = fetchurl { @@ -1727,7 +1727,7 @@ rec { }; propagatedBuildInputs = [Moose ParamsValidate SubExporter TestException]; }; - + MooseXSemiAffordanceAccessor = buildPerlPackage rec { name = "MooseX-SemiAffordanceAccessor-0.03"; src = fetchurl { @@ -1736,7 +1736,7 @@ rec { }; propagatedBuildInputs = [Moose]; }; - + MooseXTraits = buildPerlPackage rec { name = "MooseX-Traits-0.06"; src = fetchurl { @@ -1747,7 +1747,7 @@ rec { ClassMOP Moose TestException TestUseOk ]; }; - + MooseXTraitsPluggable = buildPerlPackage rec { name = "MooseX-Traits-Pluggable-0.04"; src = fetchurl { @@ -1759,7 +1759,7 @@ rec { MooseXTraits MooseAutobox ]; }; - + MooseXTypes = buildPerlPackage rec { name = "MooseX-Types-0.16"; src = fetchurl { @@ -1768,7 +1768,7 @@ rec { }; propagatedBuildInputs = [Moose CarpClan NamespaceClean]; }; - + Mouse = buildPerlPackage rec { name = "Mouse-0.26"; src = fetchurl { @@ -1949,7 +1949,7 @@ rec { url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; sha256 = "6c851e86475242fa0def2f02565743d41ab703ff6df3e826166ee9df5b961c7a"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = [ ClassInspector Clone FileRemove From d2160c4ad02f8520427f93155f14ab4869864522 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 09:35:16 +0000 Subject: [PATCH 068/342] pkgs/top-level/perl-packages.nix: added RPC-XML-0.73 svn path=/nixpkgs/trunk/; revision=21420 --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4ab8f065316..a296dc2dc0c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2089,6 +2089,15 @@ rec { }; }; + RpcXML = buildPerlPackage { + name = "RPC-XML-0.73"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.73.tar.gz; + sha256 = "a023649603240e7a19fc52a8316a41c854639c0600058ea4d1e436fe1b1b7734"; + }; + propagatedBuildInputs = [LWP XMLLibXML XMLParser]; + }; + ReturnValue = buildPerlPackage { name = "Return-Value-1.302"; src = fetchurl { From 5e8a97a831509d2d37dbe8dcfb197912c9a31b42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 09:35:20 +0000 Subject: [PATCH 069/342] pkgs/top-level/all-packages.nix: added RPC-XML support to ikiwiki This is required for the 'rst' plugin and for non-perl plugin support in general. svn path=/nixpkgs/trunk/; revision=21421 --- pkgs/applications/misc/ikiwiki/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index fb7bf88ca9b..13aa0895cbf 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, perl, gettext, makeWrapper, lib, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, - CGISession, CGIFormBuilder, DBFile, LocaleGettext + CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple , git ? null , monotone ? null , extraUtils ? [] @@ -19,7 +19,8 @@ stdenv.mkDerivation { }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate - TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext ] + TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext + RpcXML XMLSimple ] ++ (lib.optional (monotone != null) monotone) ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8527c1e8a3..5d83b03a129 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7652,7 +7652,8 @@ let ikiwiki = makeOverridable (import ../applications/misc/ikiwiki) { inherit fetchurl stdenv perl gettext makeWrapper lib; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber - HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext; + HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext + RpcXML XMLSimple; git = if getPkgConfig "ikiwiki" "git" true then git else null; monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null; extraUtils = []; From 85b7c134cb98ab3029f10dcf6eba22f154c13c39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:56:44 +0000 Subject: [PATCH 070/342] pkgs/os-specific/darwin/lipo: add support for running the native Darwin lipo utility svn path=/nixpkgs/trunk/; revision=21426 --- pkgs/os-specific/darwin/lipo/builder.sh | 3 +++ pkgs/os-specific/darwin/lipo/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 15 insertions(+) create mode 100755 pkgs/os-specific/darwin/lipo/builder.sh create mode 100644 pkgs/os-specific/darwin/lipo/default.nix diff --git a/pkgs/os-specific/darwin/lipo/builder.sh b/pkgs/os-specific/darwin/lipo/builder.sh new file mode 100755 index 00000000000..aea54429677 --- /dev/null +++ b/pkgs/os-specific/darwin/lipo/builder.sh @@ -0,0 +1,3 @@ +source $stdenv/setup +mkdir -p "$out/bin" +ln -s /usr/bin/lipo "$out/bin/" diff --git a/pkgs/os-specific/darwin/lipo/default.nix b/pkgs/os-specific/darwin/lipo/default.nix new file mode 100644 index 00000000000..a4f7cfc1e54 --- /dev/null +++ b/pkgs/os-specific/darwin/lipo/default.nix @@ -0,0 +1,8 @@ +{stdenv}: + +assert stdenv.isDarwin; + +stdenv.mkDerivation { + name = "darwin-lipo-utility"; + builder = ./builder.sh; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d83b03a129..1d2d4189c84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5826,6 +5826,10 @@ let inherit stdenv; }; + darwinLipoUtility = import ../os-specific/darwin/lipo { + inherit stdenv; + }; + devicemapper = lvm2; dmidecode = import ../os-specific/linux/dmidecode { From 56ce7f2ae61966f64f27d284473ae03495137663 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:56:52 +0000 Subject: [PATCH 071/342] pkgs/development/libraries/mesa: pass lipo utility to this build on Darwin svn path=/nixpkgs/trunk/; revision=21427 --- pkgs/development/libraries/mesa/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index cbe52ae0e37..9b3648c6ab8 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat }: +{ stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat, lipo ? null }: if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" @@ -17,6 +17,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig expat x11 libdrm xlibs.glproto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto + lipo ]; passthru = { inherit libdrm; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d2d4189c84..12ad7236ce2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4712,6 +4712,7 @@ let mesa = import ../development/libraries/mesa { inherit fetchurl stdenv pkgconfig expat x11 xlibs libdrm; + lipo = if stdenv.isDarwin then darwinLipoUtility else null; }; ming = import ../development/libraries/ming { From 5c43115185d14b77cb96cf82d3e9ff1c5a75c048 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:57:02 +0000 Subject: [PATCH 072/342] pkgs/development/libraries/mesa/default.nix: drop trailing white space svn path=/nixpkgs/trunk/; revision=21428 --- pkgs/development/libraries/mesa/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9b3648c6ab8..c68d2e7d552 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,22 +6,22 @@ else stdenv.mkDerivation { name = "mesa-7.6.1"; - + src = fetchurl { url = ftp://ftp.freedesktop.org/pub/mesa/7.6.1/MesaLib-7.6.1.tar.bz2; md5 = "7db4617e9e10ad3aca1b64339fd71b7d"; }; configureFlags = "--disable-gallium"; - + buildInputs = [ pkgconfig expat x11 libdrm xlibs.glproto xlibs.libXxf86vm xlibs.libXfixes xlibs.libXdamage xlibs.dri2proto lipo ]; - + passthru = { inherit libdrm; }; - + meta = { description = "An open source implementation of OpenGL"; homepage = http://www.mesa3d.org/; From 8ccc11560617d686d1443a93a5f2cc1c4e567311 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:57:07 +0000 Subject: [PATCH 073/342] pkgs/development/libraries/mesa: disable build of egl library on Darwin The egl library doesn't seem to work, i.e. the included demo program has undefined symbols after linking with it. svn path=/nixpkgs/trunk/; revision=21429 --- pkgs/development/libraries/mesa/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c68d2e7d552..23c12825f8e 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { md5 = "7db4617e9e10ad3aca1b64339fd71b7d"; }; - configureFlags = "--disable-gallium"; + configureFlags = "--disable-gallium" + + (if stdenv.isDarwin then " --disable-egl" else ""); buildInputs = [ pkgconfig expat x11 libdrm xlibs.glproto From 7d0cd3dbb779c2944f2a3fb0d2c6c7731a2fb123 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:57:13 +0000 Subject: [PATCH 074/342] pkgs/development/libraries/freeglut: disable building with "-Wall -Werror" on Darwin The build generates warnings on MacOS X because of unused variables, and we don't want those trivial problems to lead to a build failure. svn path=/nixpkgs/trunk/; revision=21430 --- pkgs/development/libraries/freeglut/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 19720b9d677..e1e993947a9 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6"; }; + configureFlags = "--" + (if stdenv.isDarwin then "disable" else "enable") + "-warnings"; + buildInputs = [x11 mesa]; patches = ./freeglut-gcc-4.2.patch; } From 5d6399548511089cdd286ecf992f26a009de9c42 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:57:17 +0000 Subject: [PATCH 075/342] pkgs/development/libraries/freeglut/default.nix: strip trailing white space svn path=/nixpkgs/trunk/; revision=21431 --- pkgs/development/libraries/freeglut/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index e1e993947a9..a225ca748a2 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "freeglut-2.4.0"; - + src = fetchurl { url = mirror://sourceforge/freeglut/freeglut-2.4.0.tar.gz; sha256 = "0lmhh5p19rw4wisr0jsl7nsa2hxdaasj0vxk5ri83crhp982v7r6"; From 0a87f7f7067ce258e47b050dd3a5b41e98ef81d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 14:57:23 +0000 Subject: [PATCH 076/342] pkgs/top-level/all-packages.nix: disable libdrm on Darwin platforms libdrm doesn't build on Darwin and, according to the Xorg developers, isn't supposed to be built. This change fixes the build of haskell-platform-ghc6.12.2-2010.1.0.0 on Darwin. svn path=/nixpkgs/trunk/; revision=21432 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12ad7236ce2..63ef03466fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4261,10 +4261,10 @@ let inherit fetchurl stdenv lib composableDerivation; }; - libdrm = import ../development/libraries/libdrm { + libdrm = if stdenv.isDarwin then null else (import ../development/libraries/libdrm { inherit fetchurl stdenv pkgconfig; inherit (xorg) libpthreadstubs; - }; + }); libdvdcss = import ../development/libraries/libdvdcss { inherit fetchurl stdenv; From 170b98be32db39428100e11c9ce26ff571958bbc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 15:08:28 +0000 Subject: [PATCH 077/342] pkgs/top-level/haskell-packages.nix: drop trailing white space svn path=/nixpkgs/trunk/; revision=21433 --- pkgs/top-level/haskell-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c94ee35b784..d34c0835ea8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -213,14 +213,14 @@ rec { inherit (pkgs) mesa; inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; - + GLUT = import ../development/libraries/haskell/GLUT { inherit cabal OpenGL; glut = pkgs.freeglut; inherit (pkgs) mesa; inherit (pkgs.xlibs) libSM libICE libXmu libXi; }; - + gtk2hs = import ../development/libraries/haskell/gtk2hs { inherit ghc mtl; inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo; @@ -287,7 +287,7 @@ rec { haskellSrcMeta = import ../development/libraries/haskell/haskell-src-meta { inherit cabal haskellSrcExts; }; - + haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix { inherit cabal ghc fgl haskellSrc html @@ -948,7 +948,7 @@ rec { inherit cabal gtk2hs binary parsec regexPosix regexCompat utf8String; inherit (pkgs) libedit makeWrapper; }; - + xmobar = import ../applications/misc/xmobar { inherit cabal X11 mtl parsec stm utf8String X11_xft; }; From 7d2ae46bcee071eecde9a6dcefde7990bf140f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 29 Apr 2010 17:35:05 +0000 Subject: [PATCH 078/342] Add missing binaries to the GHC wrapper. svn path=/nixpkgs/trunk/; revision=21434 --- pkgs/development/compilers/ghc/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index d14d26fc3fe..16441daaeed 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation { for prg in ghc-pkg ghc-pkg-${ghc.version}; do makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$($out/bin/ghc-get-packages.sh ${ghc.version} \"\$(dirname \$0)\" --package-conf=)" done + for prg in hp2ps hpc hasktags hsc2hs; do + test -x $ghc/bin/$prg && ln -s $ghc/bin/$prg $out/bin/$prg + done cat >> $out/bin/ghc-packages << EOF #! /bin/bash -e declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths From b3224edee31e465ee683e11a561b24f6a3ac3cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 29 Apr 2010 17:35:09 +0000 Subject: [PATCH 079/342] Updated the expression for EHC/UHC. This is not yet properly tested, but it should be an improvement over what was there before ... svn path=/nixpkgs/trunk/; revision=21435 --- pkgs/development/compilers/ehc/default.nix | 70 +++++++--------------- pkgs/top-level/haskell-packages.nix | 4 +- 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/pkgs/development/compilers/ehc/default.nix b/pkgs/development/compilers/ehc/default.nix index 3590f2ea075..cc2a6f9685c 100644 --- a/pkgs/development/compilers/ehc/default.nix +++ b/pkgs/development/compilers/ehc/default.nix @@ -1,60 +1,36 @@ -{stdenv, coreutils, fetchsvn, m4, libtool, ghc, uulib, uuagc, llvm}: +{stdenv, coreutils, glibc, fetchsvn, m4, libtool, ghc, uulib, uuagc, mtl, network, binary, llvm, fgl}: stdenv.mkDerivation (rec { - name = "ehc-svn-1042"; + revision = "1996"; + name = "ehc-svn-${revision}"; homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome/"; src = fetchsvn { - url = https://svn.cs.uu.nl:12443/repos/EHC/trunk/EHC; - rev = "1042"; - sha256 = "7a9e5d1d57825caa4664686d9a5c0d9b5ebb870095817d77bb7b97869718ed5b"; + url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC; + rev = revision; + sha256 = "92c658cd15dd513ccaeb81341f2680056276a46d053330f66c0214d10a6729e2"; }; - buildInputs = [coreutils m4 ghc libtool uulib uuagc llvm]; + propagatedBuildInputs = [mtl network binary fgl]; + buildInputs = [coreutils m4 ghc libtool uulib uuagc]; + # --force is required because the dependencies are not properly + # detected by Nix, being located in several package config files + configureFlags = [ + "--with-cabal-config-options=--ghc-pkg-options=--force" + "--with-cpp-ehc-options=-I${glibc}/include" + ]; + + # EHC builds packages during compilation; these are by default + # installed in the user-specific package config file. We do not + # want that, and hack the build process to use a temporary package + # configuration file instead. preConfigure = '' - find src -name files\*.mk -exec sed -i -- "s/--user//g" '{}' \; + p=`pwd`/ehc-local-packages + echo '[]' > $p + sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in + sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in sed -i "s|/bin/date|${coreutils}/bin/date|g" mk/dist.mk - echo "RTS_GCC_CC_OPTS := -std=gnu99" >> mk/shared.mk.in - ''; - - buildFlags = "100/ehc 100/ehclib"; - - installPhase = '' - cd bin - - # install executables - echo "installing executables..." - mkdir -p $out/bin-ehc - for i in *; do - if [[ -d $i ]]; then - cp $i/ehc $out/bin-ehc/ehc-$i - fi; - done - - # install runtime support - cp -r ../install/* $out - - # install prelude - echo "installing prelude..." - mkdir -p $out/lib-ehc - for i in *; do - if [[ -d ../build/$i/ehclib/ehcbase ]]; then - mkdir -p $out/lib-ehc/$i - cp -r ../build/$i/ehclib/ehcbase $out/lib-ehc/$i - fi; - done - - # generate wrappers - echo "generating wrappers..." - mkdir -p $out/bin - for i in *; do - if [[ -d $i ]]; then - echo '#!'"$SHELL" > $out/bin/ehc-$i - echo "exec \"$out/bin-ehc/ehc-$i\" --use-inplace=0 -P $out/lib-ehc/$i/ehcbase" '"$@"' >> $out/bin/ehc-$i - chmod 751 $out/bin/ehc-$i - fi; - done ''; meta = { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d34c0835ea8..c13b50eff5a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -843,8 +843,8 @@ rec { # Compilers. ehc = import ../development/compilers/ehc { - inherit ghc uulib uuagc; - inherit (pkgs) fetchsvn stdenv coreutils m4 libtool llvm; + inherit ghc uulib uuagc mtl network binary fgl; + inherit (pkgs) fetchsvn stdenv coreutils glibc m4 libtool llvm; }; helium = import ../development/compilers/helium { From 060714f28763d7be74cd5c39785e5d9d1e7153dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 Apr 2010 17:54:51 +0000 Subject: [PATCH 080/342] Adding mtdutils svn path=/nixpkgs/trunk/; revision=21436 --- pkgs/tools/filesystems/mtdutils/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/filesystems/mtdutils/default.nix diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix new file mode 100644 index 00000000000..521c1452e1c --- /dev/null +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchgit, libuuid, lzo, zlib, acl}: + +let + version = "v1.3.1"; +in +stdenv.mkDerivation { + name = "mtd-utils-${version}"; + + src = fetchgit { + url = git://git.infradead.org/mtd-utils.git; + rev = version; + sha256 = "0pjjs9x03bgvphqwlw99c2cpkpjsx0vkqi79vjl7fcb9pyrghgd1"; + }; + + preBuild = '' + makeFlags="DESTDIR=$out" + ''; + + buildInputs = [ libuuid lzo zlib acl ]; + + meta = { + description = "Tools for MTD filesystems"; + license = "GPLv2+"; + homepage = http://www.linux-mtd.infradead.org/; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63ef03466fe..b7c854c37ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1109,6 +1109,10 @@ let inherit fetchurl stdenv gettext; }; + mtdutils = import ../tools/filesystems/mtdutils { + inherit stdenv fetchgit libuuid lzo zlib acl; + }; + multitran = recurseIntoAttrs (let inherit fetchurl stdenv help2man; in rec { From cf5343a07d8d3af83c34dd4e8f7d1c0cd8d83956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 Apr 2010 17:55:06 +0000 Subject: [PATCH 081/342] Adding the logrotate I found in the freebsd ports. I think that is what debian, fedora and freebsd call 'logrotate'. svn path=/nixpkgs/trunk/; revision=21437 --- pkgs/tools/system/logrotate/default.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/system/logrotate/default.nix diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix new file mode 100644 index 00000000000..a9994f14b57 --- /dev/null +++ b/pkgs/tools/system/logrotate/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, gzip, popt}: + +stdenv.mkDerivation rec { + name = "logrotate-3.7.8"; + + src = fetchurl { + url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz; + sha256 = "1p9nqmznqvzn03saw3jxa8xwsdqym8jr778rwig8kk786343vai1"; + }; + + # Logrotate wants to access the 'mail' program; to be done. + patchPhase = '' + sed -i -e 's,[a-z/]\+gzip,${gzip}/bin/gzip,' \ + -e 's,[a-z/]\+gunzip,${gzip}/bin/gunzip,' config.h + ''; + + preBuild = '' + makeFlags="BASEDIR=$out" + ''; + + buildInputs = [ popt ]; + + meta = { + homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; + description = "Rotates and compresses system logs"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7c854c37ae..386c8cb0730 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1015,6 +1015,10 @@ let inherit fetchurl stdenv pkgconfig openssl libsigcxx; }; + logrotate = import ../tools/system/logrotate { + inherit fetchurl stdenv gzip popt; + }; + lout = import ../tools/typesetting/lout { inherit fetchurl stdenv ghostscript; }; From 54224374ccf459f4e54b938939a7acc8bb8040da Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 29 Apr 2010 19:09:33 +0000 Subject: [PATCH 082/342] Delete unused builder.sh svn path=/nixpkgs/trunk/; revision=21441 --- pkgs/desktops/kde-4.4/base-workspace/builder.sh | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/base-workspace/builder.sh diff --git a/pkgs/desktops/kde-4.4/base-workspace/builder.sh b/pkgs/desktops/kde-4.4/base-workspace/builder.sh deleted file mode 100644 index ace6677be52..00000000000 --- a/pkgs/desktops/kde-4.4/base-workspace/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - sed -i -e "s|\${PYTHON_SITE_PACKAGES_DIR}|$out/lib/python2.6/site-packages|" plasma/generic/scriptengines/python/CMakeLists.txt -} -patchPhase=myPatchPhase -genericBuild From f85992530fd1622a120d7b0f6bb1eaaf55de1747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 Apr 2010 21:31:35 +0000 Subject: [PATCH 083/342] Adding meta information to kdiff3 so it gets built by hydra svn path=/nixpkgs/trunk/; revision=21443 --- pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix b/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix index d53fdbaf2e6..1a313ca215b 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/kdiff3/default.nix @@ -11,4 +11,12 @@ stdenv.mkDerivation { # kdebase allows having a konqueror plugin built buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kdebase ]; + + meta = { + homepage = http://kdiff3.sourceforge.net/; + license = "GPLv2+"; + description = "Compares and merges 2 or 3 files or directories"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; } From fa2177ed5c8cb19aa8d3824ce2c4f1ceaad9ca0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 29 Apr 2010 21:32:01 +0000 Subject: [PATCH 084/342] Making filelight built by hydra (I added the platforms meta attribute) svn path=/nixpkgs/trunk/; revision=21444 --- pkgs/desktops/kde-4.4/extragear/filelight/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/kde-4.4/extragear/filelight/default.nix b/pkgs/desktops/kde-4.4/extragear/filelight/default.nix index d6f73478f73..c91fb13c862 100644 --- a/pkgs/desktops/kde-4.4/extragear/filelight/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/filelight/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { license = "GPL"; homepage = http://www.methylblue.com/filelight/; maintainers = [ lib.maintainers.viric ]; + platforms = with stdenv.lib.platforms; linux; }; } From 995a603ec98992e168b8b7605c3312665922b424 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 21:41:28 +0000 Subject: [PATCH 085/342] pkgs/top-level/release.nix: enable haskellPackages_ghc6104.haskellPlatform on Darwin I'm pretty sure that the OpenGL/Mesa errors on Darwin have been fixed. I didn't personally verify that this particular haskellPlatform version builds, though, I just built the very latest version with GHC 6.12.2, albeit successfully. If it so happens that this change reveals any further unexpected problems on MacOS X, please let me know about it. svn path=/nixpkgs/trunk/; revision=21445 --- 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 a0a33abbea4..616c6d3db2b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -417,7 +417,7 @@ with (import ./release-lib.nix); gtk2hs = linux; leksah = linux; lhs2tex = ghcSupported; - haskellPlatform = linux; /* OpenGL/mesa seems to fail on darwin */ + haskellPlatform = ghcSupported; xmonad = linux; gitit = linux; }; From 290bdb470aea05b6c239b8bdcb6c2ef7ba79353f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 21:41:33 +0000 Subject: [PATCH 086/342] pkgs/top-level/release.nix: drop trailing white space svn path=/nixpkgs/trunk/; revision=21446 --- pkgs/top-level/release.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 616c6d3db2b..31e7a8cf6c8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -4,7 +4,7 @@ /nix/var/nix/gcroots/per-user/hydra/hydra-roots --argstr \ system i686-linux --argstr system x86_64-linux --arg \ nixpkgs "{outPath = ./}" .... release.nix - + Hydra can be installed with "nix-env -i hydra". */ with (import ./release-lib.nix); @@ -38,7 +38,7 @@ with (import ./release-lib.nix); bind = linux; bison23 = all; bison24 = all; - bitlbee = linux; + bitlbee = linux; bittorrent = linux; blender = linux; boost = all; @@ -388,11 +388,11 @@ with (import ./release-lib.nix); firefox35Pkgs = { firefox = prio 150 linux; }; - + firefox36Pkgs = { firefox = linux; }; - + gnome = { gnome_panel = linux; metacity = linux; @@ -489,7 +489,7 @@ with (import ./release-lib.nix); virtualbox = linux; virtualboxGuestAdditions = linux; }; - + linuxPackages_2_6_28 = { aufs = linux; kernel = linux; @@ -543,7 +543,7 @@ with (import ./release-lib.nix); pythonPackages = { zfec = linux; }; - + xorg = { fontadobe100dpi = linux; fontadobe75dpi = linux; @@ -576,5 +576,5 @@ with (import ./release-lib.nix); xset = linux; }; -} )) +} )) From 9b48c69f85d6d49bc71f29376332e17c6c872e9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 29 Apr 2010 21:41:38 +0000 Subject: [PATCH 087/342] pkgs/top-level/release.nix: enable haskellPlatform2010100 on Darwin svn path=/nixpkgs/trunk/; revision=21447 --- pkgs/top-level/release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 31e7a8cf6c8..edb82944508 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -425,13 +425,13 @@ with (import ./release-lib.nix); haskellPackages_ghc6121 = { darcs = ghcSupported; ghc = ghcSupported; - haskellPlatform2010100 = linux; + haskellPlatform2010100 = ghcSupported; }; haskellPackages_ghc6122 = { darcs = ghcSupported; ghc = ghcSupported; - haskellPlatform2010100 = linux; + haskellPlatform2010100 = ghcSupported; }; kde3 = { From 7b6ce0f9df38d40188b36f556edec3e65ac29562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 08:33:47 +0000 Subject: [PATCH 088/342] Updating x264, and adding x264 support to mplayer and ffmpeg. svn path=/nixpkgs/trunk/; revision=21451 --- pkgs/applications/video/MPlayer/default.nix | 5 ++++- pkgs/development/libraries/ffmpeg/default.nix | 5 +++-- pkgs/development/libraries/x264/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 5 +++-- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index 6d2de592f42..c9cd1909421 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -6,6 +6,7 @@ , cdparanoia ? null, cddaSupport ? true , amrnb ? null, amrwb ? null, amrSupport ? false , jackaudioSupport ? false, jackaudio ? null +, x264Support ? false, x264 ? null , mesa, pkgconfig, unzip }: @@ -61,11 +62,13 @@ stdenv.mkDerivation { ++ stdenv.lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ stdenv.lib.optional cddaSupport cdparanoia ++ stdenv.lib.optional jackaudioSupport jackaudio - ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ]; + ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ] + ++ stdenv.lib.optional x264Support x264; configureFlags = '' ${if cacaSupport then "--enable-caca" else "--disable-caca"} ${if dvdnavSupport then "--enable-dvdnav --enable-dvdread --disable-dvdread-internal" else ""} + ${if x264Support then "--enable-x264 --extra-libs=-lx264" else ""} --codecsdir=${codecs} --enable-runtime-cpudetection --enable-x11 diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index cdb9bb887e8..1650c6141f4 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, faad2, libtheora, speex, libvorbis}: +{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig}: stdenv.mkDerivation { name = "ffmpeg-0.5.1"; @@ -22,9 +22,10 @@ stdenv.mkDerivation { --enable-libtheora --enable-libvorbis --enable-libspeex + --enable-libx264 ''; - buildInputs = [faad2 libtheora speex libvorbis]; + buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig]; meta = { homepage = http://www.ffmpeg.org/; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 636a5081c5f..606fd825d16 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,16 +1,19 @@ -args: -args.stdenv.mkDerivation rec { - version = "snapshot-20080521-2245"; +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "snapshot-20100429-2245"; name = "x264-${version}"; - src = args.fetchurl { + src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "07khxih1lmhvrzlaksqmaghbi8w2yyjrjcw867gi2y4z1h0ndhks"; + sha256 = "16b24mc63zyp4h4fqyvgzbdclnhpay4l72yfqzwnzsnlby94zwcj"; }; - configureFlags= if args.stdenv.system == "x86_64-linux" then ["--enable-pic"] else []; + patchPhase = '' + sed -i s,/bin/bash,${stdenv.bash}/bin/bash, configure version.sh + ''; - buildInputs =(with args; []); + configureFlags = [ "--disable-asm" "--enable-shared" ]; meta = { description = "library for encoding H264/AVC video streams"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 386c8cb0730..fdaf25b1c7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3645,7 +3645,7 @@ let }; ffmpeg = import ../development/libraries/ffmpeg { - inherit fetchurl stdenv faad2 libvorbis speex libtheora; + inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig; }; fftw = import ../development/libraries/fftw { @@ -7877,7 +7877,7 @@ let MPlayer = import ../applications/video/MPlayer { inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav - cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio; + cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264; inherit (xlibs) libX11 libXv libXinerama libXrandr; alsaSupport = true; alsa = alsaLib; @@ -7887,6 +7887,7 @@ let randrSupport = true; cddaSupport = true; amrSupport = getConfig [ "MPlayer" "amr" ] false; + x264Support = true; }; MPlayerPlugin = browser: From c82a9c8e104c7c49308c6fa8cab2f35878ba8364 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2010 09:21:18 +0000 Subject: [PATCH 089/342] pkgs/tools/misc/most: added version 5.0.0 Build instructions courtesy of Tim Horton . svn path=/nixpkgs/trunk/; revision=21452 --- pkgs/tools/misc/most/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/most/default.nix diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix new file mode 100644 index 00000000000..f4dc4fb184b --- /dev/null +++ b/pkgs/tools/misc/most/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, slang}: + +stdenv.mkDerivation { + name = "most-5.0.0"; + + src = fetchurl { + url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2; + sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja"; + }; + + preConfigure = '' + sed -i -e "s|-ltermcap|-ncurses|" configure + sed -i autoconf/Makefile.in src/Makefile.in \ + -e "s|/bin/cp|cp|" \ + -e "s|/bin/rm|rm|" + ''; + configureFlags = "--with-slang=${slang}"; + + buildInputs = [ slang ]; + + meta = { + description = '' + MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 + systems. Unlike other well-known paging programs most supports multiple + windows and can scroll left and right. Why settle for less? + ''; + homepage = http://www.jedsoft.org/most/index.html; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdaf25b1c7d..ddaba459333 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1007,6 +1007,10 @@ let inherit fetchurl stdenv ncurses; }; + most = import ../tools/misc/most { + inherit fetchurl stdenv slang; + }; + lftp = import ../tools/networking/lftp { inherit fetchurl stdenv readline; }; From 376895d34c16c5d67e329b4f115a6002cf62e565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 10:47:53 +0000 Subject: [PATCH 090/342] Fixing the nixpkgs tarball build: I used 'stdenv.bash', where I should use 'stdenv.shell'. svn path=/nixpkgs/trunk/; revision=21453 --- pkgs/development/libraries/x264/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 606fd825d16..e6fbb6d5cc5 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -i s,/bin/bash,${stdenv.bash}/bin/bash, configure version.sh + sed -i s,/bin/bash,${stdenv.shell}, configure version.sh ''; configureFlags = [ "--disable-asm" "--enable-shared" ]; From 5139e564fa6f0d3389fd0afe81e3e358a792e105 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2010 10:49:33 +0000 Subject: [PATCH 091/342] pkgs/applications/graphics/ImageMagick: added build input jasper for jpeg-2000 support While I was at it, I also rewrote the expression to get along without using the deprecated "args: with args;" style. svn path=/nixpkgs/trunk/; revision=21454 --- .../graphics/ImageMagick/default.nix | 41 +++++++++++++------ pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 57c236297d8..e40c0372ffe 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,8 +1,25 @@ -args: with args; +{ stdenv +, fetchurl +, bzip2 +, freetype +, graphviz +, ghostscript +, libjpeg +, libpng +, libtiff +, libxml2 +, zlib +, libtool +, jasper +, libX11 +, tetex ? null +, librsvg ? null +}: -let version = "6.5.9-1"; in - -stdenv.mkDerivation (rec { +let + version = "6.5.9-1"; +in +stdenv.mkDerivation rec { name = "ImageMagick-${version}"; src = fetchurl { @@ -13,22 +30,20 @@ stdenv.mkDerivation (rec { configureFlags = '' --with-gs-font-dir=${ghostscript}/share/ghostscript/fonts --with-gslib - ${if args ? tetex then "--with-frozenpaths" else ""} + ${if tetex != null then "--with-frozenpaths" else ""} ''; buildInputs = - [ bzip2 freetype ghostscript graphviz libjpeg libpng - libtiff libX11 libxml2 zlib libtool - ] - ++ stdenv.lib.optional (args ? tetex) args.tetex - ++ stdenv.lib.optional (args ? librsvg) args.librsvg; + [ bzip2 freetype graphviz ghostscript libjpeg libpng + libtiff libxml2 zlib tetex librsvg libtool jasper libX11 + ]; - preConfigure = if args ? tetex then + preConfigure = if tetex != null then '' - export DVIDecodeDelegate=${args.tetex}/bin/dvips + export DVIDecodeDelegate=${tetex}/bin/dvips '' else ""; meta = { homepage = http://www.imagemagick.org; }; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddaba459333..bf7c8983f90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7678,13 +7678,14 @@ let imagemagick = import ../applications/graphics/ImageMagick { inherit stdenv fetchurl bzip2 freetype graphviz ghostscript - libjpeg libpng libtiff libxml2 zlib libtool; + libjpeg libpng libtiff libxml2 zlib libtool jasper; inherit (xlibs) libX11; }; imagemagickBig = import ../applications/graphics/ImageMagick { inherit stdenv fetchurl bzip2 freetype graphviz ghostscript - libjpeg libpng libtiff libxml2 zlib tetex librsvg libtool; + libjpeg libpng libtiff libxml2 zlib tetex librsvg libtool + jasper; inherit (xlibs) libX11; }; From ccf9a368b3fa9984a5ddb81a46f7d270b616f6ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2010 10:49:39 +0000 Subject: [PATCH 092/342] pkgs/top-level/perl-packages.nix: added PerlMagick, a perl API to ImageMagick Unfortunately, the test suite had to be disabled because it assumes that ImageMagick has been built with any and all extensions, i.e. WMF support and whatnot else, and if it isn't, then the suite reports that as a failure. svn path=/nixpkgs/trunk/; revision=21455 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a296dc2dc0c..19ee6ac2bef 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1372,6 +1372,20 @@ rec { }; }; + PerlMagick = buildPerlPackage { + name = "PerlMagick-6.59"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.59.tar.gz; + sha256 = "a87999b322460f7ba964eed81f91f400fba4ba6ff88e3f9e2b216d4d8ecf638d"; + }; + buildInputs = [pkgs.imagemagick]; + preConfigure = + '' + sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick}/include/ImageMagick";|' Makefile.PL + ''; + doCheck = false; + }; + IOCompressBase = buildPerlPackage rec { name = "IO-Compress-Base-2.015"; src = fetchurl { From 06f51c6e054b6eabf553f550099a17ae2c988280 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2010 10:49:43 +0000 Subject: [PATCH 093/342] pkgs/applications/misc/ikiwiki: added build input PerlMagick Without ImageMagick support, Ikiwiki cannot handle images. svn path=/nixpkgs/trunk/; revision=21456 --- pkgs/applications/misc/ikiwiki/default.nix | 7 ++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 13aa0895cbf..6e4617eb9f7 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, gettext, makeWrapper, lib, +{ stdenv, fetchurl, perl, gettext, makeWrapper, lib, PerlMagick, TextMarkdown, URI, HTMLParser, HTMLScrubber, HTMLTemplate, TimeDate, CGISession, CGIFormBuilder, DBFile, LocaleGettext, RpcXML, XMLSimple , git ? null @@ -20,10 +20,7 @@ stdenv.mkDerivation { buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext - RpcXML XMLSimple ] - ++ - (lib.optional (monotone != null) monotone) - ; + RpcXML XMLSimple PerlMagick git monotone]; patchPhase = '' sed -i s@/usr/bin/perl@${perl}/bin/perl@ pm_filter mdwn2man diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf7c8983f90..993023fea17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7670,7 +7670,7 @@ let inherit fetchurl stdenv perl gettext makeWrapper lib; inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple; + RpcXML XMLSimple PerlMagick; git = if getPkgConfig "ikiwiki" "git" true then git else null; monotone = if getPkgConfig "ikiwiki" "monotone" false then monotone else null; extraUtils = []; From 2cd7033243234ddd34138aeb104d4c2b967a8d9f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2010 12:23:26 +0000 Subject: [PATCH 094/342] pkgs/tools/text/source-highlight: added GNU source highlight version 3.1.3 svn path=/nixpkgs/trunk/; revision=21457 --- pkgs/tools/text/source-highlight/default.nix | 33 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/text/source-highlight/default.nix diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix new file mode 100644 index 00000000000..35dc7a8a8e6 --- /dev/null +++ b/pkgs/tools/text/source-highlight/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, boost }: + +let + name = "source-highlight"; + version = "3.1.3"; +in +stdenv.mkDerivation { + name = "${name}-${version}"; + + src = fetchurl { + url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; + sha256 = "2d819f2ffdc8bb23a87635bdfbc51545db22605a8e544f66f86054b8075af0b5"; + }; + + buildInputs = [boost]; + doCheck = false; # The test suite fails with a trivial + # error, so I'll disable it for now. + # Whoever bumps this build to the next + # version, please re-enable it though! + + meta = { + description = "render source code with syntax highlighting"; + homepage = "http://www.gnu.org/software/src-highlite/"; + license = "GPLv3+"; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + longDescription = + '' + GNU Source-highlight, given a source file, produces a document + with syntax highlighting. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 993023fea17..719d7d539d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1594,6 +1594,10 @@ let inherit fetchurl stdenv openssl; }; + sourceHighlight = import ../tools/text/source-highlight { + inherit fetchurl stdenv boost; + }; + socat2pre = builderDefsPackage ../tools/networking/socat/2.0.0-b3.nix { inherit fetchurl stdenv openssl; }; From a386398be634ea0fe351ca0ac17c5452bcd769f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 13:12:07 +0000 Subject: [PATCH 095/342] Adding kdenlive, and as a side effect, mlt. Kdenlive looks for some binaries in PATH, so some dependencies may be fulfilled not by kdenlive nix expression. svn path=/nixpkgs/trunk/; revision=21458 --- pkgs/desktops/kde-4.4/default.nix | 6 +++++ .../kde-4.4/extragear/kdenlive/default.nix | 21 ++++++++++++++++++ pkgs/development/libraries/mlt/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 4 files changed, 54 insertions(+) create mode 100644 pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix create mode 100644 pkgs/development/libraries/mlt/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 868887b3123..d74770355e7 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -231,6 +231,12 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon qimageblitz; }; + kdenlive = import ./extragear/kdenlive { + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl mlt gettext shared_mime_info; + inherit kdelibs soprano; + inherit automoc4 phonon; + }; + kdesvn = import ./extragear/kdesvn { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4; inherit kdelibs; diff --git a/pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix b/pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix new file mode 100644 index 00000000000..8af0db2fcc8 --- /dev/null +++ b/pkgs/desktops/kde-4.4/extragear/kdenlive/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon, mlt, gettext, +shared_mime_info, soprano}: + +stdenv.mkDerivation { + name = "kdenlive-0.7.7.1"; + src = fetchurl { + url = mirror://sourceforge/kdenlive/kdenlive-0.7.7.1.tar.gz; + sha256 = "047kpzfdmipgnnkbdhcpy5c0kqgpg7yn3qhyd7inlplmyd3i1pfx"; + }; + + buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext + shared_mime_info soprano ]; + + meta = { + description = "Free and open source video editor"; + license = "GPLv2+"; + homepage = http://www.kdenlive.org/; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix new file mode 100644 index 00000000000..516da30e2b6 --- /dev/null +++ b/pkgs/development/libraries/mlt/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv}: + +stdenv.mkDerivation { + name = "mlt-0.5.4"; + + src = fetchurl { + url = mirror://sourceforge/mlt/mlt-0.5.4.tar.gz; + sha256 = "12s5znbm6q45r33ymyw1bak3d41xhh72gh9i1pdsgvddr0pizshj"; + }; + + buildInputs = [ qt SDL ffmpeg libdv ]; + + # Mostly taken from: + # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine + configureFlags = [ "--enable-gpl" "--avformat-swscale" ]; + + meta = { + homepage = http://www.mltframework.org/; + description = "Open source multimedia framework, designed for television broadcasting"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 719d7d539d7..2d30ede8407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4735,6 +4735,11 @@ let inherit fetchurl stdenv flex bison freetype zlib libpng perl; }; + mlt = import ../development/libraries/mlt { + inherit fetchurl stdenv pkgconfig SDL ffmpeg libdv; + qt = qt4; + }; + mpeg2dec = import ../development/libraries/mpeg2dec { inherit fetchurl stdenv; }; From 32b7ecf0d98ec271cb86152d4019c460b48e9713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 13:12:12 +0000 Subject: [PATCH 096/342] Adding more dependencies to mlt (for more features) svn path=/nixpkgs/trunk/; revision=21459 --- pkgs/development/libraries/mlt/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 516da30e2b6..53ce0ed847e 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv}: +{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate, +libvorbis, sox}: stdenv.mkDerivation { name = "mlt-0.5.4"; @@ -8,7 +9,7 @@ stdenv.mkDerivation { sha256 = "12s5znbm6q45r33ymyw1bak3d41xhh72gh9i1pdsgvddr0pizshj"; }; - buildInputs = [ qt SDL ffmpeg libdv ]; + buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d30ede8407..6b1b779eda5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4736,7 +4736,8 @@ let }; mlt = import ../development/libraries/mlt { - inherit fetchurl stdenv pkgconfig SDL ffmpeg libdv; + inherit fetchurl stdenv pkgconfig SDL ffmpeg libdv libxml2 libsamplerate + libvorbis sox; qt = qt4; }; From d4221fa80a4976dea64eec42c0abb6b44d2c9304 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2010 16:05:55 +0000 Subject: [PATCH 097/342] pkgs/tools/misc/most/default.nix: cosmetic changes svn path=/nixpkgs/trunk/; revision=21460 --- pkgs/tools/misc/most/default.nix | 44 ++++++++++++++++---------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index f4dc4fb184b..8b1b9bdf39a 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -1,29 +1,29 @@ {stdenv, fetchurl, slang}: stdenv.mkDerivation { - name = "most-5.0.0"; + name = "most-5.0.0"; - src = fetchurl { - url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2; - sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja"; - }; + src = fetchurl { + url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2; + sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja"; + }; - preConfigure = '' - sed -i -e "s|-ltermcap|-ncurses|" configure - sed -i autoconf/Makefile.in src/Makefile.in \ - -e "s|/bin/cp|cp|" \ - -e "s|/bin/rm|rm|" + preConfigure = '' + sed -i -e "s|-ltermcap|-ncurses|" configure + sed -i autoconf/Makefile.in src/Makefile.in \ + -e "s|/bin/cp|cp|" \ + -e "s|/bin/rm|rm|" + ''; + configureFlags = "--with-slang=${slang}"; + + buildInputs = [ slang ]; + + meta = { + description = '' + MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 + systems. Unlike other well-known paging programs most supports multiple + windows and can scroll left and right. Why settle for less? ''; - configureFlags = "--with-slang=${slang}"; - - buildInputs = [ slang ]; - - meta = { - description = '' - MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 - systems. Unlike other well-known paging programs most supports multiple - windows and can scroll left and right. Why settle for less? - ''; - homepage = http://www.jedsoft.org/most/index.html; - }; + homepage = http://www.jedsoft.org/most/index.html; + }; } From 52884c145f6daa4255b0d994e4f73ce943799fd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 30 Apr 2010 16:06:01 +0000 Subject: [PATCH 098/342] pkgs/tools/misc/most/default.nix: added license tag (GPLv2) svn path=/nixpkgs/trunk/; revision=21461 --- pkgs/tools/misc/most/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index 8b1b9bdf39a..52e1fb22fed 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { windows and can scroll left and right. Why settle for less? ''; homepage = http://www.jedsoft.org/most/index.html; + license = "GPLv2"; }; } From fa6c22b5c62a8569bdff5a11f11d207d03ffa045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 19:12:59 +0000 Subject: [PATCH 099/342] Adding the expressions for gcc 4.5 for cross building. Although I still have set gcc 4.4 for that, I tested with the 4.5 expression and it cross built perfectly bison for the sheevaplug. svn path=/nixpkgs/trunk/; revision=21463 --- pkgs/development/compilers/gcc-4.5/default.nix | 2 +- pkgs/top-level/all-packages.nix | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index a70de4f4e50..20cd848ded4 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -81,7 +81,7 @@ let version = "4.5.0"; " --disable-libmudflap " + " --disable-libgomp " + " --disable-shared" + - " --disable-decimal-float" # libdecnumber requires libc + " --disable-decimal-float" + # libdecnumber requires libc " --disable-multilib" else " --with-headers=${libcCross}/include" + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1b779eda5..bfbdf8b6599 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2043,9 +2043,23 @@ let cross = assert crossSystem != null; crossSystem; }); + gcc45_realCross = lib.addMetaAttrs { platforms = []; } + (makeOverridable (import ../development/compilers/gcc-4.5) { + inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib + ppl cloogppl gettext which noSysDirs; + binutilsCross = binutilsCross; + libcCross = libcCross; + profiledCompiler = false; + enableMultilib = false; + crossStageStatic = false; + cross = assert crossSystem != null; crossSystem; + }); + + gcc_realCross = gcc44_realCross; + gccCrossStageStatic = wrapGCCCross { gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( - gcc44_realCross.override { + gcc_realCross.override { crossStageStatic = true; langCC = false; libcCross = null; @@ -2057,7 +2071,7 @@ let }; gccCrossStageFinal = wrapGCCCross { - gcc = forceBuildDrv gcc44_realCross; + gcc = forceBuildDrv gcc_realCross; libc = libcCross; binutils = binutilsCross; cross = assert crossSystem != null; crossSystem; From 8137966874b99a4bf16b548dd99ea0fabfd738ec Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 30 Apr 2010 20:39:54 +0000 Subject: [PATCH 100/342] Upgrade samba Also add symlink for CUPS svn path=/nixpkgs/trunk/; revision=21464 --- pkgs/servers/samba/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 5f8ba337eab..faae21bd8a2 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -14,21 +14,22 @@ }: stdenv.mkDerivation rec { - name = "samba-3.3.3"; + name = "samba-3.5.2"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; + sha256 = "0pi946lyn57larvada77pkal48hc0rn07bjxpg2ahz0c389cknl2"; }; buildInputs = [readline pam openldap popt iniparser libunwind fam acl] ++ stdenv.lib.optional useKerberos kerberos; - preConfigure = "cd source"; + preConfigure = "cd source3"; - postInstall = if configDir == "" - then "touch $out/lib/smb.conf" - else ""; + postInstall = '' + mkdir -pv $out/lib/cups/backend + ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb + '' + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; # Don't pass --with-private-dir=/var/samba/private From 4ba1c06c894953562e4542a702f90568d8c6c8d7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 30 Apr 2010 20:40:11 +0000 Subject: [PATCH 101/342] Support nepomuk and marble in digikam. Also stop passing lib. svn path=/nixpkgs/trunk/; revision=21465 --- pkgs/desktops/kde-4.4/default.nix | 6 +++--- pkgs/desktops/kde-4.4/extragear/digikam/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index d74770355e7..b920dceb511 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -220,9 +220,9 @@ pkgs.recurseIntoAttrs (rec { }; digikam = import ./extragear/digikam { - inherit (pkgs) stdenv fetchurl lib cmake qt4 lcms jasper libgphoto2 gettext; - inherit kdelibs kdepimlibs kdegraphics; - inherit automoc4 phonon qimageblitz qca2 eigen; + inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext; + inherit kdelibs kdepimlibs kdegraphics kdeedu; + inherit automoc4 phonon qimageblitz qca2 eigen soprano; }; filelight = import ./extragear/filelight { diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix index e1d2f2864c6..29e6d38c0b9 100644 --- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, lib, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext}: +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu }: stdenv.mkDerivation rec { name = "digikam-1.2.0"; @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext ]; + lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu ]; cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; meta = { description = "Photo Management Program"; license = "GPL"; homepage = http://www.digikam.org; - maintainers = [ lib.maintainers.viric ]; - platforms = with lib.platforms; linux; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; }; } From cc0b0b1c691b0fce68977a1296275e6bd7687a0b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 30 Apr 2010 20:40:33 +0000 Subject: [PATCH 102/342] Add openssl1 back (but don't remove 0.9.8n) svn path=/nixpkgs/trunk/; revision=21466 --- pkgs/development/libraries/openssl/1.x.nix | 45 +++++++++++++++++++ .../libraries/openssl/darwin-arch-1.patch | 16 +++++++ pkgs/top-level/all-packages.nix | 5 +++ 3 files changed, 66 insertions(+) create mode 100644 pkgs/development/libraries/openssl/1.x.nix create mode 100644 pkgs/development/libraries/openssl/darwin-arch-1.patch diff --git a/pkgs/development/libraries/openssl/1.x.nix b/pkgs/development/libraries/openssl/1.x.nix new file mode 100644 index 00000000000..eae32de30e4 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.x.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, perl }: + +let + opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] + (throw "openssl needs its platform name cross building" null) + stdenv.cross; +in + +stdenv.mkDerivation (rec { + name = "openssl-1.0.0"; + + src = fetchurl { + url = "http://www.openssl.org/source/${name}.tar.gz"; + sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; + }; + + buildNativeInputs = [ perl ]; + + configureScript = "./config"; + + configureFlags="--libdir=lib shared"; + + crossAttrs = { + preConfigure='' + export cross=$crossSystem- + ''; + configureFlags="--libdir=lib ${opensslCrossSystem} shared"; + buildPhase = '' + make CC=$crossConfig-gcc \ + AR="$crossConfig-ar r" \ + RANLIB=$crossConfig-ranlib + ''; + }; + + meta = { + homepage = http://www.openssl.org/; + description = "A cryptographic library that implements the SSL and TLS protocols"; + }; +} +// +(if stdenv.isDarwin then { + patches = ./darwin-arch.patch; +} +else { }) +) diff --git a/pkgs/development/libraries/openssl/darwin-arch-1.patch b/pkgs/development/libraries/openssl/darwin-arch-1.patch new file mode 100644 index 00000000000..ad8e86c6791 --- /dev/null +++ b/pkgs/development/libraries/openssl/darwin-arch-1.patch @@ -0,0 +1,16 @@ +The patch is specific to nix: MacOS gcc supports -arch. +--- a/Configure ++++ b/Configure +@@ -549,9 +549,9 @@ my %table=( + "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", + "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + + ##### A/UX diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfbdf8b6599..9cb910b1cc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4892,6 +4892,11 @@ let inherit stdenv perl; }; + openssl1 = makeOverridable (import ../development/libraries/openssl/1.x.nix) { + fetchurl = fetchurlBoot; + inherit stdenv perl; + }; + ortp = import ../development/libraries/ortp { inherit fetchurl stdenv; }; From 404c314412f460ed6698361f066cdd0cf16c2dc3 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 30 Apr 2010 20:40:42 +0000 Subject: [PATCH 103/342] Add support for restricted downloads svn path=/nixpkgs/trunk/; revision=21467 --- pkgs/build-support/fetchurl/default.nix | 64 +++++++++++++++++-------- pkgs/stdenv/linux/default.nix | 1 + pkgs/stdenv/native/default.nix | 1 + pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 1ba9124027d..baa6c65b9d4 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,4 @@ -{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv. +{stdenv, curl, writeScript}: # Note that `curl' may be `null', in case of the native stdenv. let @@ -23,7 +23,7 @@ let else [] /* backwards compatibility */; in - + { # URL to fetch. url ? "" @@ -45,6 +45,12 @@ in , # If set, don't download the file, but write a list of all possible # URLs (resulting from resolving mirror:// URLs) to $out. showURLs ? false + +, # If set, down't download file but tell user how to download it. + restricted ? false + +, # Used only if restricted. Should contain instructions how to fetch the file. + message ? "" }: assert urls != [] -> url == ""; @@ -56,34 +62,51 @@ assert showURLs || (outputHash != "" && outputHashAlgo != "") let urls_ = if urls != [] then urls else [url]; - -in - -stdenv.mkDerivation { - name = - if showURLs then "urls" + name_ = if showURLs then "urls" else if name != "" then name else baseNameOf (toString (builtins.head urls_)); - + hashAlgo_ = if outputHashAlgo != "" then outputHashAlgo else + if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + hash_ = if outputHash != "" then outputHash else + if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; +in + +stdenv.mkDerivation ({ + name = name_; + outputHashAlgo = hashAlgo_; + outputHash = hash_; + urls = urls_; + + # Compatibility with Nix <= 0.7. + id = md5; + + inherit showURLs mirrorsFile; +} +// (if (!showURLs && restricted) then rec { + builder = writeScript "restrict-message" '' +source ${stdenv}/setup +cat <<_EOF_ +${message_} +_EOF_ + ''; + message_ = if message != "" then message else '' + You have to download ${name_} from ${stdenv.lib.concatStringsSep " " urls_} yourself, + and add it to the store using "nix-store --add-fixed ${hashAlgo_} ${name_}". + ''; +} +else { builder = ./builder.sh; - + buildInputs = [curl]; - urls = urls_; # If set, prefer the content-addressable mirrors # (http://nixos.org/tarballs) over the original URLs. preferHashedMirrors = true; - # Compatibility with Nix <= 0.7. - id = md5; # New-style output content requirements. - outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; - outputHash = if outputHash != "" then outputHash else - if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - + impureEnvVars = [ # We borrow these environment variables from the caller to allow # easy proxy configuration. This is impure, but a fixed-output @@ -95,6 +118,5 @@ stdenv.mkDerivation { # command-line. "NIX_HASHED_MIRRORS" ] ++ (map (site: "NIX_MIRRORS_${site}") sites); - - inherit showURLs mirrorsFile; -} +}) +) \ No newline at end of file diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index dd5647bec45..08a4772d18a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -104,6 +104,7 @@ rec { fetchurl = import ../../build-support/fetchurl { stdenv = stdenvLinuxBoot0; curl = bootstrapTools; + inherit (allPackages) writeScript; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 1f2117ebba0..719132488df 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -119,6 +119,7 @@ rec { stdenv = stdenvBoot0; # Curl should be in /usr/bin or so. curl = null; + inherit (allPackages) writeScript; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cb910b1cc9..1a2a9d8a6d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -271,8 +271,7 @@ let # from being built. fetchurl = useFromStdenv "fetchurl" (import ../build-support/fetchurl { - curl = curl; - stdenv = stdenv; + inherit stdenv curl writeScript; }); # fetchurlBoot is used for curl and its dependencies in order to From fe7945b7fb234a30317233758747a47507b0be73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 21:46:55 +0000 Subject: [PATCH 104/342] Adding rtmpdump svn path=/nixpkgs/trunk/; revision=21468 --- pkgs/tools/video/rtmpdump/default.nix | 28 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/video/rtmpdump/default.nix diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix new file mode 100644 index 00000000000..3f79e57592f --- /dev/null +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, zlib, gnutls}: + +stdenv.mkDerivation { + name = "rtmpdump-2.2d"; + src = fetchurl { + url = http://rtmpdump.mplayerhq.hu/download/rtmpdump-2.2d.tgz; + sha256 = "0w2cr3mgp4dcabmr7d7pnsn8f2r1zvar553vfavnzqv61gnhyrm5"; + }; + + buildInputs = [ zlib gnutls ]; + + makeFlags = "CRYPTO=GNUTLS posix"; + + installPhase = '' + ensureDir $out/bin $out/share/man/man{1,8} + cp rtmpdump rtmpsrv rtmpsuck rtmpgw $out/bin + cp *.1 $out/share/man/man1 + cp *.8 $out/share/man/man8 + ''; + + meta = { + homepage = http://rtmpdump.mplayerhq.hu/; + description = "Toolkit for RTMP streams"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a2a9d8a6d7..ba372ed4299 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1465,6 +1465,10 @@ let qt = qt4; }; + rtmpdump = import ../tools/video/rtmpdump { + inherit fetchurl stdenv zlib gnutls; + }; + reiser4progs = import ../tools/filesystems/reiser4progs { inherit fetchurl stdenv libaal; }; From b3870f014843733ea832d10b0c7aa43912fe783b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 21:47:09 +0000 Subject: [PATCH 105/342] Adding xvid, to ffmpeg and mplayer. svn path=/nixpkgs/trunk/; revision=21469 --- pkgs/applications/video/MPlayer/default.nix | 4 +++- pkgs/development/libraries/ffmpeg/default.nix | 5 +++-- .../libraries/xvidcore/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 ++++++-- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/xvidcore/default.nix diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index c9cd1909421..c93959f93d0 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -7,6 +7,7 @@ , amrnb ? null, amrwb ? null, amrSupport ? false , jackaudioSupport ? false, jackaudio ? null , x264Support ? false, x264 ? null +, xvidSupport ? false, xvidcore ? null , mesa, pkgconfig, unzip }: @@ -63,7 +64,8 @@ stdenv.mkDerivation { ++ stdenv.lib.optional cddaSupport cdparanoia ++ stdenv.lib.optional jackaudioSupport jackaudio ++ stdenv.lib.optionals amrSupport [ amrnb amrwb ] - ++ stdenv.lib.optional x264Support x264; + ++ stdenv.lib.optional x264Support x264 + ++ stdenv.lib.optional xvidSupport xvidcore; configureFlags = '' ${if cacaSupport then "--enable-caca" else "--disable-caca"} diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 1650c6141f4..70f7feaaf1a 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig}: +{stdenv, fetchurl, faad2, libtheora, speex, libvorbis, x264, pkgconfig, xvidcore}: stdenv.mkDerivation { name = "ffmpeg-0.5.1"; @@ -23,9 +23,10 @@ stdenv.mkDerivation { --enable-libvorbis --enable-libspeex --enable-libx264 + --enable-libxvid ''; - buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig]; + buildInputs = [faad2 libtheora speex libvorbis x264 pkgconfig xvidcore]; meta = { homepage = http://www.ffmpeg.org/; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix new file mode 100644 index 00000000000..b02ae2b14e9 --- /dev/null +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "xvidcore-1.2.2"; + + src = fetchurl { + url = http://downloads.xvid.org/downloads/xvidcore-1.2.2.tar.bz2; + sha256 = "04bd1clv90i5pdwh6mz3mskyzmxyx5l2nx7lyyb8nhw9whnn0ap4"; + }; + + preConfigure = '' + cd build/generic + ''; + + meta = { + description = "MPEG-4 video codec for PC"; + homepage = http://www.xvid.org/; + license = "GPLv2+"; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba372ed4299..fa0f47f370c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3670,7 +3670,7 @@ let }; ffmpeg = import ../development/libraries/ffmpeg { - inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig; + inherit fetchurl stdenv faad2 libvorbis speex libtheora x264 pkgconfig xvidcore; }; fftw = import ../development/libraries/fftw { @@ -5247,6 +5247,10 @@ let ]; }; + xvidcore = import ../development/libraries/xvidcore { + inherit fetchurl stdenv; + }; + zangband = builderDefsPackage (import ../games/zangband) { inherit ncurses flex bison autoconf automake m4 coreutils; }; @@ -7914,7 +7918,7 @@ let MPlayer = import ../applications/video/MPlayer { inherit fetchurl stdenv freetype fontconfig x11 zlib libtheora libcaca libdvdnav - cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264; + cdparanoia mesa pkgconfig unzip amrnb amrwb jackaudio x264 xvidcore; inherit (xlibs) libX11 libXv libXinerama libXrandr; alsaSupport = true; alsa = alsaLib; @@ -7925,6 +7929,7 @@ let cddaSupport = true; amrSupport = getConfig [ "MPlayer" "amr" ] false; x264Support = true; + xvidSupport = true; }; MPlayerPlugin = browser: From 1215f3a7a439616a5202e4750e4840a33e4d4341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 21:58:47 +0000 Subject: [PATCH 106/342] Adding yasm, and making x264 and xvid codecs be compiled with their assembly code svn path=/nixpkgs/trunk/; revision=21470 --- pkgs/development/compilers/yasm/default.nix | 16 ++++++++++++++++ pkgs/development/libraries/x264/default.nix | 6 ++++-- pkgs/development/libraries/xvidcore/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 7 +++++-- 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/compilers/yasm/default.nix diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix new file mode 100644 index 00000000000..c0da5951517 --- /dev/null +++ b/pkgs/development/compilers/yasm/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "yasm-2.05.01"; + + src = fetchurl { + url = http://www.tortall.net/projects/yasm/releases/yasm-1.0.0.tar.gz; + sha256 = "0nd95r9y5r3p9mvdyj1yhvlz9zjw0id1g470c7i1p3p0x0n6zc06"; + }; + + meta = { + homepage = http://www.tortall.net/projects/yasm/; + description = "Complete rewrite of the NASM assembler"; + license = "BSD"; + }; +} diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index e6fbb6d5cc5..6928f9f6df4 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{stdenv, fetchurl, yasm}: stdenv.mkDerivation rec { version = "snapshot-20100429-2245"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sed -i s,/bin/bash,${stdenv.shell}, configure version.sh ''; - configureFlags = [ "--disable-asm" "--enable-shared" ]; + configureFlags = [ "--enable-shared" ]; + + buildInputs = [ yasm ]; meta = { description = "library for encoding H264/AVC video streams"; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index b02ae2b14e9..7276402cbf5 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, nasm}: stdenv.mkDerivation rec { name = "xvidcore-1.2.2"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { preConfigure = '' cd build/generic ''; + + buildInputs = [ nasm ]; meta = { description = "MPEG-4 video codec for PC"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa0f47f370c..1b16caf967e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2604,6 +2604,9 @@ let inherit fetchurl stdenv; }; + yasm = import ../development/compilers/yasm { + inherit fetchurl stdenv; + }; ### DEVELOPMENT / INTERPRETERS @@ -5202,7 +5205,7 @@ let }; x264 = import ../development/libraries/x264 { - inherit fetchurl stdenv; + inherit fetchurl stdenv yasm; }; xapian = makeOverridable (import ../development/libraries/xapian) { @@ -5248,7 +5251,7 @@ let }; xvidcore = import ../development/libraries/xvidcore { - inherit fetchurl stdenv; + inherit fetchurl stdenv nasm; }; zangband = builderDefsPackage (import ../games/zangband) { From 1ae5a63425ce8b48936877d56d89426a8a6c01dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 30 Apr 2010 22:25:25 +0000 Subject: [PATCH 107/342] Fixing the yasm 'name' svn path=/nixpkgs/trunk/; revision=21471 --- pkgs/development/compilers/yasm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index c0da5951517..19431de1477 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "yasm-2.05.01"; + name = "yasm-1.0.0"; src = fetchurl { url = http://www.tortall.net/projects/yasm/releases/yasm-1.0.0.tar.gz; From c43dbd671e8a30062f37f2a229c63bb4dbbd8fb9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 1 May 2010 07:07:25 +0000 Subject: [PATCH 108/342] Migrate wtk to new "restricted downloads" feature of fetchurl svn path=/nixpkgs/trunk/; revision=21472 --- pkgs/development/libraries/wtk/builder.sh | 17 +---------------- pkgs/development/libraries/wtk/default.nix | 10 +++++++--- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index bf65b96c7ca..5ccfc1a7391 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,23 +1,8 @@ source $stdenv/setup -if ! test -e "$pathname"; then - echo "" - echo "SORRY!" - echo "You should download \`$(basename $pathname)' from Sun and place it in $(dirname $pathname)." - echo "Blame Sun, not us." - echo "" - exit 1 -fi - -actual=$(md5sum -b $pathname | cut -c1-32) -if test "$actual" != "$md5"; then - echo "hash is $actual, expected $md5" - exit 1 -fi - mkdir unzipped pushd unzipped -unzip $pathname || true +unzip $src || true popd ensureDir $out diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 123d0a9216a..99e8613c6cb 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -2,11 +2,15 @@ assert stdenv.system == "i686-linux"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "sun-java-wtk-2.5.2_01"; - pathname = "/tmp/sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh"; - md5 = "6b70b6e6d426eac121db8a087991589f"; + src = fetchurl { + url = meta.homepage; + name = "sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh"; + restricted = true; + md5 = "6b70b6e6d426eac121db8a087991589f"; + }; builder = ./builder.sh; From bf926196812a8a2d0c09e700705a4864ecd18bd8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 1 May 2010 07:07:31 +0000 Subject: [PATCH 109/342] Upgrade virtuoso to 6.1.1 svn path=/nixpkgs/trunk/; revision=21473 --- pkgs/servers/sql/virtuoso/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index 6730ce26fcd..5c94f375d4f 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, openssl, readline }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.0"; + name = "virtuoso-opensource-6.1.1"; src = fetchurl { url = "mirror://sf/virtuoso/${name}.tar.gz"; - sha256 = "1kwsb4j7k1a4mnbpjzn4hpg3bwx0bjndan5x8ffpagk5ardqi5b4"; + sha256 = "1sd70j9i26ml16lig9r9lmrdf5q0kybq71r6vzzzc5v5jxjz0l7w"; }; buildInputs = [ libxml2 openssl readline ]; @@ -24,4 +24,10 @@ stdenv.mkDerivation rec { mv $out/share/virtuoso/doc $out/share/doc/${name} find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete ''; + + meta = with stdenv.lib; { + homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; + platforms = platforms.all; + maintainers = [ maintainers.urkud ]; + }; } From 3e1e56e10c7d8c8bc45ba3e83b6e0086e8b1099c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 1 May 2010 07:07:36 +0000 Subject: [PATCH 110/342] fetchurl restricted: list nix-prefetch-url as well svn path=/nixpkgs/trunk/; revision=21474 --- pkgs/build-support/fetchurl/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index baa6c65b9d4..1ee4946c856 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -91,7 +91,11 @@ _EOF_ ''; message_ = if message != "" then message else '' You have to download ${name_} from ${stdenv.lib.concatStringsSep " " urls_} yourself, - and add it to the store using "nix-store --add-fixed ${hashAlgo_} ${name_}". + and add it to the store using either + nix-store --add-fixed ${hashAlgo_} ${name_} + or + ${if hashAlgo_ != "sha256" then "NIX_HASH_ALGO=${hashAlgo_} " else + ""}nix-prefetch-url file://path/to/${name_} ''; } else { @@ -119,4 +123,4 @@ else { "NIX_HASHED_MIRRORS" ] ++ (map (site: "NIX_MIRRORS_${site}") sites); }) -) \ No newline at end of file +) From 0b11f22f49e1e9b05a9ed357e55b6a892a40ad8e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 1 May 2010 07:41:40 +0000 Subject: [PATCH 111/342] Trying to fix virtuoso build on freebsd svn path=/nixpkgs/trunk/; revision=21475 --- pkgs/servers/sql/virtuoso/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index 5c94f375d4f..346b63bafe5 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libxml2, openssl, readline }: +{ stdenv, fetchurl, libxml2, openssl, readline, gawk }: + +assert stdenv ? gawk || gawk != null; stdenv.mkDerivation rec { name = "virtuoso-opensource-6.1.1"; @@ -8,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sd70j9i26ml16lig9r9lmrdf5q0kybq71r6vzzzc5v5jxjz0l7w"; }; - buildInputs = [ libxml2 openssl readline ]; + buildInputs = [ libxml2 openssl readline ] + ++ stdenv.lib.optional (! stdenv ? gawk) gawk; CPP="${stdenv.gcc}/bin/gcc -E"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b16caf967e..17cdbd9352a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5758,7 +5758,7 @@ let }; virtuoso = makeOverridable (import ../servers/sql/virtuoso) { - inherit stdenv fetchurl libxml2 openssl readline; + inherit stdenv fetchurl libxml2 openssl readline gawk; }; vsftpd = import ../servers/ftp/vsftpd { From b14e71be039d573b706cee88bee9366144261c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 May 2010 10:33:00 +0000 Subject: [PATCH 112/342] Updating irssi svn path=/nixpkgs/trunk/; revision=21476 --- pkgs/applications/networking/irc/irssi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 9e3fc40b705..7e3b27cec1f 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, ncurses, glib, openssl}: stdenv.mkDerivation rec { - name = "irssi-0.8.14"; + name = "irssi-0.8.15"; src = fetchurl { url = "http://irssi.org/files/${name}.tar.bz2"; - sha256 = "0a6zizpqb4yyk7c9sxvqcj8jx20qrnfr2kwqbsckryz63kmp1sk3"; + sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1"; }; buildInputs = [pkgconfig ncurses glib openssl]; From 103f51c4da15a7b69b642b414778b9b2276bdc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 May 2010 10:55:05 +0000 Subject: [PATCH 113/342] Making the latest haskell expressions appear on 'nix-env -qa'. More than one person had trouble not finding ghc 6.12 on 'nix-env -qa '*'' svn path=/nixpkgs/trunk/; revision=21477 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17cdbd9352a..2ccbd091bbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2305,23 +2305,23 @@ let */ # Helper functions to abstract away from repetitive instantiations. - haskellPackagesFun610 = ghcPath : profDefault : import ./haskell-packages.nix { + haskellPackagesFun610 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; ghc = import ghcPath { inherit fetchurl stdenv perl ncurses gmp libedit; ghc = ghc6101Binary; }; - }; + }); - haskellPackagesFun612 = ghcPath : profDefault : import ./haskell-packages.nix { + haskellPackagesFun612 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault; ghc = import ghcPath { inherit fetchurl stdenv perl ncurses gmp; ghc = ghc6101Binary; }; - }; + }); # Currently active GHC versions. haskellPackages_ghc6101 = From 3c6f04e08e2730fad71e5dab1638b2803e5c8253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sat, 1 May 2010 11:23:39 +0000 Subject: [PATCH 114/342] Commented on the current decision on recurseIntoAttrs for haskellPackages. svn path=/nixpkgs/trunk/; revision=21478 --- pkgs/top-level/all-packages.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ccbd091bbe..cc590533b64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2304,6 +2304,12 @@ let }); */ + # NOTE: After discussion, we decided to enable recurseIntoAttrs for all + # currently available ghc versions. (Before, it used to be enabled only + # for a selected few versions.) If someone complains about nix-env -qa + # output being spammed by lots of Haskell packages, we can talk about + # reducing the number or "enabled" versions again. + # Helper functions to abstract away from repetitive instantiations. haskellPackagesFun610 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix { inherit pkgs; @@ -2333,8 +2339,9 @@ let haskellPackages_ghc6103 = haskellPackagesFun610 ../development/compilers/ghc/6.10.3.nix false; - haskellPackages_ghc6104 = recurseIntoAttrs - (haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false); + # Current default version. + haskellPackages_ghc6104 = + haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false; # We will soon switch to either ghc-6.12.1 or ghc-6.12.2 as default. haskellPackages_ghc6121 = lowPrio From 357e3ce1081bc273d6260279d56229e9e25f583e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 1 May 2010 20:54:27 +0000 Subject: [PATCH 115/342] Breaking a dependency of zefc on ghc. Trying to get tahoelafs built on armv5tel-linux svn path=/nixpkgs/trunk/; revision=21550 --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16a6544f3ff..1c8703e6364 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -606,7 +606,8 @@ rec { sha256 = "0jg9q9mhsky444mm7lpmmlxai8hmjg4pc71viv4kni8gls0gk9n8"; }; - propagatedBuildInputs = [ pkgs.darcs ]; + # In order to break the dependency on darcs -> ghc, we don't add + # darcs as a propagated build input. meta = { description = "setuptools plugin for the Darcs version control system"; From 82987383642fb070ba82b15191096410f575d896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 May 2010 09:27:32 +0000 Subject: [PATCH 116/342] Add GNU Parallel. svn path=/nixpkgs/trunk/; revision=21552 --- pkgs/tools/misc/parallel/default.nix | 46 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/misc/parallel/default.nix diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix new file mode 100644 index 00000000000..2526606adc2 --- /dev/null +++ b/pkgs/tools/misc/parallel/default.nix @@ -0,0 +1,46 @@ +{ fetchurl, stdenv, perl }: + +stdenv.mkDerivation rec { + name = "parallel-20100424"; + + src = fetchurl { + url = "mirror://gnu/parallel/${name}.tar.bz2"; + sha256 = "0japyn4n044zpd88czsrfh4lyjmckih25jl671vby8v5mhk42vw4"; + }; + + patchPhase = + '' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g' + ''; + + buildInputs = [ perl ]; + doCheck = true; + + meta = { + description = "GNU Parallel, a shell tool for executing jobs in parallel"; + + longDescription = + '' GNU Parallel is a shell tool for executing jobs in parallel. A job + is typically a single command or a small script that has to be run + for each of the lines in the input. The typical input is a list of + files, a list of hosts, a list of users, or a list of tables. + + If you use xargs today you will find GNU Parallel very easy to use. + If you write loops in shell, you will find GNU Parallel may be able + to replace most of the loops and make them run faster by running + jobs in parallel. If you use ppss or pexec you will find GNU + Parallel will often make the command easier to read. + + GNU Parallel makes sure output from the commands is the same output + as you would get had you run the commands sequentially. This makes + it possible to use output from GNU Parallel as input for other + programs. + ''; + + homepage = http://www.gnu.org/software/parallel/; + + license = "GPLv3+"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc590533b64..c5a14bb59f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1316,6 +1316,10 @@ let inherit fetchurl stdenv; }; + parallel = import ../tools/misc/parallel { + inherit fetchurl stdenv perl; + }; + patchutils = import ../tools/text/patchutils { inherit fetchurl stdenv; }; From 8da4605505cb49e2f931c12db69219a4d9f2eea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 May 2010 09:27:39 +0000 Subject: [PATCH 117/342] GCC 4.5: Remove redundant `--disable-multilib'. svn path=/nixpkgs/trunk/; revision=21553 --- pkgs/development/compilers/gcc-4.5/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 20cd848ded4..d9b1a8ebe7c 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -81,8 +81,7 @@ let version = "4.5.0"; " --disable-libmudflap " + " --disable-libgomp " + " --disable-shared" + - " --disable-decimal-float" + # libdecnumber requires libc - " --disable-multilib" + " --disable-decimal-float" # libdecnumber requires libc else " --with-headers=${libcCross}/include" + " --enable-__cxa_atexit" + From 61ec7e828d5c52c6f6d411ed13aebce446b3e35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 May 2010 09:27:45 +0000 Subject: [PATCH 118/342] Add SDL_gfx. Contributed by Brian Gough . svn path=/nixpkgs/trunk/; revision=21554 --- .../development/libraries/SDL_gfx/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/libraries/SDL_gfx/default.nix diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix new file mode 100644 index 00000000000..7f4ee8ac20c --- /dev/null +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, SDL} : + +stdenv.mkDerivation rec { + name = "SDL_gfx-2.0.20"; + + src = fetchurl { + url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; + sha256 = "0dyc1sj0ymv2ghmlgwfb2c6r07scbgmi2dfhmnddsb27y8wjqz4q"; + }; + + buildInputs = [ SDL ] ; + + configureFlags = "--disable-mmx"; + + postInstall = "ln -s $out/include/SDL/*.h $out/include/"; + + meta = { + description = "SDL graphics drawing primitives and support functions"; + + longDescription = + '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code + which provided basic drawing routines such as lines, circles or + polygons and SDL_rotozoom which implemented a interpolating + rotozoomer for SDL surfaces. + + The current components of the SDL_gfx library are: + + * Graphic Primitives (SDL_gfxPrimitves.h) + * Rotozoomer (SDL_rotozoom.h) + * Framerate control (SDL_framerate.h) + * MMX image filters (SDL_imageFilter.h) + * Custom Blit functions (SDL_gfxBlitFunc.h) + + The library is backwards compatible to the above mentioned + code. Its is written in plain C and can be used in C++ code. + ''; + + homepage = https://sourceforge.net/projects/sdlgfx/; + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5a14bb59f8..ab227004e50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5073,6 +5073,10 @@ let pulseaudioSupport = false; # better go through ALSA }; + SDL_gfx = import ../development/libraries/SDL_gfx { + inherit fetchurl stdenv SDL; + }; + SDL_image = import ../development/libraries/SDL_image { inherit fetchurl stdenv SDL libjpeg libungif libtiff libpng; inherit (xlibs) libXpm; From 17a3bcd4d657e36b73beef052c38d8158c2d44bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 2 May 2010 09:27:51 +0000 Subject: [PATCH 119/342] Add GNU FreeDink. svn path=/nixpkgs/trunk/; revision=21555 --- pkgs/games/freedink/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/games/freedink/default.nix diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix new file mode 100644 index 00000000000..cb3f032539e --- /dev/null +++ b/pkgs/games/freedink/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx +, pkgconfig, fontconfig, libzip, zip, zlib }: + +stdenv.mkDerivation rec { + name = "freedink-1.08.20100420"; + + src = fetchurl { + url = "mirror://gnu/freedink/${name}.tar.gz"; + sha256 = "0jw0690k7wgsga74nd8m1c3k34xmzgav6z0hhpx507krw2mkbm90"; + }; + + buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx pkgconfig fontconfig libzip zip zlib] ; + + meta = { + description = "GNU FreeDink, a free, portable and enhanced version of the Dink Smallwood game engine. "; + + longDescription = + '' GNU FreeDink is a new and portable version of the Dink Smallwood + game engine, which runs the original game as well as its D-Mods, + with close compatibility, under multiple platforms. + ''; + + homepage = http://www.freedink.org/; + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.bjg ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab227004e50..29ecf13e678 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8705,6 +8705,11 @@ let }); */ + freedink = import ../games/freedink { + inherit stdenv fetchurl SDL SDL_mixer SDL_image SDL_ttf SDL_gfx + pkgconfig fontconfig libzip zip zlib; + }; + fsg = import ../games/fsg { inherit stdenv fetchurl pkgconfig mesa; inherit (gtkLibs) glib gtk; From d8c07cc4d6e1b89ff475054cccbf65fc47f4d3ef Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 May 2010 03:45:40 +0000 Subject: [PATCH 120/342] Add catdoc svn path=/nixpkgs/trunk/; revision=21558 --- pkgs/tools/text/catdoc/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/text/catdoc/default.nix diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix new file mode 100644 index 00000000000..1b335e0ec7c --- /dev/null +++ b/pkgs/tools/text/catdoc/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "catdoc-0.94.2"; + src = fetchurl { + url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz"; + sha256 = "0qnk8fw3wc40qa34yqz51g0knif2jd78a4717nvd3rb46q88pj83"; + }; + + configureFlags = "--disable-wordview"; + + meta = with stdenv.lib; { + platforms = all; + license = "GPL2"; + maintainers = [ urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29ecf13e678..b4faa7873a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -416,6 +416,10 @@ let inherit libuuid zlib acl; }; + catdoc = import ../tools/text/catdoc { + inherit fetchurl stdenv; + }; + eggdrop = import ../tools/networking/eggdrop { inherit fetchurl stdenv tcl; }; From 19cc1226d42690006eeb8cbd54bf7670f11385be Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 May 2010 03:45:47 +0000 Subject: [PATCH 121/342] Add liblqr-1 svn path=/nixpkgs/trunk/; revision=21559 --- .../libraries/liblqr-1/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/liblqr-1/default.nix diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix new file mode 100644 index 00000000000..c6323fcc84a --- /dev/null +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "liblqr-1-0.4.1"; + src = fetchurl { + url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2"; + sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; + }; + + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib ]; + configureFlags = "--enable-install-man"; + + meta = with stdenv.lib; { + homepage = http://liblqr.wikidot.com; + description = "Seam-carving C/C++ library called Liquid Rescaling"; + platforms = platforms.all; + maintainers = [ maintainers.urkud ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4faa7873a4..8acd79fe2a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4405,6 +4405,11 @@ let useGTK = getPkgConfig "libiodbc" "gtk" false; }; + liblqr1 = makeOverridable (import ../development/libraries/liblqr-1) { + inherit stdenv fetchurl pkgconfig; + inherit (gnome) glib; + }; + libnice = import ../development/libraries/libnice { inherit stdenv fetchurl pkgconfig; inherit (gnome) glib; From 83f4846c49580be3a12e0643d5baa97225135270 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 May 2010 03:45:52 +0000 Subject: [PATCH 122/342] Add lensfun library svn path=/nixpkgs/trunk/; revision=21560 --- .../development/libraries/lensfun/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/lensfun/default.nix diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix new file mode 100644 index 00000000000..6aa5867d8ff --- /dev/null +++ b/pkgs/development/libraries/lensfun/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: + +stdenv.mkDerivation rec { + name = "lensfun-0.2.5"; + + src = fetchurl { + url = "http://download.berlios.de/lensfun/${name}.tar.bz2"; + sha256 = "11zvi3lk60iljync3a495h9la7makx6lf22fbvr4lwc933mrh562"; + }; + + patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; + + buildInputs = [ pkgconfig glib zlib libpng ]; + + meta = with stdenv.lib; { + platforms = platforms.all; + maintainers = [ maintainers.urkud ]; + license = "LGPL3"; + description = "An opensource database of photographic lenses and their + characteristics"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8acd79fe2a0..afceb29a34f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4216,6 +4216,11 @@ let inherit fetchurl stdenv; }; + lensfun = import ../development/libraries/lensfun { + inherit fetchurl stdenv libpng python zlib pkgconfig; + inherit (gnome) glib; + }; + lesstif = import ../development/libraries/lesstif { inherit fetchurl stdenv x11; inherit (xlibs) libXp libXau; From 2d9ba975e788a134c254e1967758f85f9db4e876 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 May 2010 03:45:58 +0000 Subject: [PATCH 123/342] digikam: use external lensfun and lqr-1 svn path=/nixpkgs/trunk/; revision=21561 --- pkgs/desktops/kde-4.4/default.nix | 3 ++- pkgs/desktops/kde-4.4/extragear/digikam/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index b920dceb511..7461bf8f879 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -220,7 +220,8 @@ pkgs.recurseIntoAttrs (rec { }; digikam = import ./extragear/digikam { - inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext; + inherit (pkgs) stdenv fetchurl cmake qt4 lcms jasper libgphoto2 gettext + liblqr1 lensfun; inherit kdelibs kdepimlibs kdegraphics kdeedu; inherit automoc4 phonon qimageblitz qca2 eigen soprano; }; diff --git a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix index 29e6d38c0b9..51e7365a854 100644 --- a/pkgs/desktops/kde-4.4/extragear/digikam/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/digikam/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, -kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu }: +kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu, +liblqr1, lensfun }: stdenv.mkDerivation rec { name = "digikam-1.2.0"; @@ -10,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen - lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu ]; + lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun ]; cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; meta = { description = "Photo Management Program"; From 796ffd9f71b94d6f78cadf4c3214778ec181dd67 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 May 2010 09:13:17 +0000 Subject: [PATCH 124/342] Move "fetchurl restricted" code to requireFile. This reverts r21474 and r21467. Also migrate wtk (r21472) to new API. svn path=/nixpkgs/trunk/; revision=21575 --- pkgs/build-support/fetchurl/default.nix | 68 +++++++--------------- pkgs/build-support/trivial-builders.nix | 30 ++++++++++ pkgs/development/libraries/wtk/default.nix | 7 +-- pkgs/stdenv/linux/default.nix | 1 - pkgs/stdenv/native/default.nix | 1 - pkgs/top-level/all-packages.nix | 7 ++- 6 files changed, 58 insertions(+), 56 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 1ee4946c856..1ba9124027d 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,4 @@ -{stdenv, curl, writeScript}: # Note that `curl' may be `null', in case of the native stdenv. +{stdenv, curl}: # Note that `curl' may be `null', in case of the native stdenv. let @@ -23,7 +23,7 @@ let else [] /* backwards compatibility */; in - + { # URL to fetch. url ? "" @@ -45,12 +45,6 @@ in , # If set, don't download the file, but write a list of all possible # URLs (resulting from resolving mirror:// URLs) to $out. showURLs ? false - -, # If set, down't download file but tell user how to download it. - restricted ? false - -, # Used only if restricted. Should contain instructions how to fetch the file. - message ? "" }: assert urls != [] -> url == ""; @@ -62,55 +56,34 @@ assert showURLs || (outputHash != "" && outputHashAlgo != "") let urls_ = if urls != [] then urls else [url]; - name_ = if showURLs then "urls" - else if name != "" then name - else baseNameOf (toString (builtins.head urls_)); - hashAlgo_ = if outputHashAlgo != "" then outputHashAlgo else - if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; - hash_ = if outputHash != "" then outputHash else - if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + in -stdenv.mkDerivation ({ - name = name_; - outputHashAlgo = hashAlgo_; - outputHash = hash_; - urls = urls_; - - # Compatibility with Nix <= 0.7. - id = md5; - - inherit showURLs mirrorsFile; -} -// (if (!showURLs && restricted) then rec { - builder = writeScript "restrict-message" '' -source ${stdenv}/setup -cat <<_EOF_ -${message_} -_EOF_ - ''; - message_ = if message != "" then message else '' - You have to download ${name_} from ${stdenv.lib.concatStringsSep " " urls_} yourself, - and add it to the store using either - nix-store --add-fixed ${hashAlgo_} ${name_} - or - ${if hashAlgo_ != "sha256" then "NIX_HASH_ALGO=${hashAlgo_} " else - ""}nix-prefetch-url file://path/to/${name_} - ''; -} -else { +stdenv.mkDerivation { + name = + if showURLs then "urls" + else if name != "" then name + else baseNameOf (toString (builtins.head urls_)); + builder = ./builder.sh; - + buildInputs = [curl]; + urls = urls_; # If set, prefer the content-addressable mirrors # (http://nixos.org/tarballs) over the original URLs. preferHashedMirrors = true; + # Compatibility with Nix <= 0.7. + id = md5; # New-style output content requirements. - + outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else + if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + outputHash = if outputHash != "" then outputHash else + if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + impureEnvVars = [ # We borrow these environment variables from the caller to allow # easy proxy configuration. This is impure, but a fixed-output @@ -122,5 +95,6 @@ else { # command-line. "NIX_HASHED_MIRRORS" ] ++ (map (site: "NIX_MIRRORS_${site}") sites); -}) -) + + inherit showURLs mirrorsFile; +} diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 25ae340629b..992e28476f0 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -73,6 +73,36 @@ rec { linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + (stdenv.lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); + # Require file + requireFile = {name, sha256, url ? null, message ? null} : + assert (message != null) || (url != null); + let msg = + if message != null then message + else '' + Unfortunately, we may not download file ${name} automatically. + Please, go to ${url}, download it yourself, and add it to the Nix store + using either + nix-store --add-fixed sha256 ${name} + or + nix-prefetch-url file://path/to/${name} + ''; + in + stdenv.mkDerivation { + inherit name; + outputHashAlgo = "sha256"; + outputHash = sha256; + builder = writeScript "restrict-message" '' +source ${stdenv}/setup +cat <<_EOF_ + +*** +${msg} +*** + +_EOF_ + ''; + }; + # Search in the environment if the same program exists with a set uid or # set gid bit. If it exists, run the first program found, otherwise run # the default binary. diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 99e8613c6cb..c9e7fb4249d 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, unzip, xlibs }: +{ stdenv, requireFile, unzip, xlibs }: assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { name = "sun-java-wtk-2.5.2_01"; - src = fetchurl { + src = requireFile { url = meta.homepage; name = "sun_java_wireless_toolkit-2.5.2_01-linuxi486.bin.sh"; - restricted = true; - md5 = "6b70b6e6d426eac121db8a087991589f"; + sha256 = "1cjb9c27847wv0hq3j645ckn4di4vsfvp29fr4zmdqsnvk4ahvj1"; }; builder = ./builder.sh; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 08a4772d18a..dd5647bec45 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -104,7 +104,6 @@ rec { fetchurl = import ../../build-support/fetchurl { stdenv = stdenvLinuxBoot0; curl = bootstrapTools; - inherit (allPackages) writeScript; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 719132488df..1f2117ebba0 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -119,7 +119,6 @@ rec { stdenv = stdenvBoot0; # Curl should be in /usr/bin or so. curl = null; - inherit (allPackages) writeScript; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afceb29a34f..124d4c57d21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -271,7 +271,8 @@ let # from being built. fetchurl = useFromStdenv "fetchurl" (import ../build-support/fetchurl { - inherit stdenv curl writeScript; + curl = curl; + stdenv = stdenv; }); # fetchurlBoot is used for curl and its dependencies in order to @@ -5230,8 +5231,8 @@ let }; wtk = import ../development/libraries/wtk { - inherit fetchurl stdenv unzip xlibs; - }; + inherit requireFile stdenv unzip xlibs; + }; x264 = import ../development/libraries/x264 { inherit fetchurl stdenv yasm; From de4815afa83469240d10bcc1855dd23ad1e0b9c2 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 3 May 2010 13:39:46 +0000 Subject: [PATCH 125/342] catdoc: fix evaluation error svn path=/nixpkgs/trunk/; revision=21577 --- pkgs/tools/text/catdoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index 1b335e0ec7c..5880de7a735 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { configureFlags = "--disable-wordview"; meta = with stdenv.lib; { - platforms = all; + platforms = platforms.all; license = "GPL2"; - maintainers = [ urkud ]; + maintainers = [ maintainers.urkud ]; }; } From 6ce7168eacf447d7847efd3849d65fe7a1082fe1 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Mon, 3 May 2010 15:38:16 +0000 Subject: [PATCH 126/342] quesoglc: New nixpkg. svn path=/nixpkgs/trunk/; revision=21580 --- .../libraries/quesoglc/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/quesoglc/default.nix diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix new file mode 100644 index 00000000000..3d2f098267d --- /dev/null +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, mesa, glew, freetype, fontconfig, fribidi, libX11 }: +stdenv.mkDerivation rec { + pname = "quesoglc"; + version = "0.7.2"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; + }; + buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ]; + # FIXME: Configure fails to use system glew. + meta = { + description = "A free implementation of the OpenGL Character Renderer"; + longDescription = '' + QuesoGLC is a free (as in free speech) implementation of the OpenGL + Character Renderer (GLC). QuesoGLC is based on the FreeType library, + provides Unicode support and is designed to be easily ported to any + platform that supports both FreeType and the OpenGL API. + ''; + homepage = http://quesoglc.sourceforge.net/; + license = [ "LGPLv2.1+" ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 124d4c57d21..afa35c0a324 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5027,6 +5027,11 @@ let qt4 = qt46; }; + quesoglc = import ../development/libraries/quesoglc { + inherit stdenv fetchurl mesa glew freetype fontconfig fribidi; + inherit (xlibs) libX11; + }; + readline = readline6; readline4 = import ../development/libraries/readline/readline4.nix { From d2237f991220d3747eaa3025424fb2c8a129707e Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Mon, 3 May 2010 16:07:01 +0000 Subject: [PATCH 127/342] warzone2100: New nixpkg. svn path=/nixpkgs/trunk/; revision=21582 --- pkgs/games/warzone2100/default.nix | 39 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/games/warzone2100/default.nix diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix new file mode 100644 index 00000000000..43708306ce7 --- /dev/null +++ b/pkgs/games/warzone2100/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, bison, flex, gettext, pkgconfig, SDL, libpng, libtheora +, openal, popt, physfs, mesa, quesoglc, zip, unzip, which +}: +stdenv.mkDerivation rec { + pname = "warzone2100"; + version = "2.3.0"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "10iisg6lixs8bnd57qzyf3bqhispcylxvkyqwyfagg7r2qr159zj"; + }; + buildInputs = [ bison flex gettext pkgconfig SDL libpng libtheora openal + popt physfs mesa quesoglc zip unzip + ]; + patchPhase = '' + substituteInPlace lib/exceptionhandler/dumpinfo.cpp \ + --replace "which %s" "${which}/bin/which %s" + substituteInPlace lib/exceptionhandler/exceptionhandler.c \ + --replace "which %s" "${which}/bin/which %s" + ''; + meta = { + description = "A free RTS game, originally developed by Pumpkin Studios"; + longDescription = '' + Warzone 2100 is an open source real-time strategy and real-time tactics + hybrid computer game, originally developed by Pumpkin Studios and + published by Eidos Interactive. + In Warzone 2100, you command the forces of The Project in a battle to + rebuild the world after mankind has almost been destroyed by nuclear + missiles. The game offers campaign, multi-player, and single-player + skirmish modes. An extensive tech tree with over 400 different + technologies, combined with the unit design system, allows for a wide + variety of possible units and tactics. + ''; + homepage = http://wz2100.net; + license = [ "GPLv2+" ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afa35c0a324..505ed109428 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8868,6 +8868,12 @@ let libjpeg = libjpeg62; }; + warzone2100 = import ../games/warzone2100 { + inherit stdenv fetchurl bison gettext pkgconfig SDL libpng libtheora + openal popt physfs mesa quesoglc zip unzip which; + flex = flex2535; + }; + xboard = builderDefsPackage (import ../games/xboard) { inherit (xlibs) libX11 xproto libXt libXaw libSM libICE libXmu libXext libXpm; From 4b44717b1dfea73ffafe64bf67b219492c2ebe2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 May 2010 19:59:51 +0000 Subject: [PATCH 128/342] Making the ld-wrapper2.sh much faster, when having lots of '-L' parameters, breaking a double loop we had. svn path=/nixpkgs/trunk/; revision=21583 --- pkgs/build-support/gcc-wrapper/ld-wrapper2.sh | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper2.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper2.sh index 0e39dde0b01..99ba3968ae3 100644 --- a/pkgs/build-support/gcc-wrapper/ld-wrapper2.sh +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper2.sh @@ -82,6 +82,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then rpath="$rpath $1 " } + libs="" + addToLibs() { + libs="$libs $1" + } + rpath="" # First, find all -L... switches. @@ -95,6 +100,11 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then elif test "$p" = "-L"; then addToLibPath ${p2} n=$((n + 1)) + elif test "$p" = "-l"; then + addToLibs ${p2} + n=$((n + 1)) + elif test "${p:0:2}" = "-l"; then + addToLibs ${p:2} elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then # This is a direct reference to a shared library, so add # its directory to the rpath. @@ -103,27 +113,18 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then fi n=$((n + 1)) done - + # Second, for each directory in the library search path (-L...), # see if it contains a dynamic library used by a -l... flag. If # so, add the directory to the rpath. - - for i in $libPath; do - n=0 - while test $n -lt ${#allParams[*]}; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if test "${p:0:2}" = "-l" -a -f "$i/lib${p:2}.so"; then - addToRPath $i - break - elif test "$p" = "-l" -a -f "$i/lib${p2}"; then - # I haven't seen `-l foo', but you never know... - addToRPath $i + + for i in $libs; do + for j in $libPath; do + if test -f "$j/lib$i.so"; then + addToRPath $j break fi - n=$((n + 1)) done - done From f434403e5953cf82708b437bb63660322ebdb8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 3 May 2010 20:06:09 +0000 Subject: [PATCH 129/342] Updating numpy, so it builds on arm, and then I can get tahoe-lafs building in armv5tel-linux. svn path=/nixpkgs/trunk/; revision=21584 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c8703e6364..48cdf1f143a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -367,11 +367,11 @@ rec { }); numpy = buildPythonPackage ( rec { - name = "numpy-1.3.0"; + name = "numpy-1.4.1"; src = fetchurl { - url = "http://downloads.sourceforge.net/numpy/${name}.tar.gz"; - sha256 = "7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d"; + url = "mirror://sourceforge/numpy/${name}.tar.gz"; + sha256 = "01lf3nc2lp1qkrqnnar50vb7i6y07d1zs6f9yc3kw4p5fd2vhyrf"; }; doCheck = false; From 049c8969985f18fe0bea0421176ad22d3d74f57f Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 3 May 2010 23:14:28 +0000 Subject: [PATCH 130/342] update to 1.1.1 svn path=/nixpkgs/trunk/; revision=21585 --- pkgs/games/scummvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index f26d25d0cbc..d6912d5c3c0 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, SDL, zlib, mpeg2dec}: stdenv.mkDerivation { - name = "scummvm-1.1.0"; + name = "scummvm-1.1.1"; src = fetchurl { - url = mirror://sourceforge/scummvm/scummvm-1.1.0.tar.bz2; - sha256 = "0fdqc98jib6593cpjc1jhklp9y0c1mlk0lrn9d6r9ax159x53h2k"; + url = mirror://sourceforge/scummvm/scummvm-1.1.1.tar.bz2; + sha256 = "0jlxwd8rzk4dn221v9w024w6f503am29hd8djzs1vz0bd72nbj4w"; }; buildInputs = [SDL zlib mpeg2dec]; From 9e5ab467371deb8b1b1e0751eca46457918b0d19 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 4 May 2010 10:06:50 +0000 Subject: [PATCH 131/342] added git2cl script svn path=/nixpkgs/trunk/; revision=21590 --- .../git-and-tools/default.nix | 3 +++ .../git-and-tools/git2cl/default.nix | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git2cl/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index fc998a8b23b..00931aaf3d5 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -104,4 +104,7 @@ rec { subversion; }; + git2cl = import ./git2cl { + inherit fetchgit stdenv perl; + }; } diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix new file mode 100644 index 00000000000..026fc18c801 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -0,0 +1,19 @@ +{ fetchgit +, stdenv +, perl +}: +stdenv.mkDerivation rec { + name = "git2cl"; + + src = fetchgit { + url = git://git.sv.gnu.org/git2cl.git; + rev = "8373c9f74993e218a08819cbcdbab3f3564bbeba"; + sha256 = "b0d39379640c8a12821442431e2121f7908ce1cc88ec8ec6bede218ea8c21f2f"; + }; + + buildCommand = '' + ensureDir $out/bin + cp ${src}/git2cl $out/bin + sed -i 's|/usr/bin/perl|${perl}/bin/perl|' $out/bin/git2cl + ''; +} From 82fe9865549364ae7ceec878ac23f9ba0de0da25 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 May 2010 12:17:34 +0000 Subject: [PATCH 132/342] * strace 4.5.20. svn path=/nixpkgs/trunk/; revision=21592 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 43ddb2190c1..0ffe91762f5 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "strace-4.5.19"; + name = "strace-4.5.20"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.bz2"; - sha256 = "021x06jyvpg156kf6ndbd370nz4w3xp6q06pbk20w6wpks8wx5w9"; + sha256 = "1gfakika8833373p09pfzn5y83kx4jmlxws6na8av9gad69hb37a"; }; meta = { From be07b7f60d1b5dda9e844278b4ed99db4636c33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 4 May 2010 13:32:00 +0000 Subject: [PATCH 133/342] tcp-wrapper: Apply patches with `--batch' to please the latest GNU Patch. svn path=/nixpkgs/trunk/; revision=21594 --- pkgs/os-specific/linux/tcp-wrapper/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tcp-wrapper/builder.sh b/pkgs/os-specific/linux/tcp-wrapper/builder.sh index 6cb91110530..58bc1d4409d 100644 --- a/pkgs/os-specific/linux/tcp-wrapper/builder.sh +++ b/pkgs/os-specific/linux/tcp-wrapper/builder.sh @@ -11,7 +11,7 @@ patchPhase for patch in debian/patches/* do echo "applying Debian patch \`$(basename $patch)'..." - patch -p1 < $patch + patch --batch -p1 < $patch done substituteInPlace "Makefile" --replace \ From d5086fd5bd7ac00b87384ad291dd02a74496e77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 4 May 2010 13:32:04 +0000 Subject: [PATCH 134/342] xmlto 0.0.23. svn path=/nixpkgs/trunk/; revision=21595 --- pkgs/tools/typesetting/xmlto/default.nix | 26 ++++++++++-------------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 85d4ee010b3..42377238595 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -1,13 +1,12 @@ { fetchurl, stdenv, flex, libxml2, libxslt , docbook_xml_dtd_42, docbook_xsl, w3m -, bash, getopt, mktemp, findutils -, makeWrapper }: +, bash, getopt, makeWrapper }: stdenv.mkDerivation rec { - name = "xmlto-0.0.20"; + name = "xmlto-0.0.23"; src = fetchurl { - url = "http://cyberelk.net/tim/data/xmlto/stable/${name}.tar.bz2"; - sha256 = "1s71khb0ycawhjpr19zrrqk0jac11jgwvxnajjkm2656p5qikylz"; + url = "http://fedorahosted.org/releases/x/m/xmlto/${name}.tar.bz2"; + sha256 = "1i5iihx304vj52nik42drs7z6z58m9szahng113r4mgd1mvb5zx9"; }; patchPhase = '' @@ -15,21 +14,17 @@ stdenv.mkDerivation rec { --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace "xmlto.in" \ --replace "/usr/bin/locale" "$(type -P locale)" - ''; - - configureFlags = '' - --with-mktemp=${mktemp}/bin/mktemp - --with-find=${findutils}/bin/find - --with-bash=${bash}/bin/bash - --with-getopt=${getopt}/bin/getopt + substituteInPlace "xmlto.in" \ + --replace "mktemp" "$(type -P mktemp)" ''; # `libxml2' provides `xmllint', needed at build-time and run-time. # `libxslt' provides `xsltproc', used by `xmlto' at run-time. - buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook_xml_dtd_42 docbook_xsl getopt makeWrapper ]; postInstall = '' - wrapProgram $out/bin/xmlto --prefix PATH : "${libxslt}/bin:${libxml2}/bin" + wrapProgram "$out/bin/xmlto" \ + --prefix PATH : "${libxslt}/bin:${libxml2}/bin:${getopt}/bin" # `w3m' is needed for HTML to text conversions. substituteInPlace "$out/share/xmlto/format/docbook/txt" \ @@ -47,8 +42,9 @@ stdenv.mkDerivation rec { ''; license = "GPLv2+"; - homepage = http://cyberelk.net/tim/software/xmlto/; + homepage = https://fedorahosted.org/xmlto/; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 505ed109428..56b5d0baa9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1884,8 +1884,7 @@ let xmlto = import ../tools/typesetting/xmlto { inherit fetchurl stdenv flex libxml2 libxslt - docbook_xml_dtd_42 docbook_xsl w3m - bash getopt mktemp findutils makeWrapper; + docbook_xml_dtd_42 docbook_xsl w3m bash getopt makeWrapper; }; xmltv = import ../tools/misc/xmltv { From 085bf1f2f1516ad6e75e0de964f37883ad28ae99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 4 May 2010 13:32:09 +0000 Subject: [PATCH 135/342] Add SystemTap. svn path=/nixpkgs/trunk/; revision=21596 --- .../tools/profiling/systemtap/default.nix | 73 +++++++++++++++++++ .../systemtap/nixos-kernel-store-path.patch | 47 ++++++++++++ pkgs/top-level/all-packages.nix | 8 ++ 3 files changed, 128 insertions(+) create mode 100644 pkgs/development/tools/profiling/systemtap/default.nix create mode 100644 pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix new file mode 100644 index 00000000000..66e4870aa59 --- /dev/null +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -0,0 +1,73 @@ +{ fetchurl, stdenv, linux, elfutils, latex2html, xmlto, docbook_xml_dtd_412 +, libxml2, docbook_xsl, libxslt, texLive, texLiveExtra, ghostscript, pkgconfig +, gtkmm, libglademm, boost, perl, sqlite }: + +stdenv.mkDerivation rec { + name = "systemtap-1.2"; + + src = fetchurl { + url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz"; + sha256 = "0kxgjr8p1pnncc0l4941gzx0jsyyqjzjqar2qkcjzp266ajn9qz6"; + }; + + patches = + stdenv.lib.optional (stdenv ? glibc) ./nixos-kernel-store-path.patch; + + postPatch = + '' sed -i scripts/kernel-doc -e 's|/usr/bin/perl|${perl}/bin/perl|g' + ''; + + preConfigure = + # XXX: This should really be handled by TeXLive's setup-hook. + '' export TEXINPUTS="${latex2html}/texinputs:$TEXINPUTS" + export TEXINPUTS="${texLiveExtra}/texmf-dist/tex/latex/preprint:$TEXINPUTS" + echo "\$TEXINPUTS is \`$TEXINPUTS'" + ''; + + postConfigure = + /* Work around this: + + StapParser.cxx:118: instantiated from here + /...-boost-1.42.0/include/boost/algorithm/string/compare.hpp:43: error: comparison between signed and unsigned integer expressions + + */ + '' sed -i "grapher/Makefile" -e's/-Werror//g' + ''; + + buildInputs = + [ elfutils latex2html xmlto texLive texLiveExtra ghostscript + pkgconfig gtkmm libglademm boost sqlite + docbook_xml_dtd_412 libxml2 + docbook_xsl libxslt + ]; + + meta = { + description = "SystemTap, tools to gather information about a running GNU/Linux system"; + + longDescription = + '' SystemTap provides free software (GPL) infrastructure to simplify + the gathering of information about the running GNU/Linux system. + This assists diagnosis of a performance or functional problem. + SystemTap eliminates the need for the developer to go through the + tedious and disruptive instrument, recompile, install, and reboot + sequence that may be otherwise required to collect data. + + SystemTap provides a simple command line interface and scripting + language for writing instrumentation for a live running kernel. We + are publishing samples, as well as enlarging the internal "tapset" + script library to aid reuse and abstraction. + + Among other tracing/probing tools, SystemTap is the tool of choice + for complex tasks that may require live analysis, programmable + on-line response, and whole-system symbolic access. SystemTap can + also handle simple tracing jobs. + ''; + + homepage = http://sourceware.org/systemtap/; + + license = "GPLv2+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch b/pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch new file mode 100644 index 00000000000..5881ed84533 --- /dev/null +++ b/pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch @@ -0,0 +1,47 @@ +This patch makes stap(1) know about the kernel store path on NixOS. + +--- systemtap-1.2/main.cxx 2010-03-22 22:51:49.000000000 +0100 ++++ systemtap-1.2/main.cxx 2010-05-04 14:56:19.000000000 +0200 +@@ -528,6 +528,32 @@ getmemusage () + return oss.str(); + } + ++/* Read `/proc/cmdline' and extract the store path. The assumption is that ++ `/proc/cmdline' looks like this: ++ ++ BOOT_IMAGE=/nix/store/sxjd69wfcr6w8jlbcc5bc20nwjliq872-linux-2.6.32.8/bzImage systemConfig=/nix/store/kiicqkjwgfvkwrg4fp3dnhwldh7dq7is-system init=/nix/store/czgncihjwx3n58xij6i1rlnz8wv6ym4j-stage-2-init.sh splash=verbose vga=0x317 ++ ++ This is the case on NixOS GNU/Linux. */ ++static string ++kernel_store_path (void) ++{ ++ ifstream proc_cmdline ("/proc/cmdline"); ++ string variable_name, store_path; ++ ++ getline (proc_cmdline, variable_name, '='); ++ if (variable_name == "BOOT_IMAGE") ++ { ++ string boot_image_path; ++ size_t slash_pos; ++ ++ getline (proc_cmdline, boot_image_path, ' '); ++ slash_pos = boot_image_path.find_last_of ('/'); ++ store_path = boot_image_path.substr (0, slash_pos); ++ } ++ ++ return store_path; ++} ++ + int + main (int argc, char * const argv []) + { +@@ -541,7 +567,8 @@ main (int argc, char * const argv []) + struct utsname buf; + (void) uname (& buf); + s.kernel_release = string (buf.release); +- s.kernel_build_tree = "/lib/modules/" + s.kernel_release + "/build"; ++ s.kernel_build_tree = ++ kernel_store_path () + "/lib/modules/" + s.kernel_release + "/build"; + + // PR4186: Copy logic from coreutils uname (uname -i) to squash + // i?86->i386. Actually, copy logic from linux top-level Makefile diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56b5d0baa9c..7c6835965fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6288,6 +6288,14 @@ let inherit (gnome) gtk glib pango libglade; }; + systemtap = import ../development/tools/profiling/systemtap { + inherit fetchurl stdenv elfutils latex2html xmlto pkgconfig boost + texLive texLiveExtra ghostscript perl docbook_xml_dtd_412 libxml2 + docbook_xsl libxslt sqlite; + linux = kernel; + inherit (gnome) gtkmm libglademm; + }; + virtualbox = import ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit fetchurl lib iasl dev86 libxslt libxml2 SDL hal From 20fcfdef64f8cfcc9d47b04caa645a194ecfa644 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 4 May 2010 15:26:34 +0000 Subject: [PATCH 136/342] * Revert to Samba 3.3.3 because never versions (including 3.3.12) break our VM builds. The child smbd process sends a TERM signal to its process group when it exists (e.g. on unmount), causing qemu-kvm to die. Reported upstream: https://sourceforge.net/tracker/?func=detail&aid=2996643&group_id=180599&atid=893831 svn path=/nixpkgs/trunk/; revision=21600 --- pkgs/servers/samba/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index faae21bd8a2..28d37869e7b 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -14,24 +14,23 @@ }: stdenv.mkDerivation rec { - name = "samba-3.5.2"; + name = "samba-3.3.3"; src = fetchurl { url = "http://us3.samba.org/samba/ftp/stable/${name}.tar.gz"; - sha256 = "0pi946lyn57larvada77pkal48hc0rn07bjxpg2ahz0c389cknl2"; + sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; }; buildInputs = [readline pam openldap popt iniparser libunwind fam acl] ++ stdenv.lib.optional useKerberos kerberos; - preConfigure = "cd source3"; + preConfigure = "cd source"; postInstall = '' mkdir -pv $out/lib/cups/backend ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb '' + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf"; - # Don't pass --with-private-dir=/var/samba/private # --with-lockdir=/var/samba/lock # the build system will try to create it. From d2e6d7b84f05e728f37460a9de26451842d65445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 May 2010 09:30:42 +0000 Subject: [PATCH 137/342] Update Nix unstable. svn path=/nixpkgs/trunk/; revision=21601 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 574b223ce06..a33e64f55dc 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre20612"; + name = "nix-0.16pre21576"; src = fetchurl { - url = "http://hydra.nixos.org/build/325045/download/4/${name}.tar.bz2"; - sha256 = "a0fecb2d9cced473880649d7ee6448688d63416fb2e26bdbadec069e5b619bce"; + url = "http://hydra.nixos.org/build/395008/download/4/${name}.bz2"; + sha256 = "1axmipk8vp9vwsq5wnhshgb0pcgbhanlxz8z2m3f5vxvixvw3i19"; }; buildNativeInputs = [ perl ]; From 2dd70d3ffb72a400da99c0736a082361caa4caa3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 May 2010 10:26:11 +0000 Subject: [PATCH 138/342] pkgs/applications/science/math/maxima: updated to version 5.21.1 svn path=/nixpkgs/trunk/; revision=21602 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 0e9c285a55e..e9728ac984d 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,14 +2,14 @@ let name = "maxima"; - version = "5.20.1"; + version = "5.21.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "cc2430ad6b895fb730ee2a7b8df4852c2b6d09a5a8bb715bdba783982c470bd9"; + sha256 = "1dae887e1787871437d699a6b1acc1c1f7428729487492a07c6a31e26bf53a1b"; }; buildInputs = [clisp]; From 6b42129c3a1d1637647b879d14bd77e6fef7bea4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 May 2010 10:26:15 +0000 Subject: [PATCH 139/342] pkgs/applications/science/math/wxmaxima: updated to version 0.8.5 svn path=/nixpkgs/trunk/; revision=21603 --- pkgs/applications/science/math/wxmaxima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 403105aaaa7..2bd50b7707b 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -6,14 +6,14 @@ let name = "wxmaxima"; - version = "0.8.3"; + version = "0.8.5"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz"; - sha256 = "829e732e668f13c3153cc2fb67c7678973bf1bc468fb1b9f437fd0c24f59507a"; + sha256 = "794317fa2a8d0c2e88c3e5d238c5b81a3e11783ec4a692468b51f15bf5d294f2"; }; buildInputs = [maxima wxGTK]; From d21dc14966aec950a5bd57ad52e78525e007d4e8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 May 2010 10:26:19 +0000 Subject: [PATCH 140/342] pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.1 svn path=/nixpkgs/trunk/; revision=21604 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 7e41a1297ea..00254c9d1ff 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { - name = "git-1.7.0.5"; + name = "git-1.7.1"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "96b44fcd8652db8a7a30d87096a17200457d3fbcc91aa334cb7644a6da898d53"; + sha256 = "bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2"; }; patches = [ ./docbook2texi.patch ]; From b8186141e3b15a34e491de66d18ead7f6cd4bec0 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:25 +0000 Subject: [PATCH 141/342] Qt 4.6: add more SQL backends and libXi Also install qch docs by default svn path=/nixpkgs/trunk/; revision=21605 --- pkgs/development/libraries/qt-4.6/default.nix | 39 ++++++++++++------- pkgs/top-level/all-packages.nix | 7 ++-- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/qt-4.6/default.nix b/pkgs/development/libraries/qt-4.6/default.nix index 0a83cc9e4a5..50ab8e66aea 100644 --- a/pkgs/development/libraries/qt-4.6/default.nix +++ b/pkgs/development/libraries/qt-4.6/default.nix @@ -1,10 +1,12 @@ { stdenv, fetchurl, lib , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu , libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, mysql, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, buildDemos ? false, buildExamples ? false, keepDocumentation ? false}: +, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib +, mysql, postgresql +, perl, coreutils, libXi, sqlite, alsaLib +, buildDemos ? false, buildExamples ? false, useDocs ? true}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "qt-4.6.2"; src = fetchurl { @@ -12,16 +14,24 @@ stdenv.mkDerivation { sha256 = "1bpz59y907zz2p67mnf5ckvxh7n2glr6pz1f9fmngkkdn3fm2vqp"; }; - setupHook = ./setup-hook.sh; - preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" + configureFlags+=" + -docdir $out/share/doc/${name} + -plugindir $out/lib/qt4/plugins + -examplesdir $out/share/doc/${name}/examples + -demosdir $out/share/doc/${name}/demos + -datadir $out/share/qt4 + " ''; propagatedBuildInputs = [ + alsaLib + sqlite libXft libXrender libXrandr + libXi randrproto xextproto libXinerama @@ -30,6 +40,7 @@ stdenv.mkDerivation { zlib libjpeg mysql + postgresql libpng which mesa @@ -48,6 +59,8 @@ stdenv.mkDerivation { libtiff ]; + buildInputs = [ perl ]; + # libQtNetwork will call libQtCore for it to dlopen openssl. NIX_LDFLAGS = "-rpath ${openssl}/lib"; # Don't shrink the rpath, to keep ${openssl} in it. @@ -59,29 +72,27 @@ stdenv.mkDerivation { -v -no-separate-debug-info -release -system-zlib -system-libpng -system-libjpeg -fast -qt-gif -confirm-license -opensource - -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql + -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -system-sqlite -qdbus -cups -glib -xfixes -dbus-linked -fontconfig -I${freetype}/include/freetype2 + -exceptions -xmlpatterns ${if buildDemos == true then "" else "-nomake demos"} ${if buildExamples == true then "" else "-nomake examples"} + ${if useDocs then "" else "-nomake docs"} ''; patchPhase = '' substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf ''; - # Remove the documentation: it takes up >= 130 MB, which is more - # than half of the installed size. Ideally we should put this in a - # separate package (as well as the Qt Designer). - postInstall = '' - ${if keepDocumentation == false then "rm -rf $out/doc" else ""} - ''; + postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; meta = { - homepage = http://www.qtsoftware.com/downloads/opensource/appdev/linux-x11-cpp; + homepage = http://qt.nokia.com/products; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = [ lib.maintainers.sander ]; + maintainers = with lib.maintainers; [ sander urkud ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c6835965fc..79a5fec837e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5012,11 +5012,12 @@ let inherit (gnome) glib; }; - qt46 = import ../development/libraries/qt-4.6 { + qt46 = makeOverridable (import ../development/libraries/qt-4.6) { inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus - fontconfig freetype pkgconfig libtiff; + fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib + postgresql; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto - libXmu libXinerama xineramaproto libXcursor libXext + libXmu libXinerama xineramaproto libXcursor libXext libXi inputproto fixesproto libXfixes; inherit (gnome) glib; }; From a44db4e52d47b47ab9177a94e488e12e10e62784 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:30 +0000 Subject: [PATCH 142/342] Adjust plugin install dir to changes in qt svn path=/nixpkgs/trunk/; revision=21606 --- pkgs/desktops/kde-4.4/support/qca2/ossl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.4/support/qca2/ossl.nix b/pkgs/desktops/kde-4.4/support/qca2/ossl.nix index 6385919305d..be992eb42ea 100644 --- a/pkgs/desktops/kde-4.4/support/qca2/ossl.nix +++ b/pkgs/desktops/kde-4.4/support/qca2/ossl.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags="--no-separate-debug-info --with-qca=${qca2} --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; preConfigure='' - configureFlags="$configureFlags --plugins-path=$out/plugins" + configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" ''; patches = [ ./ossl-remove-whirlpool.patch ]; meta = { From b2ed8f1aa0a2bcf8863c5490e809fd6290740b11 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:35 +0000 Subject: [PATCH 143/342] Propagate policykit svn path=/nixpkgs/trunk/; revision=21607 --- pkgs/desktops/kde-4.4/support/polkit-qt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.4/support/polkit-qt/default.nix b/pkgs/desktops/kde-4.4/support/polkit-qt/default.nix index 33ff8c00aaa..441321a42d2 100644 --- a/pkgs/desktops/kde-4.4/support/polkit-qt/default.nix +++ b/pkgs/desktops/kde-4.4/support/polkit-qt/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { url = mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-0.9.3.tar.bz2; sha256 = "08mz8p98nlxnxy1l751jg1010vgjq2f2d6n4cj27jvihqkpbaixn"; }; - buildInputs = [ cmake qt4 policykit automoc4 ]; + buildInputs = [ cmake automoc4 ]; + propagatedBuildInputs = [ qt4 policykit ]; meta = { description = "Qt PolicyKit bindings"; license = "LGPL"; From d61f35545c15ea720a3990b2491eb2b8e89c6cf8 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:40 +0000 Subject: [PATCH 144/342] kdeedu: drop libfacile as kdeedu fails to find it; use libspectre. svn path=/nixpkgs/trunk/; revision=21608 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/edu/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 7461bf8f879..86d9e5da81a 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -122,7 +122,7 @@ pkgs.recurseIntoAttrs (rec { kdeedu = import ./edu { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost; - inherit (pkgs) readline gmm gsl facile ocaml xplanet; + inherit (pkgs) readline gmm gsl xplanet libspectre; inherit kdelibs attica; inherit automoc4 phonon eigen; }; diff --git a/pkgs/desktops/kde-4.4/edu/default.nix b/pkgs/desktops/kde-4.4/edu/default.nix index 451a505fd85..ca228e4d566 100644 --- a/pkgs/desktops/kde-4.4/edu/default.nix +++ b/pkgs/desktops/kde-4.4/edu/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl -, facile, ocaml, xplanet +, xplanet, libspectre , kdelibs, automoc4, phonon, eigen, attica}: stdenv.mkDerivation { @@ -8,8 +8,9 @@ stdenv.mkDerivation { url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2; sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7"; }; - buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet - kdelibs automoc4 phonon eigen attica ]; +#TODO: facile, indi, boost.python, cfitsio, R, qalculate + buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet + kdelibs automoc4 phonon eigen attica libspectre ]; meta = { description = "KDE Educative software"; license = "GPL"; From 320ce209292d5c32263fecd048160e6d9320d996 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:45 +0000 Subject: [PATCH 145/342] Revert "Really add policykit support to kdebase-workspace" svn path=/nixpkgs/trunk/; revision=21609 --- pkgs/desktops/kde-4.4/base-workspace/default.nix | 5 ++--- pkgs/desktops/kde-4.4/default.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index 48a70a01d11..e2c6052a618 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -2,7 +2,7 @@ , qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings , libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver , lm_sensors, libxklavier, libusb, libpthreadstubs, boost -, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt, policykit +, automoc4, phonon, strigi, soprano, qimageblitz, akonadi, polkit_qt }: stdenv.mkDerivation { @@ -14,8 +14,7 @@ stdenv.mkDerivation { buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 - phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs - policykit ]; + phonon strigi soprano qimageblitz akonadi polkit_qt libpthreadstubs ]; patchPhase='' sed -i -e 's|''${PYTHON_SITE_PACKAGES_DIR}|''${CMAKE_INSTALL_PREFIX}/lib/python2.6/site-packages|' \ plasma/generic/scriptengines/python/CMakeLists.txt diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 86d9e5da81a..d0fc470473c 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -69,7 +69,7 @@ pkgs.recurseIntoAttrs (rec { ### BASE kdebase_workspace = import ./base-workspace { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python pam sip pyqt4; - inherit (pkgs) lm_sensors libxklavier libusb boost consolekit policykit; + inherit (pkgs) lm_sensors libxklavier libusb boost consolekit; inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver libpthreadstubs; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon strigi soprano qimageblitz akonadi polkit_qt; From 5008f2dba66c6b7453beb698fffe3a018a6c3a79 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:50 +0000 Subject: [PATCH 146/342] add enchant support to kdelibs svn path=/nixpkgs/trunk/; revision=21610 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/libs/default.nix | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index d0fc470473c..f2e1b4029d2 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -61,7 +61,7 @@ pkgs.recurseIntoAttrs (rec { kdelibs = import ./libs { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt; inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info - kerberos acl attr shared_desktop_ontologies; + kerberos acl attr shared_desktop_ontologies enchant; inherit (pkgs.xlibs) libXScrnSaver; inherit automoc4 phonon strigi soprano qca2 attica polkit_qt; }; diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix index 896c444d10e..280bb2214a1 100644 --- a/pkgs/desktops/kde-4.4/libs/default.nix +++ b/pkgs/desktops/kde-4.4/libs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, lib, perl , qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper , xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver -, automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt +, automoc4, phonon, strigi, soprano, qca2, attica, polkit_qt, enchant }: stdenv.mkDerivation { name = "kdelibs-4.4.2"; - + src = fetchurl { url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2; sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15"; @@ -15,16 +15,15 @@ stdenv.mkDerivation { buildInputs = [ cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr - libXScrnSaver + libXScrnSaver enchant automoc4 phonon strigi soprano qca2 attica polkit_qt ]; propagatedBuildInputs = [ shared_desktop_ontologies ]; - - # I don't know why cmake does not find the acl files (but finds attr files) + # cmake fails to find acl.h because of C++-style comment cmakeFlags = [ "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON" ]; - + meta = { description = "KDE libraries"; license = "LGPL"; From b07f14b1f5c2ddecc3575e67c53d3c84214dcae6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:17:55 +0000 Subject: [PATCH 147/342] Use stdenv2 in KDE to speed-up builds svn path=/nixpkgs/trunk/; revision=21611 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79a5fec837e..0f576e4108e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8992,6 +8992,7 @@ let kde44 = makeOverridable (import ../desktops/kde-4.4) (pkgs // { openexr = openexr_1_6_1; + stdenv = stdenv2; }); ### SCIENCE From 8fce481d76e28a9521a279865090f8de7bcd58b6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:18:00 +0000 Subject: [PATCH 148/342] Add kdevplatform svn path=/nixpkgs/trunk/; revision=21612 --- pkgs/desktops/kde-4.4/default.nix | 6 ++++++ .../kde-4.4/extragear/kdevplatform/default.nix | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index f2e1b4029d2..e716ad4cff1 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -238,6 +238,12 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; + kdevplatform = import ./extragear/kdevplatform { + inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig + apr aprutil boost; + inherit kdelibs automoc4 phonon; + }; + kdesvn = import ./extragear/kdesvn { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gettext apr aprutil subversion db4; inherit kdelibs; diff --git a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix b/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix new file mode 100644 index 00000000000..78896aff019 --- /dev/null +++ b/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, perl, phonon, + gettext, pkgconfig, apr, aprutil, boost }: + +stdenv.mkDerivation rec { + name = "kdevplatform-1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2"; + sha256 = "05qgi5hwvzqzysihd5nrn28kiz0l6rp9dbxlf25jcjs5dml3dza6"; + }; + + propagatedBuildInputs = [ kdelibs subversion qt4 phonon ]; + buildInputs = [ cmake automoc4 perl gettext pkgconfig apr aprutil boost stdenv.gcc.libc ]; +} From e58d4616237ce9dbf8702eabf01cf15eeca11869 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:18:05 +0000 Subject: [PATCH 149/342] Add kdevelop svn path=/nixpkgs/trunk/; revision=21613 --- pkgs/desktops/kde-4.4/default.nix | 5 +++++ .../kde-4.4/extragear/kdevelop/default.nix | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index e716ad4cff1..79523142541 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -238,6 +238,11 @@ pkgs.recurseIntoAttrs (rec { inherit automoc4 phonon; }; + kdevelop = import ./extragear/kdevelop { + inherit (pkgs) stdenv fetchurl cmake pkgconfig shared_mime_info gettext perl; + inherit kdevplatform automoc4 kdebase_workspace; + }; + kdevplatform = import ./extragear/kdevplatform { inherit (pkgs) stdenv fetchurl cmake subversion qt4 perl gettext pkgconfig apr aprutil boost; diff --git a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix b/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix new file mode 100644 index 00000000000..6802bdd323b --- /dev/null +++ b/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info, + kdebase_workspace, gettext, perl }: + +stdenv.mkDerivation rec { + name = "kdevelop-4.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/kdevelop/4.0.0/src/${name}.tar.bz2"; + sha256 = "0cnwhfk71iksip17cjzf3g68n751k8fz2acin6qb27k7sh71pdfp"; + }; + + buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info + kdebase_workspace gettext stdenv.gcc.libc perl ]; +} From b03f3bd8a1d15af8309e6bb9650be748199ab20d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 5 May 2010 18:23:08 +0000 Subject: [PATCH 150/342] Add platforms to xf86-input-wacom svn path=/nixpkgs/trunk/; revision=21614 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index b1468a18990..05993ad7b48 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -25,9 +25,10 @@ stdenv.mkDerivation rec { cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules ''; - meta = { - maintainers = with stdenv.lib.maintainers; [urkud]; + meta = with stdenv.lib; { + maintainers = [ maintainers.urkud ]; description = "Wacom digitizer driver for X11"; homepage = http://linuxwacom.sourceforge.net; + platforms = platforms.linux; # Probably, works with other unices as well }; } From d9de1677cc7d47c08245ba66a58661747de24f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 May 2010 19:48:18 +0000 Subject: [PATCH 151/342] OProfile 0.9.6. svn path=/nixpkgs/trunk/; revision=21615 --- .../tools/profiling/oprofile/default.nix | 27 +++++++++++++------ pkgs/top-level/all-packages.nix | 10 +++++-- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index c267b8f47fd..3e49c73e853 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, binutils, popt -, makeWrapper, gawk, which, gnugrep }: +{ stdenv, fetchurl, binutils, popt, makeWrapper, gawk, which, gnugrep +, qt ? null, libX11 ? null, libXext ? null, libpng ? null }: + +# libX11 is needed because the Qt build stuff automatically adds `-lX11'. +assert (qt != null) -> ((libX11 != null) && (libXext != null) + && (libpng != null)); stdenv.mkDerivation rec { - name = "oprofile-0.9.4"; + name = "oprofile-0.9.6"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "1pna65lpdxzbg4lcmpvayw1ibinbizrzwpdp0cq7vfinj0am456b"; + sha256 = "103q0w4wr5lnhg1yfdhc67dvdwzqpzml57fp4l6nbz29fw5d839z"; }; patchPhase = '' @@ -16,10 +20,14 @@ stdenv.mkDerivation rec { s|^PATH=.*$||g" ''; - # FIXME: Add optional Qt support. - buildInputs = [ binutils popt makeWrapper gawk which gnugrep ]; + buildInputs = [ binutils popt makeWrapper gawk which gnugrep ] + ++ stdenv.lib.optionals (qt != null) [ qt libX11 libXext libpng ]; - configureFlags = "--with-kernel-support --disable-shared"; + configureFlags = + [ "--with-kernel-support" + "--disable-shared" # needed because only the static libbfd is available + ] + ++ stdenv.lib.optional (qt != null) "--with-qt-dir=${qt}"; postInstall = '' wrapProgram "$out/bin/opcontrol" \ @@ -27,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Oprofile, a system-wide profiler for Linux"; + description = "OProfile, a system-wide profiler for Linux"; longDescription = '' OProfile is a system-wide profiler for Linux systems, capable of profiling all running code at low overhead. It consists of a @@ -42,5 +50,8 @@ stdenv.mkDerivation rec { ''; license = "GPLv2"; homepage = http://oprofile.sourceforge.net/; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f576e4108e..4acbce20f3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3249,8 +3249,14 @@ let }; oprofile = import ../development/tools/profiling/oprofile { - inherit fetchurl stdenv binutils popt; - inherit makeWrapper gawk which gnugrep; + inherit fetchurl stdenv binutils popt makeWrapper gawk which gnugrep; + + # Optional build inputs for the (useless) GUI. + /* + qt = qt3; + inherit (xlibs) libX11 libXext; + inherit libpng; + */ }; patchelf = useFromStdenv "patchelf" From 1edabb560c14770c09674e0fe330f0df9bd6effc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 May 2010 19:48:32 +0000 Subject: [PATCH 152/342] Make `nixUnstable' the default. svn path=/nixpkgs/trunk/; revision=21616 --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4acbce20f3f..2f09392cebf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9289,21 +9289,19 @@ let inherit stdenv fetchurl jdk makeWrapper; }; - nix = makeOverridable (import ../tools/package-management/nix) { + nix = nixUnstable; + + nixStable = makeOverridable (import ../tools/package-management/nix) { inherit fetchurl stdenv perl curl bzip2 openssl aterm; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }; - # The bleeding edge. - nixUnstable = nix; - /* nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { inherit fetchurl stdenv perl curl bzip2 openssl aterm; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }; - */ # The SQLite branch. nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) { From 83609f61915f1fa7f5de44162e3896e415095e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 May 2010 19:48:39 +0000 Subject: [PATCH 153/342] nixUnstable: Fix typo. svn path=/nixpkgs/trunk/; revision=21617 --- pkgs/tools/package-management/nix/unstable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index a33e64f55dc..03386da9a57 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "nix-0.16pre21576"; src = fetchurl { - url = "http://hydra.nixos.org/build/395008/download/4/${name}.bz2"; + url = "http://hydra.nixos.org/build/395008/download/4/${name}.tar.bz2"; sha256 = "1axmipk8vp9vwsq5wnhshgb0pcgbhanlxz8z2m3f5vxvixvw3i19"; }; From 588be9d6db00ac6dc7c6236b497b6db17d7fc371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 May 2010 19:48:46 +0000 Subject: [PATCH 154/342] Add a Linux kernel suitable for SystemTap. svn path=/nixpkgs/trunk/; revision=21618 --- .../os-specific/linux/kernel/linux-2.6.32.nix | 15 +++++++++---- pkgs/os-specific/linux/kernel/patches.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 +++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 013dc24332c..3a4ae7feacf 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -1,11 +1,11 @@ -args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" -, ... }: +args @ { stdenv, fetchurl, userModeLinux ? false, systemtap ? false +, extraConfig ? "", ... }: let configWithPlatform = kernelPlatform : '' # Don't include any debug features. - DEBUG_KERNEL n + DEBUG_KERNEL ${if systemtap then "y" else "n"} # Support drivers that need external firmware. STANDALONE n @@ -25,7 +25,6 @@ let # Disable some expensive (?) features. FTRACE n - KPROBES n NUMA? n PM_TRACE_RTC n @@ -191,6 +190,14 @@ let X86_CHECK_BIOS_CORRUPTION y X86_MCE y + ${if systemtap then '' + # SystemTap support. + KPROBES y # kernel probes (needs `utrace' for process probes) + DEBUG_INFO y + RELAY y + DEBUG_FS y + '' else ""} + ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f1ac2a37895..70e2f017697 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -114,4 +114,26 @@ in ''; }; + tracehook_2_6_32 = + { # From . + name = "tracehook"; + patch = fetchurl { + url = http://people.redhat.com/roland/utrace/2.6.32/tracehook.patch; + sha256 = "1y009p8dyqknbjm8ryb495jqmvl372gfhswdn167xh2g1f24xqv8"; + }; + }; + + utrace_2_6_32 = + { # From , depends on the + # `tracehook' patch above. + # See also . + name = "utrace"; + patch = fetchurl { + url = http://people.redhat.com/roland/utrace/2.6.32/utrace.patch; + sha256 = "1951mwc8jfiwrl0d2bb1zk9yrl7n7kadc00ymjsxrg2irda1b89r"; + }; + extraConfig = + '' UTRACE y + ''; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f09392cebf..3e7e0e4b889 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6143,6 +6143,17 @@ let ]; }; + linux_2_6_32_systemtap = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) { + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; + systemtap = true; + kernelPatches = + [ kernelPatches.fbcondecor_2_6_31 + kernelPatches.sec_perm_2_6_24 + kernelPatches.tracehook_2_6_32 + kernelPatches.utrace_2_6_32 + ]; + }; + linux_2_6_32_zen4 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.32-zen4.nix) { inherit fetchurl stdenv perl mktemp module_init_tools runCommand xz; }; @@ -6324,6 +6335,8 @@ let linuxPackages_2_6_29 = recurseIntoAttrs (linuxPackagesFor linux_2_6_29); linuxPackages_2_6_31 = recurseIntoAttrs (linuxPackagesFor linux_2_6_31); linuxPackages_2_6_32 = recurseIntoAttrs (linuxPackagesFor linux_2_6_32); + linuxPackages_2_6_32_systemtap = + recurseIntoAttrs (linuxPackagesFor linux_2_6_32_systemtap); linuxPackages_2_6_33 = recurseIntoAttrs (linuxPackagesFor linux_2_6_33); # The current default kernel / kernel modules. From 96f2d289bcbe75569e63baf9c07f73a195b5558e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 May 2010 19:48:52 +0000 Subject: [PATCH 155/342] Don't strip Linux modules in the SystemTap variant. svn path=/nixpkgs/trunk/; revision=21619 --- pkgs/os-specific/linux/kernel/builder.sh | 14 ++++++++------ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 75283e835de..b4fc969b05d 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -76,12 +76,14 @@ installPhase() { $makeFlags "${makeFlagsArray[@]}" \ $installFlags "${installFlagsArray[@]}" - # Strip the kernel modules. - echo "Stripping kernel modules..." - if [ -z "$crossConfig" ]; then - find $out -name "*.ko" -print0 | xargs -0 strip -S - else - find $out -name "*.ko" -print0 | xargs -0 $crossConfig-strip -S + if test -z "$dontStrip"; then + # Strip the kernel modules. + echo "Stripping kernel modules..." + if [ -z "$crossConfig" ]; then + find $out -name "*.ko" -print0 | xargs -0 strip -S + else + find $out -name "*.ko" -print0 | xargs -0 $crossConfig-strip -S + fi fi # move this to install later on diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7e0e4b889..fce763c743a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6146,6 +6146,7 @@ let linux_2_6_32_systemtap = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; systemtap = true; + dontStrip = true; kernelPatches = [ kernelPatches.fbcondecor_2_6_31 kernelPatches.sec_perm_2_6_24 From 222e41519e276258adb0a234f1a7310962bcfcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 5 May 2010 20:38:13 +0000 Subject: [PATCH 156/342] Making lame compile with assembly optimization for i386 svn path=/nixpkgs/trunk/; revision=21620 --- pkgs/applications/audio/lame/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lame/default.nix b/pkgs/applications/audio/lame/default.nix index f9c0e151c89..816afa0e24f 100644 --- a/pkgs/applications/audio/lame/default.nix +++ b/pkgs/applications/audio/lame/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, nasm}: stdenv.mkDerivation { name = "lame-3.98.2"; @@ -7,6 +7,10 @@ stdenv.mkDerivation { sha256 = "0cmgr515szd9kd19mpzvwl3cbnpfyjyi47swj4afblcfkmb2hym1"; }; + buildInputs = [ nasm ]; + + configureFlags = [ "--enable-nasm" ]; + # Either disable static, or fix the rpath of 'lame' for it to point # properly to the libmp3lame shared object. dontDisableStatic = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fce763c743a..22d3139835b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7861,7 +7861,7 @@ let }; lame = import ../applications/audio/lame { - inherit fetchurl stdenv; + inherit fetchurl stdenv nasm; }; ladspaH = import ../applications/audio/ladspa-plugins/ladspah.nix { From e7a10e71423b335403b1f42b3b422185d55d8e2b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 6 May 2010 09:33:40 +0000 Subject: [PATCH 157/342] Bumped KDE SC to version 4.4.3 svn path=/nixpkgs/trunk/; revision=21622 --- .../kde-4.4/accessibility/default.nix | 6 +- pkgs/desktops/kde-4.4/admin/default.nix | 6 +- pkgs/desktops/kde-4.4/artwork/default.nix | 6 +- .../desktops/kde-4.4/base-runtime/default.nix | 6 +- .../kde-4.4/base-workspace/default.nix | 6 +- pkgs/desktops/kde-4.4/base/default.nix | 6 +- pkgs/desktops/kde-4.4/bindings/default.nix | 6 +- pkgs/desktops/kde-4.4/edu/default.nix | 6 +- pkgs/desktops/kde-4.4/games/default.nix | 6 +- pkgs/desktops/kde-4.4/graphics/default.nix | 6 +- pkgs/desktops/kde-4.4/l10n/default.nix | 228 +++++++++--------- pkgs/desktops/kde-4.4/libs/default.nix | 6 +- pkgs/desktops/kde-4.4/multimedia/default.nix | 6 +- pkgs/desktops/kde-4.4/network/default.nix | 6 +- .../desktops/kde-4.4/oxygen-icons/default.nix | 6 +- pkgs/desktops/kde-4.4/pim-runtime/default.nix | 6 +- pkgs/desktops/kde-4.4/pim/default.nix | 6 +- pkgs/desktops/kde-4.4/pimlibs/default.nix | 6 +- .../kde-4.4/plasma-addons/default.nix | 6 +- pkgs/desktops/kde-4.4/sdk/default.nix | 6 +- pkgs/desktops/kde-4.4/toys/default.nix | 6 +- pkgs/desktops/kde-4.4/utils/default.nix | 6 +- pkgs/desktops/kde-4.4/webdev/default.nix | 6 +- 23 files changed, 180 insertions(+), 180 deletions(-) diff --git a/pkgs/desktops/kde-4.4/accessibility/default.nix b/pkgs/desktops/kde-4.4/accessibility/default.nix index 7929a6983b5..507764fef22 100644 --- a/pkgs/desktops/kde-4.4/accessibility/default.nix +++ b/pkgs/desktops/kde-4.4/accessibility/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeaccessibility-4.4.2"; + name = "kdeaccessibility-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdeaccessibility-4.4.2.tar.bz2; - sha256 = "10n08w7x5sna0ilc965yi1041dwm13s5r4fd1valmlx8wcckrj6q"; + url = mirror://kde/stable/4.4.3/src/kdeaccessibility-4.4.3.tar.bz2; + sha256 = "1j1v0bfl6kcapxwqa1ma19z61qx2vd4lx7b9dykkv7z3gq7c5y5m"; }; # Missing: speechd, I was too lazy to implement this buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.4/admin/default.nix b/pkgs/desktops/kde-4.4/admin/default.nix index 7bc551481d1..04e025a19b6 100644 --- a/pkgs/desktops/kde-4.4/admin/default.nix +++ b/pkgs/desktops/kde-4.4/admin/default.nix @@ -3,11 +3,11 @@ , kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeadmin-4.4.2"; + name = "kdeadmin-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdeadmin-4.4.2.tar.bz2; - sha256 = "0qzsfkf0gzhdzyyyfycz652ii8ivgin7zvzbkha3jz7kfbrskg9k"; + url = mirror://kde/stable/4.4.3/src/kdeadmin-4.4.3.tar.bz2; + sha256 = "08s0fagxgdk6p00qxzizrhs9010f6s9rlz7w07ri86m9ps9yd6am"; }; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.4/artwork/default.nix b/pkgs/desktops/kde-4.4/artwork/default.nix index 16fc4be88d9..d0ff4f3b2fd 100644 --- a/pkgs/desktops/kde-4.4/artwork/default.nix +++ b/pkgs/desktops/kde-4.4/artwork/default.nix @@ -2,10 +2,10 @@ , kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: stdenv.mkDerivation { - name = "kdeartwork-4.4.2"; + name = "kdeartwork-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdeartwork-4.4.2.tar.bz2; - sha256 = "1yb9p3nsayzp4vq0sq2ax0svmf6za73g4wzj3jcbs13j0gsvpz70"; + url = mirror://kde/stable/4.4.3/src/kdeartwork-4.4.3.tar.bz2; + sha256 = "0ivfqg9nr5lqa1dppc0p6aw816jy8zqj308dv367jqh1qbapx0cl"; }; buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; diff --git a/pkgs/desktops/kde-4.4/base-runtime/default.nix b/pkgs/desktops/kde-4.4/base-runtime/default.nix index 4c7033cf462..a337d987751 100644 --- a/pkgs/desktops/kde-4.4/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.4/base-runtime/default.nix @@ -2,10 +2,10 @@ , kdelibs, automoc4, phonon, strigi, soprano, cluceneCore, attica}: stdenv.mkDerivation { - name = "kdebase-runtime-4.4.2"; + name = "kdebase-runtime-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdebase-runtime-4.4.2.tar.bz2; - sha256 = "087g05k2zrlwk4n7n14nblflxxm3g28nzyyyx18jr4r2xq9x64b5"; + url = mirror://kde/stable/4.4.3/src/kdebase-runtime-4.4.3.tar.bz2; + sha256 = "1fyg804gl8hqzjicij8xs0gy7qdjnj6n4i8fxybk2wfn8mn5zgm1"; }; /* CLUCENE_HOME=cluceneCore;*/ # Still have to look into Soprano Virtuoso diff --git a/pkgs/desktops/kde-4.4/base-workspace/default.nix b/pkgs/desktops/kde-4.4/base-workspace/default.nix index e2c6052a618..738bd603431 100644 --- a/pkgs/desktops/kde-4.4/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.4/base-workspace/default.nix @@ -6,10 +6,10 @@ }: stdenv.mkDerivation { - name = "kdebase-workspace-4.4.2"; + name = "kdebase-workspace-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdebase-workspace-4.4.2.tar.bz2; - sha256 = "1g8rnpwpihk6sgvils9cafxz017d23ksg5i9x9275ilydslbsclc"; + url = mirror://kde/stable/4.4.3/src/kdebase-workspace-4.4.3.tar.bz2; + sha256 = "0fcjk6bmswal02lwsywvv44x8qi8vr3vr08rlgp8v9rc5yqv4mkz"; }; buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst kdepimlibs kdebindings boost libusb stdenv.gcc.libc libXi libXau libXdmcp diff --git a/pkgs/desktops/kde-4.4/base/default.nix b/pkgs/desktops/kde-4.4/base/default.nix index a11ca3cadad..14f48fbd273 100644 --- a/pkgs/desktops/kde-4.4/base/default.nix +++ b/pkgs/desktops/kde-4.4/base/default.nix @@ -3,10 +3,10 @@ , automoc4, phonon, strigi, qimageblitz, soprano}: stdenv.mkDerivation { - name = "kdebase-4.4.2"; + name = "kdebase-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdebase-4.4.2.tar.bz2; - sha256 = "1bf75y7barmymaf810n66qf47jfrn1vfqpqn5rsls8r8wjcz0j71"; + url = mirror://kde/stable/4.4.3/src/kdebase-4.4.3.tar.bz2; + sha256 = "15adml1rlpsgdy7ynbgzh3rnlzi1ynz42dmbjqz5yrv6l2pbgjag"; }; buildInputs = [ cmake perl qt4 kdelibs pciutils stdenv.gcc.libc libraw1394 kdebase_workspace automoc4 phonon strigi qimageblitz soprano ]; diff --git a/pkgs/desktops/kde-4.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix index 2a7bbee3c62..61a2207a0cc 100644 --- a/pkgs/desktops/kde-4.4/bindings/default.nix +++ b/pkgs/desktops/kde-4.4/bindings/default.nix @@ -6,10 +6,10 @@ # some bindings are even broken. stdenv.mkDerivation { - name = "kdebindings-4.4.2"; + name = "kdebindings-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdebindings-4.4.2.tar.bz2; - sha256 = "0172xbm1mkg9zhbqjqhvc1iizaqiv7vl5d2n6rz3k9b6mpm01jyp"; + url = mirror://kde/stable/4.4.3/src/kdebindings-4.4.3.tar.bz2; + sha256 = "0gna0fwhm05pyxqanz68vvav7ahxzffwh2ry1zadfpzwmq5srnpg"; }; #builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.4/edu/default.nix b/pkgs/desktops/kde-4.4/edu/default.nix index ca228e4d566..8ade568e2d8 100644 --- a/pkgs/desktops/kde-4.4/edu/default.nix +++ b/pkgs/desktops/kde-4.4/edu/default.nix @@ -3,10 +3,10 @@ , kdelibs, automoc4, phonon, eigen, attica}: stdenv.mkDerivation { - name = "kdeedu-4.4.2"; + name = "kdeedu-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdeedu-4.4.2.tar.bz2; - sha256 = "0fgqsizp1vm0yp6nirbqbxj0kvbqvnb8q3wxzav4hhn85r294ps7"; + url = mirror://kde/stable/4.4.3/src/kdeedu-4.4.3.tar.bz2; + sha256 = "17hb1j7dy5ccgmna26cabng0z48qdhl8z0w2grm83a1a9szq2y4x"; }; #TODO: facile, indi, boost.python, cfitsio, R, qalculate buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl xplanet diff --git a/pkgs/desktops/kde-4.4/games/default.nix b/pkgs/desktops/kde-4.4/games/default.nix index 22e2fdf8a35..286a47b8c92 100644 --- a/pkgs/desktops/kde-4.4/games/default.nix +++ b/pkgs/desktops/kde-4.4/games/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, phonon, qca2}: stdenv.mkDerivation { - name = "kdegames-4.4.2"; + name = "kdegames-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdegames-4.4.2.tar.bz2; - sha256 = "15qj5nj39fbv0643rk3jr1ygi46jw439qs7zvwqr0w35r3k6kp6w"; + url = mirror://kde/stable/4.4.3/src/kdegames-4.4.3.tar.bz2; + sha256 = "0i14zd0jxbgrvxgpwq80ghfbhcj9awq1rh7g5716j514wl25nqpl"; }; buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 phonon qca2 ]; meta = { diff --git a/pkgs/desktops/kde-4.4/graphics/default.nix b/pkgs/desktops/kde-4.4/graphics/default.nix index c95db63c557..563e98ab544 100644 --- a/pkgs/desktops/kde-4.4/graphics/default.nix +++ b/pkgs/desktops/kde-4.4/graphics/default.nix @@ -3,10 +3,10 @@ , kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: stdenv.mkDerivation { - name = "kdegraphics-4.4.2"; + name = "kdegraphics-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdegraphics-4.4.2.tar.bz2; - sha256 = "1q4yzi4y0zfjy1avbcax7sykb0g3ib01v12lg6ydxgvf3bvxibmz"; + url = mirror://kde/stable/4.4.3/src/kdegraphics-4.4.3.tar.bz2; + sha256 = "0f7mw91fr2gx5ycdpb4b3c4d382933fqfhpsfvifpphkg1p0hy54"; }; buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre poppler chmlib shared_mime_info stdenv.gcc.libc libXxf86vm diff --git a/pkgs/desktops/kde-4.4/l10n/default.nix b/pkgs/desktops/kde-4.4/l10n/default.nix index a0117997dda..1c14dbe7a9f 100644 --- a/pkgs/desktops/kde-4.4/l10n/default.nix +++ b/pkgs/desktops/kde-4.4/l10n/default.nix @@ -23,344 +23,344 @@ in ar = deriv { lang = "ar"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ar-4.4.2.tar.bz2"; - sha256 = "1vx0x08x2xqc0wcyjxnxfvb00vfgn99xzq8jx0408yj7mbm0a7h1"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ar-4.4.3.tar.bz2"; + sha256 = "1gnrnkkmchfwjdc712fkh6apl17d2nmnyyliim8k935s5nx40469"; }; bg = deriv { lang = "bg"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-bg-4.4.2.tar.bz2"; - sha256 = "1jfwrl68b36220bffhqqgbj21cqgn7rw777skzn6gvzd6q19848f"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-bg-4.4.3.tar.bz2"; + sha256 = "1zqb07b77lpbk36xgz9s2hrxjwaayqcmp13apqnpbxdjfi98c40p"; }; ca = deriv { lang = "ca"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ca-4.4.2.tar.bz2"; - sha256 = "0mvls8fd9qzfj1qhv0lizm3vr22qxzpc0kkdcn77pc2ayrwx2psz"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ca-4.4.3.tar.bz2"; + sha256 = "1y4kp45mm2bqd7sh4p94q7z737n7d56sfca01l4k2z6if2mfdqyv"; }; cs = deriv { lang = "cs"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-cs-4.4.2.tar.bz2"; - sha256 = "1x3yglhq3g159w0smrd9zg2blnk6xpc5bqdj6136rd9xh3xhg2m3"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-cs-4.4.3.tar.bz2"; + sha256 = "01drz8cxaqh6vf1pk6pp18bdv4a5imgc1ajsv6cybc2sa63wff3m"; }; csb = deriv { lang = "csb"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-csb-4.4.2.tar.bz2"; - sha256 = "1jh3rqm95glz6xbl4fpydz13vhq6z3nys6hqbayvk3x4bygd2zy6"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-csb-4.4.3.tar.bz2"; + sha256 = "1slii5r0s7s8wgmh3j0lxk5k7crpqyn3cyn0shh3fycpi3dhazlh"; }; da = deriv { lang = "da"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-da-4.4.2.tar.bz2"; - sha256 = "15y8zp15sb8yqhbck3xkpw6h1aabslsddywcwk6d9y6ipw79vnal"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-da-4.4.3.tar.bz2"; + sha256 = "17kjf2np54kg0s7gimsf4mh93zjvvs2drasb4ayw9phkdcs4a5b0"; }; de = deriv { lang = "de"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-de-4.4.2.tar.bz2"; - sha256 = "0xnxm7xlx777y0cx681155nzda68xbnmnf62gjvd6pxpcd40s3hk"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-de-4.4.3.tar.bz2"; + sha256 = "0v14qf47cvldxg2rlwgakxliamn04x77df48d7g1hzwapvd9s0dd"; }; el = deriv { lang = "el"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-el-4.4.2.tar.bz2"; - sha256 = "0jn3fwyy22s4nabzpl3pslp5z63yb50l29ca8rg4j7mz46xbsb3w"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-el-4.4.3.tar.bz2"; + sha256 = "03bf7lrm2bkxq2q0h18c4ksa3pbxr5yv9363z0396px4zy6srn3p"; }; en_GB = deriv { lang = "en_GB"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-en_GB-4.4.2.tar.bz2"; - sha256 = "1vzlbax5m68xvgwp8ls4i8bj1lvh8bj88jh65wqqpf5w2rj3ndbk"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-en_GB-4.4.3.tar.bz2"; + sha256 = "0jzvybpq9nnnw8cqp3izj7x804gd05q4mzjl8pxvv56s622zdda4"; }; eo = deriv { lang = "eo"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-eo-4.4.2.tar.bz2"; - sha256 = "0z3320czlwvsjij5rfv1drv6x4d61aqvxsq1yj876av4w7pys7r9"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-eo-4.4.3.tar.bz2"; + sha256 = "1br75zkyrl0imk0bnr4prcm4w4xmkg8qnjs2yn6842d8m4ffy2q0"; }; es = deriv { lang = "es"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-es-4.4.2.tar.bz2"; - sha256 = "0fsqcj809vf2zahkiqlmdxzpxzgwj437267lgfdjp65amsfw2cmd"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-es-4.4.3.tar.bz2"; + sha256 = "1vxjxgsvb3fr904nv6s84b0a0nbchv7599gfnirwbdklglbla85h"; }; et = deriv { lang = "et"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-et-4.4.2.tar.bz2"; - sha256 = "189y04kgbjx3pbbp46g1v9i5h9bz02zfgvy4l6nw1v97bnkrkjrr"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-et-4.4.3.tar.bz2"; + sha256 = "0r6l1b1pfkry45g5wmii4d5ysalg9w8544dkbib374wjn9zm26qc"; }; eu = deriv { lang = "eu"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-eu-4.4.2.tar.bz2"; - sha256 = "0v41s33lvmyrlsn6cvqj42b8r0d36lci8lins3212g0sw5fkc83p"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-eu-4.4.3.tar.bz2"; + sha256 = "0rpdalv8bhmvv0cgf4wjdnlqamjqil7sl1brqv74p2dlhlsz03n7"; }; fi = deriv { lang = "fi"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fi-4.4.2.tar.bz2"; - sha256 = "0j90qd3ll1ycj8d5ms4rmbkbw280cvgx47z5q6byfv4qaq2sq2bv"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fi-4.4.3.tar.bz2"; + sha256 = "1m5czzfmjg9gvw0jyfa875gb7h33yb179vgissddfjmmhap0yypn"; }; fr = deriv { lang = "fr"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fr-4.4.2.tar.bz2"; - sha256 = "0sf0fdvmqrv6qxy6bmvb03fq9vdv1y4y28475s6vn6alz94q9ga1"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fr-4.4.3.tar.bz2"; + sha256 = "1whk3a40cc2yiq7biql5klhl2k9h1bi3pilm0yskl0x6x8cdsn3d"; }; fy = deriv { lang = "fy"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-fy-4.4.2.tar.bz2"; - sha256 = "1jb1mmw08bf9rmm8qipfwc86w9klcs1zynsyjfabc4p38jp4pirn"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-fy-4.4.3.tar.bz2"; + sha256 = "1xwk1jqalj47iky3cda7z053jsihi0hf4k7sh2cdgvy50n5wj8bi"; }; ga = deriv { lang = "ga"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ga-4.4.2.tar.bz2"; - sha256 = "0pijkmbj0bspwcrncn890ycgf2hxh2yxsayry0fkl9rcxz556bwy"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ga-4.4.3.tar.bz2"; + sha256 = "0y3p8kj1fm88s5g7md6fwf3hlk5fshaywyw2l5bvx9vrhdv757f1"; }; gl = deriv { lang = "gl"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-gl-4.4.2.tar.bz2"; - sha256 = "02ccvdabnwp112483k2yb1w3b390cg61a7wl3pw02kkmxx5lcc7n"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-gl-4.4.3.tar.bz2"; + sha256 = "0j8f4185hq162d4xvk0qzv5drqz1sfx7k2pamqp9vf87js193m1v"; }; gu = deriv { lang = "gu"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-gu-4.4.2.tar.bz2"; - sha256 = "1dzpmwf7n29w3hfzhbyvj06jbs1mxxn46g9w98mclbis9ign10p1"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-gu-4.4.3.tar.bz2"; + sha256 = "141gdz79g2g13c36ci0pzk582s9kj7s47brzamidw683ndjvsarq"; }; he = deriv { lang = "he"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-he-4.4.2.tar.bz2"; - sha256 = "0my1l4nsjpyjgx118jdw5px0pmb621pyns5c4708y9if8pwdv7hv"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-he-4.4.3.tar.bz2"; + sha256 = "0safk2vzpr3v1kbm236d4ayvqqa4i5zz8jppabr2zbak522sk6nf"; }; hi = deriv { lang = "hi"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hi-4.4.2.tar.bz2"; - sha256 = "0rj4bny1kv7rwnj01vcjxxa620vsdx5v03va4szhgdv4bm04j011"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hi-4.4.3.tar.bz2"; + sha256 = "08n1id22k46cnd8jkqczhxp33cz33bay1mkq1zqbwk4nxn9n5b42"; }; hr = deriv { lang = "hr"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hr-4.4.2.tar.bz2"; - sha256 = "1l7vnjsklqk0dcb4zccifl77gaa9k72j70d0fa3vmw1bf0y7yld7"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hr-4.4.3.tar.bz2"; + sha256 = "061m5z4fnv7h67g05izdghrpa9bh0f3pk89s7wpk2w41pdpzk98j"; }; hu = deriv { lang = "hu"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-hu-4.4.2.tar.bz2"; - sha256 = "1zwxg38lspan3z3y3an4ypm7wwf1qgv1kz9k7p9jqj661j58g0j8"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-hu-4.4.3.tar.bz2"; + sha256 = "00jk5ccq7ds9gcx4qb08i85cll9qs0wprw949412hbylwwj7c0qm"; }; id = deriv { lang = "id"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-id-4.4.2.tar.bz2"; - sha256 = "0h59z03q9rv07g8hyzh2km0l0znddvflxz9jb047rgyll1ah96js"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-id-4.4.3.tar.bz2"; + sha256 = "0c64s38vzwjfdjanljspxqaishmw0c7qz7z2s4gc70bws02dz87b"; }; is = deriv { lang = "is"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-is-4.4.2.tar.bz2"; - sha256 = "15dz28jrzb38mn19l3wgprh9p2q1xsd08c25m911849fn4kvcs59"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-is-4.4.3.tar.bz2"; + sha256 = "17kv9lkiy60kfk9v535fpnx3v2v4vvnjyk0qqp0nigyg2sa2ylhl"; }; it = deriv { lang = "it"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-it-4.4.2.tar.bz2"; - sha256 = "1hqw8k6gns66clfaxyqdvbxmac1p2j2nl5vzabb9dxqxm6i4a6dm"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-it-4.4.3.tar.bz2"; + sha256 = "17czl01vskisy5fsyk774rdsdrf86pihqqrf6r80flpgd5wf33ym"; }; ja = deriv { lang = "ja"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ja-4.4.2.tar.bz2"; - sha256 = "0awyr5iad03gjb2agcvyzpiq3hh3jdgar970n9g8d6in5p33jnba"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ja-4.4.3.tar.bz2"; + sha256 = "0124xnkkwxdjfmpqbascqfsd3v82r2f4vjjp11yzp8fzfz41qqzz"; }; kk = deriv { lang = "kk"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-kk-4.4.2.tar.bz2"; - sha256 = "173i7f236c55nsfn9m24s3pn63fkp51wylgj2whqi6pl3s2f2iz1"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-kk-4.4.3.tar.bz2"; + sha256 = "1kyzmw0x7cvhf7bgryvk1c0sqg0cw6qnzalrky451brf82r5k4fk"; }; km = deriv { lang = "km"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-km-4.4.2.tar.bz2"; - sha256 = "0d9y8hvb2r55gj41g7gpr5iiz1dmayg05ry1yy1w1f800iv5756x"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-km-4.4.3.tar.bz2"; + sha256 = "0jyc03zw15bynpjn1ddnb8xzjl2vkkf017yb5g5i5a5jxwp04ca4"; }; kn = deriv { lang = "kn"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-kn-4.4.2.tar.bz2"; - sha256 = "1s1ig0pa804mx59b7sxci3i5pa1gqb4naw123vay8g0mkq3jjnqn"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-kn-4.4.3.tar.bz2"; + sha256 = "09wkq79g7rayvv3khx3g8hmzqmlq7pa95wzvixyrdnh9fwk0mm36"; }; ko = deriv { lang = "ko"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ko-4.4.2.tar.bz2"; - sha256 = "0x0gbpa0f21rm2ls2kjyjbz9wl1yj8bsc0qc3bl5g6xk4kr6j634"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ko-4.4.3.tar.bz2"; + sha256 = "0dhkly119cgrmyil0c7zci77hf5w5k2pjaqgz9xx5g2k9jxf8f9q"; }; lt = deriv { lang = "lt"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-lt-4.4.2.tar.bz2"; - sha256 = "0jxdwqi7lz9brxw80kfix5wxx1x421n628zf4dkyd7szdl3svxc8"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-lt-4.4.3.tar.bz2"; + sha256 = "1z4gimw4wdig1x0y8h780a2msdsy8rrpaqh8a5vpskjrx67y0pnh"; }; lv = deriv { lang = "lv"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-lv-4.4.2.tar.bz2"; - sha256 = "03yi2gj8ckdmz8wyq8dj1kwzl7g8xz5g3ppmw2h4w6xmh0kdbkdy"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-lv-4.4.3.tar.bz2"; + sha256 = "1gfh2bamgbsxd042gjnw7x41qw6svw8dq6vz842lkkygdfplk679"; }; mai = deriv { lang = "mai"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-mai-4.4.2.tar.bz2"; - sha256 = "069mx66ib9bwjh0c0ndnsdrj2xlzdbbihz9yc4br1vd3disj1jd2"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-mai-4.4.3.tar.bz2"; + sha256 = "0bx7wzqm2h3gsinpx0njsmb1x6s1jpj5v6cny5vrjawdm30zbxp4"; }; mk = deriv { lang = "mk"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-mk-4.4.2.tar.bz2"; - sha256 = "01k1bzmmq8g59xvyn4pxxapbd8x1a85ps2z241zlhlrpmi6faja8"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-mk-4.4.3.tar.bz2"; + sha256 = "0yjhi7v4xfbcxp6z8ycfxqixx2prmv6d05bvlaas4l83vc4i62w7"; }; ml = deriv { lang = "ml"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ml-4.4.2.tar.bz2"; - sha256 = "0vpj5i30p6hbabvqyfkzyjcwqblh2qz167bja3589halhdiadhf4"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ml-4.4.3.tar.bz2"; + sha256 = "1bd4bb5q70w6k5yqnx2ndrchi745jszih9mi9xsj6v6m8zsn285c"; }; nb = deriv { lang = "nb"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nb-4.4.2.tar.bz2"; - sha256 = "1kh0cwfds7gh5rda4vhccwrjlgmbvcgkwr9gyiy8ssx02absqcz0"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nb-4.4.3.tar.bz2"; + sha256 = "0l4wab6c5sx10a9scimbw4nsmfy58jm7rgrb94sv2v34awnkysji"; }; nds = deriv { lang = "nds"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nds-4.4.2.tar.bz2"; - sha256 = "18h7j89dmc95b24fgziixmfz1x8jhxnpwanhq3yb3f243j7rkvmn"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nds-4.4.3.tar.bz2"; + sha256 = "0njih51wyj21dk2m7z2165w5ywk3v3w6zqdnvjby489q1laqi9hc"; }; nl = deriv { lang = "nl"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nl-4.4.2.tar.bz2"; - sha256 = "0s2941ywppgpnvafqqbfciliv6qllsjm5migzbqd5pwhpjifjjsl"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nl-4.4.3.tar.bz2"; + sha256 = "11hwijl2x8m9ianr5sniig1rqfdks7z72xaax9n922qf4i8v6n5g"; }; nn = deriv { lang = "nn"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-nn-4.4.2.tar.bz2"; - sha256 = "1phl56asdsn30wk2k9q6dhy99jvy2n11w2ny680jzdpc7gqp7j1n"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-nn-4.4.3.tar.bz2"; + sha256 = "1wzvaj5im4kwgwxlbig2pdckiijdks3za5ixjc00axk0zkf16604"; }; pa = deriv { lang = "pa"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pa-4.4.2.tar.bz2"; - sha256 = "0d5nksy2wr0glq5n82knfl4hhc6na55y5dp20q678agvxyz7nq94"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pa-4.4.3.tar.bz2"; + sha256 = "1zdvzk49x9f1fn87sglw5hm2pfjplx94kxra0qyhvy7v899bmixq"; }; pl = deriv { lang = "pl"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pl-4.4.2.tar.bz2"; - sha256 = "1jbxbrqcp2cn6wijsm8jpqj925b5dc3s7120jqp4w25lr92gnip1"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pl-4.4.3.tar.bz2"; + sha256 = "0fwfc1h3iwmzl52b1wk1bpxghvy0a8ipp26c813jpv5pqnds777w"; }; pt = deriv { lang = "pt"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pt-4.4.2.tar.bz2"; - sha256 = "1c17axsrjxjq101wd0yihf098q3lhwxqii2i4wcjpvi3iarrc5ri"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pt-4.4.3.tar.bz2"; + sha256 = "0ccswd7lvkpfd2hpzmlvg2dwylzaf1kp0r2dv080308cnji45j28"; }; pt_BR = deriv { lang = "pt_BR"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-pt_BR-4.4.2.tar.bz2"; - sha256 = "0hkrj5kps37xifzsj89d9ky0hq7ddk9jblaccg22bwc4vh3d5vh1"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-pt_BR-4.4.3.tar.bz2"; + sha256 = "1a2fwnlj9pcxjy9fkcciiry42fi7wpdkb5qhim5v1vg1j4ah6zz8"; }; ro = deriv { lang = "ro"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ro-4.4.2.tar.bz2"; - sha256 = "04qpzdic051xib0xnlg0jw9lnp45wgqc85l91a4pl50w3afcjcx2"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ro-4.4.3.tar.bz2"; + sha256 = "1f3ikjg19g2lnbrwcryvi4pz0hdy4prq91jw2s1a8cadh3yjr0bz"; }; ru = deriv { lang = "ru"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-ru-4.4.2.tar.bz2"; - sha256 = "0pbmr5pddys3rmsfy4zmynhzb3lc9381k2kw4nw3sqgv888p3xwv"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-ru-4.4.3.tar.bz2"; + sha256 = "0f888p973amz0nfahk48ayp20nc76f2rnxhdf4xr0y6rk3a5q3ah"; }; si = deriv { lang = "si"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-si-4.4.2.tar.bz2"; - sha256 = "1kw60d4v71vrfpb9fcsvjk0inaws1p2wsd3cw3sr2xnqk9yiwx1l"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-si-4.4.3.tar.bz2"; + sha256 = "08yfm46abd58fralkyc7mfg20hmk34y5xpnqi09g2xys1ab630bq"; }; sk = deriv { lang = "sk"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sk-4.4.2.tar.bz2"; - sha256 = "1h3nkgvzifkk456kdnj0fmi4aazn08lz1s4km8699gl15zv6i5zx"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sk-4.4.3.tar.bz2"; + sha256 = "1nnr8mwz24nlc0cy4jkwam7bvdk71vqd0w4ncfjbqi31p69bq12w"; }; sl = deriv { lang = "sl"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sl-4.4.2.tar.bz2"; - sha256 = "0671a6crik2wn40kbvfa7dvwxdyznmac3frpvr2g20430g6d58n3"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sl-4.4.3.tar.bz2"; + sha256 = "06j62vh78a32ygawvb81d5jsz8canw2w973cjay4qi104ibl8x7q"; }; sr = deriv { lang = "sr"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sr-4.4.2.tar.bz2"; - sha256 = "12pbjyij5dp9y6kxw995zw07fa174yaidc9mxsx0kv34sylnz9yn"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sr-4.4.3.tar.bz2"; + sha256 = "1yyrqdagfssclj0amw7hnsgdsm1ma3jx03m75kz1xz4dwx044b2q"; }; sv = deriv { lang = "sv"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-sv-4.4.2.tar.bz2"; - sha256 = "1hs8szh09av5900s3cfjrmx8ynyz3ggv7l6gaaxsy4vfvslvd8vc"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-sv-4.4.3.tar.bz2"; + sha256 = "1gynji087fk4iy0410qlh92j1z61mqafbkvw3gy6s82ava77i6i3"; }; tg = deriv { lang = "tg"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-tg-4.4.2.tar.bz2"; - sha256 = "0mjlq6sbknd8lan9vaj8479a0hd6gk272d5an5n6d3m4q68smsx5"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-tg-4.4.3.tar.bz2"; + sha256 = "0vg1sfpyvsi81qaiqb0cln21dvvvck7zvbzyic7cb0028a3619wr"; }; tr = deriv { lang = "tr"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-tr-4.4.2.tar.bz2"; - sha256 = "1g7lr6by3i32x0la20r1dsjbf6z376bd065rnfwdhnibaaidqm2p"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-tr-4.4.3.tar.bz2"; + sha256 = "0lc8sj6lqidjrhhwipi98kkvc3y0bnn6d04j9dhf2z972bcfpfbp"; }; uk = deriv { lang = "uk"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-uk-4.4.2.tar.bz2"; - sha256 = "13px5in34hkzwx25525cjbqlnxghqws1rnipm0mhb9q4yww98ccx"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-uk-4.4.3.tar.bz2"; + sha256 = "1qkpd4qms5gx2lgmciwqbpdrvh251dlgrckzxxd3ch1z8ns2d3xa"; }; wa = deriv { lang = "wa"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-wa-4.4.2.tar.bz2"; - sha256 = "0g3jy5d5zxp8996i3n3g6fzlnsgkjf828x2xjz9494nx176xqdkk"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-wa-4.4.3.tar.bz2"; + sha256 = "1f8pm69dlx1wvn56km2skk1xm602jfk0984fzhqhpdkkmji8cijn"; }; zh_CN = deriv { lang = "zh_CN"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-zh_CN-4.4.2.tar.bz2"; - sha256 = "1yg2wg7pyknrc12fv9h78xh4imcqlzy5xxg266npv4c3n6b90xdh"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-zh_CN-4.4.3.tar.bz2"; + sha256 = "0103wgjqnw542n1492ll7psmly84rxc7q68r6zmszmd2s6nbhlvm"; }; zh_TW = deriv { lang = "zh_TW"; - url = "mirror://kde/stable/4.4.2/src/kde-l10n/kde-l10n-zh_TW-4.4.2.tar.bz2"; - sha256 = "17q3ymwvrpp81rjw7vz60l3z6yg9mja0h5v37chzlbfnfdhngq39"; + url = "mirror://kde/stable/4.4.3/src/kde-l10n/kde-l10n-zh_TW-4.4.3.tar.bz2"; + sha256 = "08bnljg956948gfm380dlqllj090bv1gpc0y2w7gpq3cd3mqd0xv"; }; } diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix index 280bb2214a1..efebc6a639f 100644 --- a/pkgs/desktops/kde-4.4/libs/default.nix +++ b/pkgs/desktops/kde-4.4/libs/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation { - name = "kdelibs-4.4.2"; + name = "kdelibs-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdelibs-4.4.2.tar.bz2; - sha256 = "02kcw716hmkcvsz7sc823m7lzkmacb526fajkq54gxqa6fc2yr15"; + url = mirror://kde/stable/4.4.3/src/kdelibs-4.4.3.tar.bz2; + sha256 = "0a049wgfl01g029ayg7pvw8fssp74p5d69d94lmfcrlzbwa0zwlk"; }; buildInputs = [ diff --git a/pkgs/desktops/kde-4.4/multimedia/default.nix b/pkgs/desktops/kde-4.4/multimedia/default.nix index f33a4d748c0..7023e15543a 100644 --- a/pkgs/desktops/kde-4.4/multimedia/default.nix +++ b/pkgs/desktops/kde-4.4/multimedia/default.nix @@ -2,10 +2,10 @@ , kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdemultimedia-4.4.2"; + name = "kdemultimedia-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdemultimedia-4.4.2.tar.bz2; - sha256 = "15qq25ijnv0jsmxpc5fv7hwianxpqsz8i89j460kndm4pyplhdbj"; + url = mirror://kde/stable/4.4.3/src/kdemultimedia-4.4.3.tar.bz2; + sha256 = "0lpwmplwiy6j9rc8vhwp95c64ym7hc8zh6zm41578pvdqgdy6y5j"; }; buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia lame kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix index 8192b06da94..54331b69b8d 100644 --- a/pkgs/desktops/kde-4.4/network/default.nix +++ b/pkgs/desktops/kde-4.4/network/default.nix @@ -4,10 +4,10 @@ , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}: stdenv.mkDerivation { - name = "kdenetwork-4.4.2"; + name = "kdenetwork-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdenetwork-4.4.2.tar.bz2; - sha256 = "08rlbixv1q3x3zscyfr2jpdr33rgaw54hyszyd92ny6l13g2hf56"; + url = mirror://kde/stable/4.4.3/src/kdenetwork-4.4.3.tar.bz2; + sha256 = "1p2cx7vr811vrx4d0sqchgz5jy195rw2nbg01brk8i0ihiqfqycg"; }; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l diff --git a/pkgs/desktops/kde-4.4/oxygen-icons/default.nix b/pkgs/desktops/kde-4.4/oxygen-icons/default.nix index ffbda87177a..0e509e9c8d2 100644 --- a/pkgs/desktops/kde-4.4/oxygen-icons/default.nix +++ b/pkgs/desktops/kde-4.4/oxygen-icons/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake}: stdenv.mkDerivation { - name = "oxygen-icons-4.4.2"; + name = "oxygen-icons-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/oxygen-icons-4.4.2.tar.bz2; - sha256 = "0n0pyf861a5y1j03d9qyb8w7xnn81w2i503pv3lh48bvk1pc0zim"; + url = mirror://kde/stable/4.4.3/src/oxygen-icons-4.4.3.tar.bz2; + sha256 = "1pqz6l8zdijcz4r2qrkx92skcqbijiip90m2j3aiawr1m6rv2l0j"; }; buildInputs = [ cmake ]; meta = { diff --git a/pkgs/desktops/kde-4.4/pim-runtime/default.nix b/pkgs/desktops/kde-4.4/pim-runtime/default.nix index 4238666d6ab..914523dea66 100644 --- a/pkgs/desktops/kde-4.4/pim-runtime/default.nix +++ b/pkgs/desktops/kde-4.4/pim-runtime/default.nix @@ -3,10 +3,10 @@ , automoc4, phonon, akonadi, soprano, strigi}: stdenv.mkDerivation { - name = "kdepim-runtime-4.4.2"; + name = "kdepim-runtime-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdepim-runtime-4.4.2.tar.bz2; - sha256 = "05baz0wslxyvdilwj1lx9gg77xh51pa5ah91855vkfsjlc0qzvcs"; + url = mirror://kde/stable/4.4.3/src/kdepim-runtime-4.4.3.tar.bz2; + sha256 = "128azx9bw2fzc9780kf9pzvf745y8kflyb2vrb7mdwmskbr0gm3g"; }; buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info kdelibs kdepimlibs diff --git a/pkgs/desktops/kde-4.4/pim/default.nix b/pkgs/desktops/kde-4.4/pim/default.nix index 314c32d4bcf..402d41c2da9 100644 --- a/pkgs/desktops/kde-4.4/pim/default.nix +++ b/pkgs/desktops/kde-4.4/pim/default.nix @@ -3,10 +3,10 @@ , kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: stdenv.mkDerivation { - name = "kdepim-4.4.2"; + name = "kdepim-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdepim-4.4.2.tar.bz2; - sha256 = "0dnk0gv3l4ls70jgy1w9z312gvdyv1bvl9w911dyv1qmfg8cc7w4"; + url = mirror://kde/stable/4.4.3/src/kdepim-4.4.3.tar.bz2; + sha256 = "0lpr9q1p89hw22d545yc9ih8m5wmnzc7j7m9cvliyalkk0ys5lqa"; }; builder = ./builder.sh; buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt diff --git a/pkgs/desktops/kde-4.4/pimlibs/default.nix b/pkgs/desktops/kde-4.4/pimlibs/default.nix index 7f4c4282001..97686c9d38e 100644 --- a/pkgs/desktops/kde-4.4/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.4/pimlibs/default.nix @@ -2,10 +2,10 @@ , kdelibs, automoc4, phonon, akonadi}: stdenv.mkDerivation { - name = "kdepimlibs-4.4.2"; + name = "kdepimlibs-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdepimlibs-4.4.2.tar.bz2; - sha256 = "071rxf3ym3yf4klzy5dcvrppfm6lm8lhfphidgq97in322g76kl8"; + url = mirror://kde/stable/4.4.3/src/kdepimlibs-4.4.3.tar.bz2; + sha256 = "1q95zwkncady9lviz7bs9pnp1fkqlmnp33vj446m3krwjdh19b4c"; }; buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap shared_mime_info kdelibs automoc4 phonon akonadi ]; diff --git a/pkgs/desktops/kde-4.4/plasma-addons/default.nix b/pkgs/desktops/kde-4.4/plasma-addons/default.nix index 57f60fbcf91..676792f1f05 100644 --- a/pkgs/desktops/kde-4.4/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.4/plasma-addons/default.nix @@ -3,10 +3,10 @@ , automoc4, phonon, soprano, eigen, qimageblitz, attica}: stdenv.mkDerivation { - name = "kdeplasma-addons-4.4.2"; + name = "kdeplasma-addons-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdeplasma-addons-4.4.2.tar.bz2; - sha256 = "044xfs4j98wgc0zjfxsml7wlydna3h31zdpxnkv178sq592m1pid"; + url = mirror://kde/stable/4.4.3/src/kdeplasma-addons-4.4.3.tar.bz2; + sha256 = "00pr74x0q88wn7a4v6m35djcd29yw870fd6dgklqp1zs5yrn0p97"; }; inherit kdebase_workspace; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.4/sdk/default.nix b/pkgs/desktops/kde-4.4/sdk/default.nix index 1023bdf4742..91ddaf87e05 100644 --- a/pkgs/desktops/kde-4.4/sdk/default.nix +++ b/pkgs/desktops/kde-4.4/sdk/default.nix @@ -3,10 +3,10 @@ , kdelibs, kdepimlibs, automoc4, phonon, strigi}: stdenv.mkDerivation { - name = "kdesdk-4.4.2"; + name = "kdesdk-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdesdk-4.4.2.tar.bz2; - sha256 = "1cjbk35cqjif1ng8mlb5lcsilcxy9j62iviz8mzrwivdf9sixa1r"; + url = mirror://kde/stable/4.4.3/src/kdesdk-4.4.3.tar.bz2; + sha256 = "01wqyixni9sb4330b1cvaysaf7jsvmy9ijjryv8ixnaam3gkxzs7"; }; builder=./builder.sh; inherit aprutil; diff --git a/pkgs/desktops/kde-4.4/toys/default.nix b/pkgs/desktops/kde-4.4/toys/default.nix index 73d74b1fa69..58c0bedd75d 100644 --- a/pkgs/desktops/kde-4.4/toys/default.nix +++ b/pkgs/desktops/kde-4.4/toys/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}: stdenv.mkDerivation { - name = "kdetoys-4.4.2"; + name = "kdetoys-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdetoys-4.4.2.tar.bz2; - sha256 = "12yqykbl278w19wxaa6yl9m72ykih81v0rwgnfn0bq3zkwj1z5y0"; + url = mirror://kde/stable/4.4.3/src/kdetoys-4.4.3.tar.bz2; + sha256 = "0x99qkmbbskdnznzidh52sh4hnfzvq8a3363gzs532wmabv1gnl6"; }; buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ]; meta = { diff --git a/pkgs/desktops/kde-4.4/utils/default.nix b/pkgs/desktops/kde-4.4/utils/default.nix index 59467421407..493d1fd5596 100644 --- a/pkgs/desktops/kde-4.4/utils/default.nix +++ b/pkgs/desktops/kde-4.4/utils/default.nix @@ -3,11 +3,11 @@ , kdelibs, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: stdenv.mkDerivation { - name = "kdeutils-4.4.2"; + name = "kdeutils-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdeutils-4.4.2.tar.bz2; - sha256 = "13b8ygyaz61h1lq55fa2a4x88439rbaqqagw0syqqr9lmx63xc2j"; + url = mirror://kde/stable/4.4.3/src/kdeutils-4.4.3.tar.bz2; + sha256 = "1yncgljnvw7fvvcazr3f75634czjdzxg0s3kchscvxhfq632p4g5"; }; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.4/webdev/default.nix b/pkgs/desktops/kde-4.4/webdev/default.nix index 889ebc26bb3..fcc7e75dabe 100644 --- a/pkgs/desktops/kde-4.4/webdev/default.nix +++ b/pkgs/desktops/kde-4.4/webdev/default.nix @@ -2,10 +2,10 @@ , kdelibs, kdepimlibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdewebdev-4.4.2"; + name = "kdewebdev-4.4.3"; src = fetchurl { - url = mirror://kde/stable/4.4.2/src/kdewebdev-4.4.2.tar.bz2; - sha256 = "0rc1xbs6daczpxryhch5gqwl95amk1qz9r72k46dv86pbbd9qvl5"; + url = mirror://kde/stable/4.4.3/src/kdewebdev-4.4.3.tar.bz2; + sha256 = "1b1ip3b5lb3z2lrs5rslkzhjl942dh3srjxmkwwcfcg6md8h8ph5"; }; buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ]; meta = { From 074f450ab36faf9a7168089d7c26f9607041d23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 May 2010 11:52:43 +0000 Subject: [PATCH 158/342] Linux: Patch incorrect absolute paths in makefiles. svn path=/nixpkgs/trunk/; revision=21623 --- pkgs/os-specific/linux/kernel/builder.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index b4fc969b05d..e79f10cc7d8 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -6,6 +6,15 @@ if [ -n "$crossConfig" ]; then makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-" fi +postPatch() { + # Makefiles are full of /bin/pwd, /bin/false, /bin/bash, etc. + # Patch these away, assuming the tools are in $PATH. + for mf in $(find -name Makefile); do + echo "stripping FHS paths in \`$mf'..." + sed -i "$mf" -e 's|/usr/bin/||g ; s|/bin/||g' + done +} + configurePhase() { if test -n "$preConfigure"; then eval "$preConfigure"; From 3bda68d779dd10815fb4a0fd93d285003007eabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 6 May 2010 11:52:49 +0000 Subject: [PATCH 159/342] Linux: Attempt to copy more debugging info to $out. svn path=/nixpkgs/trunk/; revision=21624 --- pkgs/os-specific/linux/kernel/builder.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index e79f10cc7d8..e7d25e86883 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -114,6 +114,12 @@ installPhase() { cp --parents `find -type f -name Makefile -o -name "Kconfig*"` $out/lib/modules/$version/build cp Module.symvers $out/lib/modules/$version/build + if test "$dontStrip" = "1"; then + # copy any debugging info that can be found + cp --parents -rv `find -name \*.debug -o -name debug.a` \ + "$out/lib/modules/$version/build" + fi + # weed out unneeded stuff rm -rf $out/lib/modules/$version/build/Documentation rm -rf $out/lib/modules/$version/build/scripts From 65c05f03da7654661f34a55d14b6cec69d8ff01c Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 6 May 2010 11:54:41 +0000 Subject: [PATCH 160/342] Changed version in derivation names to 4.4.3 svn path=/nixpkgs/trunk/; revision=21625 --- pkgs/desktops/kde-4.4/l10n/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.4/l10n/default.nix b/pkgs/desktops/kde-4.4/l10n/default.nix index 1c14dbe7a9f..e4c5c4bd7b9 100644 --- a/pkgs/desktops/kde-4.4/l10n/default.nix +++ b/pkgs/desktops/kde-4.4/l10n/default.nix @@ -4,7 +4,7 @@ let deriv = attr : stdenv.mkDerivation { - name = "kde-l10n-${attr.lang}-4.4.2"; + name = "kde-l10n-${attr.lang}-4.4.3"; src = fetchurl { url = attr.url; sha256 = attr.sha256; From b97a0eb54e8ee55fd80a1022f96655afca04e94e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 6 May 2010 13:58:27 +0000 Subject: [PATCH 161/342] Added GeoIP Java API library svn path=/nixpkgs/trunk/; revision=21626 --- .../libraries/java/geoipjava/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/java/geoipjava/default.nix diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix new file mode 100644 index 00000000000..f713ef2f645 --- /dev/null +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, jdk, unzip}: + +stdenv.mkDerivation { + name = "GeoIPJava-1.2.3"; + src = fetchurl { + url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.3.zip; + sha256 = "0l8vxan2xh0mp1vjxh39q05jyfw8gk5y77b7i8s1aw7ssyzd05vs"; + }; + buildInputs = [ jdk unzip ]; + buildPhase = + '' + cd source + javac $(find . -name \*.java) + jar cfv maxmindgeoip.jar $(find . -name \*.class) + ''; + installPhase = + '' + ensureDir $out/share/java + cp maxmindgeoip.jar $out/share/java + ''; + meta = { + description = "GeoIP Java API"; + license = "LGPL2.1+"; + maintainers = [ stdenv.lib.maintainers.sander ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22d3139835b..b3346b9165a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3794,6 +3794,10 @@ let inherit zlib; }; + geoipjava = import ../development/libraries/java/geoipjava { + inherit stdenv fetchurl jdk unzip; + }; + geos = import ../development/libraries/geos { inherit fetchurl fetchsvn stdenv autoconf automake libtool swig which lib composableDerivation python ruby; From 3b2d0133f37af09cdbbd3a60a633fc0dab969fce Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 May 2010 16:58:04 +0000 Subject: [PATCH 162/342] * Patch the `nvidia-settings.desktop' file to make it work on KDE. svn path=/nixpkgs/trunk/; revision=21628 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index be325766c77..772f72f4cd8 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -74,6 +74,11 @@ installPhase() { # Header files etc. cp -prd usr/include usr/share $out + + # Patch the `nvidia-settings.desktop' file. + substituteInPlace $out/share/applications/nvidia-settings.desktop \ + --replace '__UTILS_PATH__' $out/bin \ + --replace '__PIXMAP_PATH__' $out/share/pixmaps } From c548c084bbc009912673f8020298d698d2792e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 6 May 2010 18:22:51 +0000 Subject: [PATCH 163/342] Making gcc-4.5 cross-build to mingw32 too (set by the proper config and libc = "msvcrt" in the crossSystem) svn path=/nixpkgs/trunk/; revision=21630 --- pkgs/development/compilers/gcc-4.5/builder.sh | 9 ++- .../development/compilers/gcc-4.5/default.nix | 38 +++++++++-- .../compilers/gcc-4.5/libstdc++-target.patch | 32 +++++++++ .../windows/mingw-headers/default.nix | 13 ++++ pkgs/os-specific/windows/mingwrt/default.nix | 29 ++++++++ pkgs/os-specific/windows/w32api/default.nix | 29 ++++++++ pkgs/top-level/all-packages.nix | 68 ++++++++++++++++--- 7 files changed, 201 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/compilers/gcc-4.5/libstdc++-target.patch create mode 100644 pkgs/os-specific/windows/mingw-headers/default.nix create mode 100644 pkgs/os-specific/windows/mingwrt/default.nix create mode 100644 pkgs/os-specific/windows/w32api/default.nix diff --git a/pkgs/development/compilers/gcc-4.5/builder.sh b/pkgs/development/compilers/gcc-4.5/builder.sh index b9724e7ad50..3be8e795162 100644 --- a/pkgs/development/compilers/gcc-4.5/builder.sh +++ b/pkgs/development/compilers/gcc-4.5/builder.sh @@ -56,7 +56,7 @@ if test "$noSysDirs" = "1"; then # gcj in. unset LIBRARY_PATH unset CPATH - if test -z "$crossStageStatic"; then + if test -z "$crossStageStatic" -o -n "$crossMingw"; then EXTRA_FLAGS_TARGET="-g0 -O2 -B${libcCross}/lib -idirafter ${libcCross}/include" EXTRA_LDFLAGS_TARGET="-Wl,-L${libcCross}/lib" fi @@ -123,6 +123,13 @@ preConfigure() { rm -Rf zlib fi + if test -n "$crossMingw" -a -n "$crossStageStatic"; then + mkdir -p ../mingw + # --with-build-sysroot expects that: + cp -R $libcCross/include ../mingw + configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." + fi + # Perform the build in a different directory. mkdir ../build cd ../build diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index d9b1a8ebe7c..8d088be0f8f 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -68,13 +68,26 @@ let version = "4.5.0"; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; + crossMingw = (cross != null && cross.libc == "msvcrt"); crossConfigureFlags = "--target=${cross.config}" + withArch + withCpu + withAbi + - (if crossStageStatic then + (if (crossMingw && crossStageStatic) then + " --with-headers=${libcCross}/include" + + " --with-gcc" + + " --with-gnu-as" + + " --with-gnu-ld" + + " --with-gnu-ld" + + " --disable-shared" + + " --disable-nls" + + " --disable-debug" + + " --enable-sjlj-exceptions" + + " --enable-threads=win32" + + " --disable-win32-registry" + else if crossStageStatic then " --disable-libssp --disable-nls" + " --without-headers" + " --disable-threads " + @@ -86,9 +99,18 @@ let version = "4.5.0"; " --with-headers=${libcCross}/include" + " --enable-__cxa_atexit" + " --enable-long-long" + - " --enable-threads=posix" + - " --enable-nls" + - " --disable-decimal-float" # No final libdecnumber (it may work only in 386) + (if crossMingw then + " --enable-threads=win32" + + " --enable-sjlj-exceptions" + + " --enable-hash-synchronization" + + " --enable-version-specific-runtime-libs" + + " --disable-libssp" + + " --disable-nls" + + " --with-dwarf2" + else + " --enable-threads=posix" + + " --enable-nls" + + " --disable-decimal-float") # No final libdecnumber (it may work only in 386) ); stageNameAddon = if (crossStageStatic) then "-stage-static" else "-stage-final"; @@ -110,7 +132,7 @@ stdenv.mkDerivation ({ }; patches = - [ ] + [ ./libstdc++-target.patch ] ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. @@ -119,7 +141,7 @@ stdenv.mkDerivation ({ ++ optional (cross != null && cross.arch == "sparc64") ./pr41818.patch; inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic - libcCross; + libcCross crossMingw; buildInputs = [ texinfo gmp mpfr mpc libelf gettext which ] ++ (optional (ppl != null) ppl) @@ -227,6 +249,10 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ optionals (langAda == false) [ "i686-darwin" ]; }; } +// (if cross != null && cross.libc == "msvcrt" && crossStageStatic then rec { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} else {}) // (if langVhdl then rec { name = "ghdl-0.29"; diff --git a/pkgs/development/compilers/gcc-4.5/libstdc++-target.patch b/pkgs/development/compilers/gcc-4.5/libstdc++-target.patch new file mode 100644 index 00000000000..fb622b39580 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.5/libstdc++-target.patch @@ -0,0 +1,32 @@ +Patch to make the target libraries 'configure' scripts find the proper CPP. +I noticed that building the mingw32 cross compiler. +Looking at the build script for mingw in archlinux, I think that only nixos +needs this patch. I don't know why. +diff --git a/Makefile.in b/Makefile.in +index 93f66b6..d691917 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ ++ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ +@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ +- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + NORMAL_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ +- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + # Where to find GMP + HOST_GMPLIBS = @gmplibs@ diff --git a/pkgs/os-specific/windows/mingw-headers/default.nix b/pkgs/os-specific/windows/mingw-headers/default.nix new file mode 100644 index 00000000000..c4e0063feec --- /dev/null +++ b/pkgs/os-specific/windows/mingw-headers/default.nix @@ -0,0 +1,13 @@ +{stdenv, mingw_runtime_headers, w32api_headers}: + +stdenv.mkDerivation { + name = "mingw-headers"; + + phases = [ "installPhase" ]; + + installPhase = '' + ensureDir $out/include + cp -R ${mingw_runtime_headers}/include/* $out/include + cp -R ${w32api_headers}/include/* $out/include + ''; +} diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix new file mode 100644 index 00000000000..aecf43c9123 --- /dev/null +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: + +let + name = "mingwrt-3.18"; +in +stdenv.mkDerivation (rec { + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz"; + sha256 = "0hmxgkxnf6an70g07gmyik46sw1qm204izh6sp923szddvypjjfy"; + }; + +} // +(if onlyHeaders then { + name = name + "-headers"; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + ensureDir $out + cp -R include $out + ''; +} else { + buildInputs = [ gccCross binutilsCross ]; + + crossConfig = gccCross.crossConfig; + + dontStrip = true; +}) +) diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix new file mode 100644 index 00000000000..570b83f671e --- /dev/null +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: + +let + name = "w32api-3.14"; +in +stdenv.mkDerivation ({ + inherit name; + + src = fetchurl { + url = "mirror://sourceforge/mingw/${name}-mingw32-src.tar.gz"; + sha256 = "128ax8a4dlspxsi5fi7bi1aslppqx3kczr1ibzj1z1az48bvwp21"; + }; + +} // +(if onlyHeaders then { + name = name + "-headers"; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + ensureDir $out + cp -R include $out + ''; +} else { + buildInputs = [ gccCross binutilsCross ]; + + crossConfig = gccCross.crossConfig; + + dontStrip = true; +}) +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3346b9165a..23bb6bddb7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2066,17 +2066,29 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc_realCross = gcc44_realCross; + gcc_realCross = gcc45_realCross; - gccCrossStageStatic = wrapGCCCross { - gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( - gcc_realCross.override { - crossStageStatic = true; - langCC = false; - libcCross = null; - enableShared = true; - })); - libc = null; + gccCrossStageStatic = let + isMingw = (stdenv.cross.libc == "msvcrt"); + libcCross1 = if isMingw then mingw_headers1 else null; + in + wrapGCCCross { + gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( + gcc_realCross.override { + crossStageStatic = true; + langCC = false; + libcCross = libcCross1; + enableShared = false; + })); + libc = libcCross1; + binutils = binutilsCross; + cross = assert crossSystem != null; crossSystem; + }; + + # Only needed for mingw builds + gccCrossMingw2 = wrapGCCCross { + gcc = gccCrossStageStatic.gcc; + libc = mingw_headers2; binutils = binutilsCross; cross = assert crossSystem != null; crossSystem; }; @@ -3884,6 +3896,7 @@ let # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross else if (name == "uclibc") then uclibcCross + else if (name == "msvcrt") then mingw_headers3 else throw "Unknown libc"; libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; @@ -6690,6 +6703,41 @@ let inherit ncurses; }; + w32api = makeOverridable (import ../os-specific/windows/w32api) { + inherit fetchurl stdenv; + gccCross = gccCrossStageStatic; + binutilsCross = binutilsCross; + }; + + w32api_headers = w32api.override { + onlyHeaders = true; + }; + + mingw_runtime = makeOverridable (import ../os-specific/windows/mingwrt) { + inherit fetchurl stdenv; + gccCross = gccCrossMingw2; + binutilsCross = binutilsCross; + }; + + mingw_runtime_headers = mingw_runtime.override { + onlyHeaders = true; + }; + + mingw_headers1 = buildEnv { + name = "mingw-headers-1"; + paths = [ w32api_headers mingw_runtime_headers ]; + }; + + mingw_headers2 = buildEnv { + name = "mingw-headers-2"; + paths = [ w32api mingw_runtime_headers ]; + }; + + mingw_headers3 = buildEnv { + name = "mingw-headers-3"; + paths = [ w32api mingw_runtime ]; + }; + wesnoth = import ../games/wesnoth { inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net SDL_ttf gettext zlib boost freetype libpng pkgconfig; From 24c157910c817e7b63710c219eaa45e42a51b4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 6 May 2010 18:23:03 +0000 Subject: [PATCH 164/342] Making wxWidgets cross-build for mingw32. svn path=/nixpkgs/trunk/; revision=21631 --- pkgs/development/libraries/wxGTK-2.8/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index cc899d7b003..3d0d27f36dd 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -30,6 +30,21 @@ stdenv.mkDerivation { "--with-opengl" ]; + # Cross build only tested for mingw32 + # Additionally, this should not be called wxGTK anymore, if built for + # mingw32. But before placing this in a better place, it helps as a test for + # mingw32. + crossAttrs = assert stdenv.cross.libc == "msvcrt"; { + src = fetchurl { + url = mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz; + sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; + }; + buildInputs = []; + propagatedBuildInputs = []; + SEARCH_INCLUDE=""; + SEARCH_LIB=""; + }; + # This variable is used by configure to find some dependencies. SEARCH_INCLUDE = "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; From c65304ff49524abc56565c3dcfeb4b5bd124c3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 6 May 2010 18:47:35 +0000 Subject: [PATCH 165/342] Telling hydra to build the cross-mingw32 svn path=/nixpkgs/trunk/; revision=21632 --- pkgs/top-level/release-cross.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 571484f0540..93b0b517bd1 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -121,4 +121,19 @@ let }; in { crossUltraSparcLinux = mapTestOnCross crossSystem basic; +}) // ( + +/* Test some cross builds on mingw32 */ +let + crossSystem = { + config = "i686-pc-mingw32"; + arch = "x86"; + libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain + platform = {}; + }; +in { + crossMingw32 = mapTestOnCross crossSystem { + wxGTK.hostDrv = nativePlatforms; + gccCrossStageFinal = nativePlatforms; + }; }) From 4547dffb5dc30cb090669342d24586c77f678fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 6 May 2010 19:19:02 +0000 Subject: [PATCH 166/342] Fixing gcc-4.5 related to the patch for ultrasparc. The patch should not be needed anymore svn path=/nixpkgs/trunk/; revision=21633 --- .../development/compilers/gcc-4.5/default.nix | 5 ++-- .../compilers/gcc-4.5/pr41818.patch | 26 ------------------- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/compilers/gcc-4.5/pr41818.patch diff --git a/pkgs/development/compilers/gcc-4.5/default.nix b/pkgs/development/compilers/gcc-4.5/default.nix index 8d088be0f8f..9ef82293242 100644 --- a/pkgs/development/compilers/gcc-4.5/default.nix +++ b/pkgs/development/compilers/gcc-4.5/default.nix @@ -132,13 +132,14 @@ stdenv.mkDerivation ({ }; patches = - [ ./libstdc++-target.patch ] + [ ] + ++ optional (cross != null) ./libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ./gnat-cflags.patch ++ optional langVhdl ./ghdl-ortho-cflags.patch - ++ optional (cross != null && cross.arch == "sparc64") ./pr41818.patch; + ; inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic libcCross crossMingw; diff --git a/pkgs/development/compilers/gcc-4.5/pr41818.patch b/pkgs/development/compilers/gcc-4.5/pr41818.patch deleted file mode 100644 index 98731c46067..00000000000 --- a/pkgs/development/compilers/gcc-4.5/pr41818.patch +++ /dev/null @@ -1,26 +0,0 @@ -From . This fixes compilation -of the sparc64-linux-gnu cross-compiler with shared libraries. - ---- trunk/Makefile.in 2010/01/07 19:21:46 155705 -+++ trunk/Makefile.in 2010/01/07 19:53:50 155706 -@@ -259,7 +259,7 @@ - # directories built for the target. - TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" - # This is the list of variables to export in the environment when --# configuring subdirectories for the host system. -+# configuring subdirectories for the target system. - BASE_TARGET_EXPORTS = \ - $(BASE_EXPORTS) \ - AR="$(AR_FOR_TARGET)"; export AR; \ -@@ -281,7 +281,10 @@ - STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ - WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ - WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \ -- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); -+@if gcc-bootstrap -+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ -+@endif gcc-bootstrap -+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); - - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ From 2c8783a48b5a2d1e39e03c6fec0decb383f67792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 6 May 2010 19:19:22 +0000 Subject: [PATCH 167/342] Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added to test the crossbuilding with wxGTK. I added a new windows-specific package: wxMSW. svn path=/nixpkgs/trunk/; revision=21634 --- .../libraries/wxGTK-2.8/default.nix | 15 ----- .../os-specific/windows/wxMSW-2.8/default.nix | 40 +++++++++++ pkgs/top-level/all-packages.nix | 66 ++++++++++--------- 3 files changed, 76 insertions(+), 45 deletions(-) create mode 100644 pkgs/os-specific/windows/wxMSW-2.8/default.nix diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 3d0d27f36dd..cc899d7b003 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -30,21 +30,6 @@ stdenv.mkDerivation { "--with-opengl" ]; - # Cross build only tested for mingw32 - # Additionally, this should not be called wxGTK anymore, if built for - # mingw32. But before placing this in a better place, it helps as a test for - # mingw32. - crossAttrs = assert stdenv.cross.libc == "msvcrt"; { - src = fetchurl { - url = mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz; - sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; - }; - buildInputs = []; - propagatedBuildInputs = []; - SEARCH_INCLUDE=""; - SEARCH_LIB=""; - }; - # This variable is used by configure to find some dependencies. SEARCH_INCLUDE = "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include"; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix new file mode 100644 index 00000000000..5c79460060a --- /dev/null +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true, +}: + +assert stdenv ? cross -> stdenv.cross.libc == "msvcrt"; + +stdenv.mkDerivation { + name = "wxMSW-2.8.11"; + + src = fetchurl { + url = mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz; + sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; + }; + + configureFlags = [ + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + "--disable-precomp-headers" + (if unicode then "--enable-unicode" else "") + "--with-opengl" + ]; + + # Cross build only tested for mingw32 + checkCross = throw "This package can only be cross-built" false; + crossAttrs = { + checkCross = true; + }; + + preConfigure = " + substituteInPlace configure --replace /usr /no-such-path + "; + + postBuild = "(cd contrib/src && make)"; + + postInstall = " + (cd contrib/src && make install) + (cd $out/include && ln -s wx-*/* .) + "; + + passthru = {inherit compat24 compat26 unicode;}; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23bb6bddb7a..b7e04747789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2070,7 +2070,7 @@ let gccCrossStageStatic = let isMingw = (stdenv.cross.libc == "msvcrt"); - libcCross1 = if isMingw then mingw_headers1 else null; + libcCross1 = if isMingw then windows.mingw_headers1 else null; in wrapGCCCross { gcc = forceBuildDrv (lib.addMetaAttrs { platforms = []; } ( @@ -2088,7 +2088,7 @@ let # Only needed for mingw builds gccCrossMingw2 = wrapGCCCross { gcc = gccCrossStageStatic.gcc; - libc = mingw_headers2; + libc = windows.mingw_headers2; binutils = binutilsCross; cross = assert crossSystem != null; crossSystem; }; @@ -3896,7 +3896,7 @@ let # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross else if (name == "uclibc") then uclibcCross - else if (name == "msvcrt") then mingw_headers3 + else if (name == "msvcrt") then windows.mingw_headers3 else throw "Unknown libc"; libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; @@ -6703,39 +6703,45 @@ let inherit ncurses; }; - w32api = makeOverridable (import ../os-specific/windows/w32api) { - inherit fetchurl stdenv; - gccCross = gccCrossStageStatic; - binutilsCross = binutilsCross; - }; + windows = rec { + w32api = makeOverridable (import ../os-specific/windows/w32api) { + inherit fetchurl stdenv; + gccCross = gccCrossStageStatic; + binutilsCross = binutilsCross; + }; - w32api_headers = w32api.override { - onlyHeaders = true; - }; + w32api_headers = w32api.override { + onlyHeaders = true; + }; - mingw_runtime = makeOverridable (import ../os-specific/windows/mingwrt) { - inherit fetchurl stdenv; - gccCross = gccCrossMingw2; - binutilsCross = binutilsCross; - }; + mingw_runtime = makeOverridable (import ../os-specific/windows/mingwrt) { + inherit fetchurl stdenv; + gccCross = gccCrossMingw2; + binutilsCross = binutilsCross; + }; - mingw_runtime_headers = mingw_runtime.override { - onlyHeaders = true; - }; + mingw_runtime_headers = mingw_runtime.override { + onlyHeaders = true; + }; - mingw_headers1 = buildEnv { - name = "mingw-headers-1"; - paths = [ w32api_headers mingw_runtime_headers ]; - }; + mingw_headers1 = buildEnv { + name = "mingw-headers-1"; + paths = [ w32api_headers mingw_runtime_headers ]; + }; - mingw_headers2 = buildEnv { - name = "mingw-headers-2"; - paths = [ w32api mingw_runtime_headers ]; - }; + mingw_headers2 = buildEnv { + name = "mingw-headers-2"; + paths = [ w32api mingw_runtime_headers ]; + }; - mingw_headers3 = buildEnv { - name = "mingw-headers-3"; - paths = [ w32api mingw_runtime ]; + mingw_headers3 = buildEnv { + name = "mingw-headers-3"; + paths = [ w32api mingw_runtime ]; + }; + + wxMSW = makeOverridable (import ../os-specific/windows/wxMSW-2.8) { + inherit fetchurl stdenv; + }; }; wesnoth = import ../games/wesnoth { From f0d7bf0541dd0bb033f212c62ea25a224beb7ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 6 May 2010 19:20:47 +0000 Subject: [PATCH 168/342] Updating the hydra cross-build tests to build wxMSW and not wxGTK for mingw32 svn path=/nixpkgs/trunk/; revision=21635 --- pkgs/top-level/release-cross.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 93b0b517bd1..79e6975ea93 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -133,7 +133,7 @@ let }; in { crossMingw32 = mapTestOnCross crossSystem { - wxGTK.hostDrv = nativePlatforms; + windows.wxMSW.hostDrv = nativePlatforms; gccCrossStageFinal = nativePlatforms; }; }) From 5eca4b85f1cf270fc50091441b9a192f03d7444b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 7 May 2010 07:38:35 +0000 Subject: [PATCH 169/342] metadata for kdevplatform and kdevelop svn path=/nixpkgs/trunk/; revision=21637 --- .../desktops/kde-4.4/extragear/kdevelop/default.nix | 13 +++++++++++++ .../kde-4.4/extragear/kdevplatform/default.nix | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix b/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix index 6802bdd323b..c788bf2d872 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix @@ -11,4 +11,17 @@ stdenv.mkDerivation rec { buildInputs = [ kdevplatform cmake pkgconfig automoc4 shared_mime_info kdebase_workspace gettext stdenv.gcc.libc perl ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.urkud ]; + platforms = [ platforms.linux ]; + description = "KDE official IDE"; + longDescription = '' +A free, opensource IDE (Integrated Development Environment) for MS Windows, Mac OsX, +Linux, Solaris and FreeBSD. It is a feature-full, plugin extendable IDE for C/C++ and other +programing languages. It is based on KDevPlatform, KDE and Qt libraries and is under development +since 1998. + ''; + homepage = http://www.kdevelop.org; + }; } diff --git a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix b/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix index 78896aff019..33c0d11e711 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix @@ -11,4 +11,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ kdelibs subversion qt4 phonon ]; buildInputs = [ cmake automoc4 perl gettext pkgconfig apr aprutil boost stdenv.gcc.libc ]; + + meta = with stdenv.lib; { + maintainers = [ maintainers.urkud ]; + platforms = [ platforms.linux ]; + description = "KDE libraries for IDE-like programs"; + longDescription = '' + A free, opensource set of libraries that can be used as a foundation for + IDE-like programs. It is programing-language independent, and is planned + to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." + ''; + }; } From 00b296762a808243b4868a1c74aceb87a5ec8e90 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 May 2010 09:32:46 +0000 Subject: [PATCH 170/342] pkgs/development/libraries/boost: updated boost to 1.43.0 svn path=/nixpkgs/trunk/; revision=21638 --- pkgs/development/libraries/boost/1.43.0.nix | 59 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.43.0.nix diff --git a/pkgs/development/libraries/boost/1.43.0.nix b/pkgs/development/libraries/boost/1.43.0.nix new file mode 100644 index 00000000000..a549b5181ae --- /dev/null +++ b/pkgs/development/libraries/boost/1.43.0.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, enableRelease ? true +, enableDebug ? false +, enableSingleThreaded ? false +, enableMultiThreaded ? true +, enableShared ? true +, enableStatic ? false +, enablePIC ? 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"); + + # To avoid library name collisions + finalLayout = if ((enableRelease && enableDebug) || + (enableSingleThreaded && enableMultiThreaded) || + (enableShared && enableStatic)) then + "tagged" else "system"; + + cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; + +in + +stdenv.mkDerivation { + name = "boost-1.43.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_43_0.tar.bz2"; + sha256 = "0831h19ph65r2rai6ipk5c2bx04af8q423mzr89fh454385i0krl"; + }; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + installPhase = ":"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7e04747789..975cee82bbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3502,7 +3502,7 @@ let inherit fetchurl stdenv icu expat zlib bzip2 python; }; - boost = makeOverridable (import ../development/libraries/boost/1.42.0.nix) { + boost = makeOverridable (import ../development/libraries/boost/1.43.0.nix) { inherit fetchurl stdenv icu expat zlib bzip2 python; }; From 3542a7777e24f4a176bcc58b7ab6fe92af6faf08 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 May 2010 09:33:30 +0000 Subject: [PATCH 171/342] pkgs/top-level/all-packages.nix: removed boost_1_36_0 attribute According to "grep -R", that attribute isn't referenced by anything in nix-pkgs. svn path=/nixpkgs/trunk/; revision=21639 --- 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 975cee82bbc..46326db274b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3498,10 +3498,6 @@ let inherit fetchurl stdenv lib pkgconfig; }; - boost_1_36_0 = import ../development/libraries/boost/1.36.0.nix { - inherit fetchurl stdenv icu expat zlib bzip2 python; - }; - boost = makeOverridable (import ../development/libraries/boost/1.43.0.nix) { inherit fetchurl stdenv icu expat zlib bzip2 python; }; From 57c049f4a00f6a057c0f9110510d2b52c0221b4a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 7 May 2010 10:02:52 +0000 Subject: [PATCH 172/342] * meta.platforms is a list of strings, not a list of lists of strings (http://hydra.nixos.org/build/399330). * Fix the indentation of longDescription. svn path=/nixpkgs/trunk/; revision=21640 --- .../kde-4.4/extragear/kdevelop/default.nix | 16 +++++++++------- .../kde-4.4/extragear/kdevplatform/default.nix | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix b/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix index c788bf2d872..6e4fcbad25c 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/kdevelop/default.nix @@ -14,14 +14,16 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = [ maintainers.urkud ]; - platforms = [ platforms.linux ]; + platforms = platforms.linux; description = "KDE official IDE"; - longDescription = '' -A free, opensource IDE (Integrated Development Environment) for MS Windows, Mac OsX, -Linux, Solaris and FreeBSD. It is a feature-full, plugin extendable IDE for C/C++ and other -programing languages. It is based on KDevPlatform, KDE and Qt libraries and is under development -since 1998. - ''; + longDescription = + '' + A free, opensource IDE (Integrated Development Environment) + for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a + feature-full, plugin extendable IDE for C/C++ and other + programing languages. It is based on KDevPlatform, KDE and Qt + libraries and is under development since 1998. + ''; homepage = http://www.kdevelop.org; }; } diff --git a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix b/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix index 33c0d11e711..7be3c89319e 100644 --- a/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/kdevplatform/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = [ maintainers.urkud ]; - platforms = [ platforms.linux ]; + platforms = platforms.linux; description = "KDE libraries for IDE-like programs"; longDescription = '' A free, opensource set of libraries that can be used as a foundation for From 67cf56d2a576c3fe6441699426f407787a98e7fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 May 2010 14:01:39 +0000 Subject: [PATCH 173/342] git-subtree: added the version 0.3. svn path=/nixpkgs/trunk/; revision=21645 --- .../git-and-tools/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 00931aaf3d5..699007b0970 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -107,4 +107,25 @@ rec { git2cl = import ./git2cl { inherit fetchgit stdenv perl; }; + + gitSubtree = stdenv.mkDerivation { + name = "git-subtree-0.3"; + src = fetchurl { + url = "http://github.com/apenwarr/git-subtree/tarball/v0.3"; +# sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr"; + sha256 = "f2ccac1e9cff4c35d989dc2a5581133c96b72d96c6a5ed89e51b6446dadac03f"; + }; + unpackCmd = "gzip -d < $curSrc | tar xvf -"; + buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; + configurePhase = "export prefix=$out"; + buildPhase = "true"; + installPhase = '' + make install prefix=$out gitdir=$out/bin #work around to deal with a wrong makefile + ''; + meta= { + description = "An experimental alternative to the git-submodule command"; + homepage = http://github.com/apenwarr/git-subtree; + license = "GPLv2"; + }; + }; } From f3ceb181e2d6cda35903c8180ef81fe3c57130ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 May 2010 14:01:46 +0000 Subject: [PATCH 174/342] gmime 2.4.15 svn path=/nixpkgs/trunk/; revision=21646 --- pkgs/development/libraries/gmime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 22facd2ccfc..078d7e500b8 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, glib, zlib}: stdenv.mkDerivation { - name = "gmime-2.2.1"; + name = "gmime-2.4.15"; src = fetchurl { - url = http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-2.2.1.tar.gz; - md5 = "b05e4d6344c8465fb74386e5f1fed45c"; + url = http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-2.4.15.tar.bz2; + sha256 = "a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1"; }; buildInputs = [pkgconfig glib zlib]; } From 79a6a66322690c59ccc5c5ade343c49360073fcb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 May 2010 14:01:52 +0000 Subject: [PATCH 175/342] libgnomeprintui derivation svn path=/nixpkgs/trunk/; revision=21647 --- pkgs/desktops/gnome-2.28/default.nix | 7 ++++++- .../gnome-2.28/platform/libgnomeprintui/default.nix | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 7a1e66a8890..a382ee4fbaf 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -11,7 +11,6 @@ rec { gnomeicontheme = gnome_icon_theme; # !!! Missing! Need to add these. - libgnomeprintui = throw "libgnomeprintui not implemented"; gnomepanel = throw "gnomepanel not implemented"; gtksourceview_24 = gtksourceview; @@ -53,6 +52,12 @@ rec { inherit (pkgs.gtkLibs) gtk; }; + libgnomeprintui = import ./platform/libgnomeprintui { + inherit intltool libgnomecanvas libgnomeprint gnomeicontheme; + inherit (pkgs) stdenv fetchurl pkgconfig gettext; + inherit (pkgs.gtkLibs) gtk; + }; + libgnomecups = import ./platform/libgnomecups { inherit intltool libart_lgpl; inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; diff --git a/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix new file mode 100644 index 00000000000..a406f9209a3 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/platform/libgnomeprintui/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, pkgconfig, gtk, gettext, intltool, libgnomecanvas, libgnomeprint, gnomeicontheme}: + +stdenv.mkDerivation { + name = "libgnomeprintui-2.11.1"; + + src = fetchurl { + url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.4.tar.bz2; + sha256 = "19d2aa95c9cb85f1ddd13464500217a76e2abce59281ec5d210e139c14dd7490"; + }; + + buildInputs = [ pkgconfig gtk gettext intltool libgnomecanvas libgnomeprint gnomeicontheme]; +} From f96b77a4ce2b73a61d8f6a7d3c50c57b18f97644 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 May 2010 14:01:57 +0000 Subject: [PATCH 176/342] gnuplot: updated to version 4.4.0 svn path=/nixpkgs/trunk/; revision=21648 --- pkgs/tools/graphics/gnuplot/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 303bc38741c..c10777f66ab 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,6 @@ { stdenv, fetchurl, zlib, gd, texinfo +, texLive ? null +, lua ? null , emacs ? null , libX11 ? null , libXt ? null @@ -19,15 +21,15 @@ assert x11Support -> ((libX11 != null) && assert (wxGTK != null) -> x11Support; stdenv.mkDerivation { - name = "gnuplot-4.2.6"; + name = "gnuplot-4.4.0"; src = fetchurl { - url = "mirror://sourceforge/gnuplot/gnuplot-4.2.6.tar.gz"; - sha256 = "10lfmbib3wrzfhvjqk7ffc29fb2aw6m84p4cx6znmgbpc3mw5yw1"; + url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz"; + sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0"; }; configureFlags = if x11Support then ["--with-x"] else ["--without-x"]; - buildInputs = [zlib gd texinfo readline emacs] ++ + buildInputs = [zlib gd texinfo readline emacs lua texLive] ++ (if x11Support then [libX11 libXt libXpm libXaw] else []) ++ (if wxGTK != null then [wxGTK pango cairo pkgconfig] else []); } From 6dd72c5897784fa4d3b25525abcb105ffe752de6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 7 May 2010 14:18:00 +0000 Subject: [PATCH 177/342] Updating putty to the last svn version, so now it can work with gtk2. The previous wanted gtk1, that did not build on x86_64-linux svn path=/nixpkgs/trunk/; revision=21649 --- .../networking/remote/putty/builder.sh | 12 ------- .../networking/remote/putty/default.nix | 35 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 21 insertions(+), 30 deletions(-) delete mode 100755 pkgs/applications/networking/remote/putty/builder.sh diff --git a/pkgs/applications/networking/remote/putty/builder.sh b/pkgs/applications/networking/remote/putty/builder.sh deleted file mode 100755 index 8b7da0a84e4..00000000000 --- a/pkgs/applications/networking/remote/putty/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -tar zxvf $src -cd putty-*/unix/ - -ensureDir $out/bin -ensureDir $out/share/man/man1 - -./configure --prefix=$out --with-gtk-prefix=$gtk -make -make install - diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 402b5a520f4..747413400b3 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchurl, ncurses -, gtk -}: +{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut }: stdenv.mkDerivation { - name = "putty-0.60"; - builder = ./builder.sh; + name = "putty-r8934"; + # builder = ./builder.sh; + + preConfigure = '' + perl mkfiles.pl + ( cd doc ; make ); + cd unix + sed '/AM_PATH_GTK(/d' -i configure.ac + cp ${automake}/share/automake-*/install-sh . + autoreconf -vf + ''; - src = fetchurl { - url = http://the.earth.li/~sgtatham/putty/latest/putty-0.60.tar.gz; - sha256 = "b2bbaaf9324997e85cf15d44ed41e8e89539c8215dceac9d6d7272a37dbc2849"; + # The hash is going to change on new snapshot. + # I don't know of any better URL + src = fetchsvn { + url = svn://svn.tartarus.org/sgt/putty; + rev = 8934; + sha256 = "1yg5jhk7jp4yrnhpi0lvz71qqaf5gfpcwy8p198qqs8xgd1w51jc"; }; - buildInputs = [ - gtk ncurses - ]; - - #propagatedBuildInputs = [ - #]; - - inherit gtk; + buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46326db274b..4949b3d8656 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9433,8 +9433,8 @@ let }; putty = import ../applications/networking/remote/putty { - inherit stdenv fetchurl ncurses; - inherit (gtkLibs1x) gtk; + inherit stdenv fetchsvn ncurses pkgconfig autoconf automake perl halibut; + inherit (gtkLibs) gtk; }; rssglx = import ../misc/screensavers/rss-glx { From a3d73679b7fbfa9963968ed4424a973ef2b614e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 7 May 2010 14:27:22 +0000 Subject: [PATCH 178/342] Cleaning a bit the boost directory. I propose having 'default.nix' for the latest version, so the updates end in a simple diff. I remove the versions not mentioned anywhere else too. svn path=/nixpkgs/trunk/; revision=21650 --- pkgs/development/libraries/boost/1.36.0.nix | 24 -------- pkgs/development/libraries/boost/1.38.0.nix | 49 ---------------- pkgs/development/libraries/boost/1.42.0.nix | 57 ------------------- pkgs/development/libraries/boost/classr.patch | 15 ----- .../boost/{1.43.0.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 1 insertion(+), 146 deletions(-) delete mode 100644 pkgs/development/libraries/boost/1.36.0.nix delete mode 100644 pkgs/development/libraries/boost/1.38.0.nix delete mode 100644 pkgs/development/libraries/boost/1.42.0.nix delete mode 100644 pkgs/development/libraries/boost/classr.patch rename pkgs/development/libraries/boost/{1.43.0.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/boost/1.36.0.nix b/pkgs/development/libraries/boost/1.36.0.nix deleted file mode 100644 index 14b7dd8da33..00000000000 --- a/pkgs/development/libraries/boost/1.36.0.nix +++ /dev/null @@ -1,24 +0,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]; - - 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.38.0.nix b/pkgs/development/libraries/boost/1.38.0.nix deleted file mode 100644 index 739291a0574..00000000000 --- a/pkgs/development/libraries/boost/1.38.0.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ 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"; - - 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"; - }; - - patches = [ ./classr.patch ]; - - buildInputs = [icu expat zlib bzip2 python]; - - preBuild = '' - 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/development/libraries/boost/1.42.0.nix b/pkgs/development/libraries/boost/1.42.0.nix deleted file mode 100644 index 4f71e7347a9..00000000000 --- a/pkgs/development/libraries/boost/1.42.0.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? 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"); - - # To avoid library name collisions - finalLayout = if ((enableRelease && enableDebug) || - (enableSingleThreaded && enableMultiThreaded) || - (enableShared && enableStatic)) then - "tagged" else "system"; - - cflags = if (enablePIC) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; - -in - -stdenv.mkDerivation { - name = "boost-1.42.0"; - - meta = { - homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; - license = "boost-license"; - }; - - src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_42_0.tar.bz2"; - sha256 = "02g6m6f7m11ig93p5sx7sfq75c15y9kn2pa3csn1bkjhs9dvj7jb"; - }; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./bjam -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; - - installPhase = ":"; -} diff --git a/pkgs/development/libraries/boost/classr.patch b/pkgs/development/libraries/boost/classr.patch deleted file mode 100644 index fbe38308696..00000000000 --- a/pkgs/development/libraries/boost/classr.patch +++ /dev/null @@ -1,15 +0,0 @@ -Taken from http://wiki.freebsd.org/BoostPortingProject ---- boost1.38/boost/function/function_template.hpp.orig 2008-10-16 17:21:50.000000000 +0400 -+++ boost1.38_2/boost/function/function_template.hpp 2009-03-25 04:12:15.000000000 +0300 -@@ -950,10 +950,10 @@ - f.vtable->manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); - f.vtable = 0; --#if !defined(BOOST_NO_EXCEPTIONS) - } else { - clear(); - } -+#if !defined(BOOST_NO_EXCEPTIONS) - } catch (...) { - vtable = 0; - throw; diff --git a/pkgs/development/libraries/boost/1.43.0.nix b/pkgs/development/libraries/boost/default.nix similarity index 100% rename from pkgs/development/libraries/boost/1.43.0.nix rename to pkgs/development/libraries/boost/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4949b3d8656..54d8f94c01e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3498,7 +3498,7 @@ let inherit fetchurl stdenv lib pkgconfig; }; - boost = makeOverridable (import ../development/libraries/boost/1.43.0.nix) { + boost = makeOverridable (import ../development/libraries/boost) { inherit fetchurl stdenv icu expat zlib bzip2 python; }; From 5564bd26357a6ba4a21145af189f59319d36dd45 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 7 May 2010 15:13:43 +0000 Subject: [PATCH 179/342] * Make stack traces more consistent. svn path=/nixpkgs/trunk/; revision=21652 --- pkgs/lib/modules.nix | 4 ++-- pkgs/lib/properties.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 3808893c14f..6457fd14eb5 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -219,7 +219,7 @@ rec { decl = lib.addErrorContext "${eol - }while enhancing option '${addName name}'.${eol + }while enhancing option `${addName name}':${eol }${errorSource declarations}${eol }" ( addOptionMakeUp @@ -270,7 +270,7 @@ rec { value = lib.addErrorContext "${eol - }while evaluating the option '${addName name}'.${eol + }while evaluating the option `${addName name}':${eol }${errorSource (modulesOf name)}${eol }" ( let opt = option.decl; in diff --git a/pkgs/lib/properties.nix b/pkgs/lib/properties.nix index 5950ec54791..592dc9c4bcb 100644 --- a/pkgs/lib/properties.nix +++ b/pkgs/lib/properties.nix @@ -73,7 +73,7 @@ rec { let cleanAttrs = rmProperties attrs; in if isProperty attrs then iter (a: v: - lib.addErrorContext "while moving properties on the attribute `${a}'." ( + lib.addErrorContext "while moving properties on the attribute `${a}':" ( triggerPropertiesGlobalDelay a ( triggerPropertiesDelay a ( copyProperties attrs v @@ -88,7 +88,7 @@ rec { triggerPropertiesDelay = name: attrs: let callOnDelay = p@{property, ...}: - lib.addErrorContext "while calling a onDelay function." ( + lib.addErrorContext "while calling an `onDelay' function:" ( if property ? onDelay then property.onDelay name p else @@ -111,7 +111,7 @@ rec { }; callOnGlobalDelay = property: content: - lib.addErrorContext "while calling a onGlobalDelay function." ( + lib.addErrorContext "while calling an `onGlobalDelay' function:" ( property.onGlobalDelay name content ); in @@ -124,7 +124,7 @@ rec { evalProperties = valList: if valList != [] then filter (x: !isNotdef x) ( - lib.addErrorContext "while evaluating properties." ( + lib.addErrorContext "while evaluating properties:" ( triggerPropertiesGlobalEval ( evalLocalProperties valList ))) @@ -133,14 +133,14 @@ rec { evalLocalProperties = valList: filter (x: !isNotdef x) ( - lib.addErrorContext "while evaluating local properties." ( + lib.addErrorContext "while evaluating local properties:" ( map triggerPropertiesEval valList )); # Call onEval function triggerPropertiesEval = val: foldProperty (p@{property, ...}: - lib.addErrorContext "while calling a onEval function." ( + lib.addErrorContext "while calling an `onEval' function:" ( if property ? onEval then property.onEval p else @@ -165,7 +165,7 @@ rec { }; callOnGlobalEval = property: valList: - lib.addErrorContext "while calling a onGlobalEval function." ( + lib.addErrorContext "while calling an `onGlobalEval' function:" ( property.onGlobalEval valList ); in From 0864c1422ea850427e29f65477b4dbc513fffcd9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 7 May 2010 20:08:31 +0000 Subject: [PATCH 180/342] Move qt-4.x into subfolder svn path=/nixpkgs/trunk/; revision=21658 --- pkgs/development/libraries/{qt-4.5 => qt-4.x/4.5}/default.nix | 0 .../libraries/{qt-4.5 => qt-4.x/4.5}/setup-hook.sh | 0 pkgs/development/libraries/{qt-4.6 => qt-4.x/4.6}/default.nix | 0 .../libraries/{qt-4.6 => qt-4.x/4.6}/setup-hook.sh | 0 pkgs/top-level/all-packages.nix | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/development/libraries/{qt-4.5 => qt-4.x/4.5}/default.nix (100%) rename pkgs/development/libraries/{qt-4.5 => qt-4.x/4.5}/setup-hook.sh (100%) rename pkgs/development/libraries/{qt-4.6 => qt-4.x/4.6}/default.nix (100%) rename pkgs/development/libraries/{qt-4.6 => qt-4.x/4.6}/setup-hook.sh (100%) diff --git a/pkgs/development/libraries/qt-4.5/default.nix b/pkgs/development/libraries/qt-4.x/4.5/default.nix similarity index 100% rename from pkgs/development/libraries/qt-4.5/default.nix rename to pkgs/development/libraries/qt-4.x/4.5/default.nix diff --git a/pkgs/development/libraries/qt-4.5/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/qt-4.5/setup-hook.sh rename to pkgs/development/libraries/qt-4.x/4.5/setup-hook.sh diff --git a/pkgs/development/libraries/qt-4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix similarity index 100% rename from pkgs/development/libraries/qt-4.6/default.nix rename to pkgs/development/libraries/qt-4.x/4.6/default.nix diff --git a/pkgs/development/libraries/qt-4.6/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/qt-4.6/setup-hook.sh rename to pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54d8f94c01e..50aa6ac84bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5022,7 +5022,7 @@ let qt4 = qt46; - qt45 = import ../development/libraries/qt-4.5 { + qt45 = import ../development/libraries/qt-4.x/4.5 { inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig libtiff; inherit (xlibs) xextproto libXft libXrender libXrandr randrproto @@ -5031,7 +5031,7 @@ let inherit (gnome) glib; }; - qt46 = makeOverridable (import ../development/libraries/qt-4.6) { + qt46 = makeOverridable (import ../development/libraries/qt-4.x/4.6) { inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib postgresql; From 169fee5644bd0a9e7994b1a6ed40460d4b52ba99 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Fri, 7 May 2010 20:08:37 +0000 Subject: [PATCH 181/342] Add qt-4.7-beta1 with low priority svn path=/nixpkgs/trunk/; revision=21659 --- .../libraries/qt-4.x/4.7/default.nix | 107 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++ 2 files changed, 118 insertions(+) create mode 100644 pkgs/development/libraries/qt-4.x/4.7/default.nix diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix new file mode 100644 index 00000000000..0bb61a07bcb --- /dev/null +++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix @@ -0,0 +1,107 @@ +{ stdenv, fetchurl, lib +, alsaLib, gstreamer, gstPluginsBase, pulseaudio +, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu +, libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig +, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib +, mysql, postgresql, sqlite +, perl, coreutils, libXi +, buildDemos ? false, buildExamples ? false, useDocs ? true}: + +stdenv.mkDerivation rec { + name = "qt-4.7.0-beta1"; + + src = fetchurl { + url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.7.0-beta1.tar.gz; + sha256 = "0ac9dk2xdcbwjmh9hgmnp60df9shv2ss78lls2apgnjddscdw1qi"; + }; + + preConfigure = '' + export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" + configureFlags+=" + -docdir $out/share/doc/${name} + -plugindir $out/lib/qt4/plugins + -examplesdir $out/share/doc/${name}/examples + -demosdir $out/share/doc/${name}/demos + -datadir $out/share/qt4 + " + ''; + + propagatedBuildInputs = [ + alsaLib + sqlite + libXft + libXrender + libXrandr + libXi + randrproto + xextproto + libXinerama + xineramaproto + libXcursor + zlib + libjpeg + mysql + postgresql + libpng + which + mesa + libXmu + libXv + openssl + dbus.libs + cups + pkgconfig + libXext + freetype + fontconfig + inputproto + fixesproto + libXfixes + glib + libtiff + gstreamer + gstPluginsBase + pulseaudio + ]; + + buildInputs = [ perl ]; + + # libQtNetwork will call libQtCore for it to dlopen openssl. + NIX_LDFLAGS = "-rpath ${openssl}/lib"; + # Don't shrink the rpath, to keep ${openssl} in it. + dontPatchELF = 1; + + prefixKey = "-prefix "; + + configureFlags = '' + -v -no-separate-debug-info -release -fast -confirm-license -opensource + -system-zlib -system-libpng -system-libjpeg -qt-gif + -opengl -xrender -xrandr -xinerama -xcursor + -plugin-sql-mysql -system-sqlite + -qdbus -cups -glib -xfixes -dbus-linked + -fontconfig -I${freetype}/include/freetype2 + -exceptions -xmlpatterns + -multimedia -mediaservices + -javascript-jit + ${if buildDemos == true then "-make demos" else "-nomake demos"} + ${if buildExamples == true then "-make examples" else "-nomake examples"} + ${if useDocs then "-make docs" else "-nomake docs"} + ''; + + patchPhase = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf + ''; + + postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; + + meta = { + homepage = http://qt.nokia.com/products; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = with lib.maintainers; [ urkud sander ]; + platforms = stdenv.lib.platforms.linux; + priority = 10; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50aa6ac84bc..f34a369b41f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5041,6 +5041,17 @@ let inherit (gnome) glib; }; + qt47 = makeOverridable (import ../development/libraries/qt-4.x/4.7) { + inherit fetchurl stdenv lib zlib libjpeg libpng which mysql mesa openssl cups dbus + fontconfig freetype pkgconfig libtiff perl coreutils sqlite alsaLib + postgresql pulseaudio; + inherit (gst_all) gstreamer gstPluginsBase; + inherit (xlibs) xextproto libXft libXrender libXrandr randrproto + libXmu libXinerama xineramaproto libXcursor libXext libXi + inputproto fixesproto libXfixes libXv; + inherit (gnome) glib; + }; + qtscriptgenerator = makeOverridable (import ../development/libraries/qtscriptgenerator) { inherit stdenv fetchurl; qt4 = qt46; From ab6031464ab518575fa47c035cb16cc7f7396b2f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 May 2010 17:03:07 +0000 Subject: [PATCH 182/342] Upgrade phonon to 4.4.1 svn path=/nixpkgs/trunk/; revision=21660 --- pkgs/desktops/kde-4.4/default.nix | 5 +- .../kde-4.4/support/phonon/default.nix | 28 +- .../phonon-4.4.1-gst-plugins-include.patch | 263 ++++++++++++++++++ 3 files changed, 283 insertions(+), 13 deletions(-) create mode 100644 pkgs/desktops/kde-4.4/support/phonon/phonon-4.4.1-gst-plugins-include.patch diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 79523142541..562813f23ca 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -10,8 +10,9 @@ pkgs.recurseIntoAttrs (rec { }; phonon = import ./support/phonon { - inherit (pkgs) stdenv fetchurl lib cmake; - inherit (pkgs) qt4 gst_all xineLib; + inherit (pkgs) stdenv fetchurl cmake pkgconfig; + inherit (pkgs) qt4 xineLib pulseaudio; + inherit (pkgs.gst_all) gstreamer gstPluginsBase; inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs; inherit automoc4; }; diff --git a/pkgs/desktops/kde-4.4/support/phonon/default.nix b/pkgs/desktops/kde-4.4/support/phonon/default.nix index 3d9f28e09b6..437e2fc40c1 100644 --- a/pkgs/desktops/kde-4.4/support/phonon/default.nix +++ b/pkgs/desktops/kde-4.4/support/phonon/default.nix @@ -1,21 +1,27 @@ -{ stdenv, fetchurl, lib, cmake, qt4 +{ stdenv, fetchurl, cmake, qt4, automoc4, pkgconfig , libXau, libXdmcp, libpthreadstubs -, gst_all, xineLib, automoc4}: +, gstreamer, gstPluginsBase, xineLib, pulseaudio}: -stdenv.mkDerivation { - name = "phonon-4.3.80"; +let + v = "4.4.1"; + stable = true; +in + +stdenv.mkDerivation rec { + name = "phonon-${v}"; src = fetchurl { - url = mirror://kde/unstable/phonon/phonon-4.3.80.tar.bz2; - sha256 = "1v4ba2ddphkv0gjki5das5brd1wp4nf5ci73c7r1pnyp8mgjkjw9"; + url = "mirror://kde/${if stable then "" else "un"}stable/phonon/${v}/${name}.tar.bz2"; + sha256 = "0xsjbvpiqrsmqvxmhmjkwyhcxkajf1f78pg67kfwidaz9kkv0lla"; }; - includeAllQtDirs=true; - NIX_CFLAGS_COMPILE = "-I${gst_all.gstPluginsBase}/include/${gst_all.prefix}"; - buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ]; - meta = { + patches = [ ./phonon-4.4.1-gst-plugins-include.patch ]; + buildInputs = [ cmake qt4 libXau libXdmcp libpthreadstubs gstreamer + gstPluginsBase xineLib automoc4 pulseaudio pkgconfig ]; + meta = with stdenv.lib; { + platforms = platforms.linux; description = "KDE Multimedia API"; longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine"; license = "LGPL"; homepage = http://phonon.kde.org; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ maintainers.sander maintainers.urkud ]; }; } diff --git a/pkgs/desktops/kde-4.4/support/phonon/phonon-4.4.1-gst-plugins-include.patch b/pkgs/desktops/kde-4.4/support/phonon/phonon-4.4.1-gst-plugins-include.patch new file mode 100644 index 00000000000..46782840570 --- /dev/null +++ b/pkgs/desktops/kde-4.4/support/phonon/phonon-4.4.1-gst-plugins-include.patch @@ -0,0 +1,263 @@ +From 1e3a6c25bc258021899c0a31ea9b68ea656d8f6b Mon Sep 17 00:00:00 2001 +From: Yury G. Kudryashov +Date: Sat, 8 May 2010 18:42:35 +0400 +Subject: [PATCH] Find include directories as well + +Makes it possible to compile phonon if gstreamer and gst-plugins-base are +installed into different prefixes. Theoretically, should work even if each +plugin is installed into dedicated prefix, but this feature is not tested. +--- + cmake/FindGStreamerPlugins.cmake | 160 +++++++++++++++----------------------- + gstreamer/CMakeLists.txt | 4 +- + gstreamer/ConfigureChecks.cmake | 10 +- + 3 files changed, 72 insertions(+), 102 deletions(-) + +diff --git a/cmake/FindGStreamerPlugins.cmake b/cmake/FindGStreamerPlugins.cmake +index f6d70d5..9e7a4d0 100644 +--- a/cmake/FindGStreamerPlugins.cmake ++++ b/cmake/FindGStreamerPlugins.cmake +@@ -2,19 +2,63 @@ + # Once done this will define + # + # GSTREAMERPLUGINSBASE_FOUND - system has GStreamer_Plugins +-# GSTREAMERPLUGINSBASE_INCLUDE_DIR - the GStreamer_Plugins include directory ++# GSTREAMERPLUGINSBASE_INCLUDE_DIRS - the GStreamer_Plugins include directories + # GSTREAMERPLUGINSBASE_LIBRARIES - the libraries needed to use GStreamer_Plugins +-# GSTREAMERPLUGINSBASE_DEFINITIONS - Compiler switches required for using GStreamer_Plugins ++# ++# The following variables are set for each plugin PLUGINNAME: ++# ++# GSTREAMER_PLUGIN_PLUGINNAME_FOUND - plugin is found ++# GSTREAMER_PLUGIN_PLUGINNAME_INCLUDE_DIR - plugin include directory ++# GSTREAMER_PLUGIN_PLUGINNAME_LIBRARY - the library needed to use plugin + # + # (c)2009 Nokia Corporation ++# (c)2010 Yury G. Kudryashov + + FIND_PACKAGE(PkgConfig REQUIRED) + + IF (NOT WIN32) + # don't make this check required - otherwise you can't use macro_optional_find_package on this one +- PKG_CHECK_MODULES( PKG_GSTREAMER gstreamer-plugins-base-0.10 ) ++ PKG_CHECK_MODULES( PKG_GSTREAMER_PLUGINSBASE gstreamer-plugins-base-0.10 ) + ENDIF (NOT WIN32) + ++MACRO(MACRO_FIND_GSTREAMER_PLUGIN _plugin _header) ++ STRING(TOUPPER ${_plugin} _upper) ++ IF (NOT WIN32) ++ # don't make this check required - otherwise you can't use macro_optional_find_package on this one ++ PKG_CHECK_MODULES( PKG_GSTREAMER_${_upper} gstreamer-${_plugin}-0.10 ) ++ ENDIF (NOT WIN32) ++ ++ FIND_LIBRARY(GSTREAMER_PLUGIN_${_upper}_LIBRARY NAMES gst${_plugin}-0.10 ++ PATHS ++ ${PKG_GSTREAMER_PLUGINSBASE_LIBRARY_DIRS} ++ ${PKG_GSTREAMER_${_upper}_LIBRARY_DIRS} ++ ) ++ ++ FIND_PATH(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR ++ NAMES gst/${_plugin}/${_header} ++ PATHS ++ ${PKG_GSTREAMER_PLUGINSBASE_INCLUDE_DIRS} ++ ${PKG_GSTREAMER_${_upper}_INCLUDE_DIRS} ++ ) ++ ++ IF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) ++ SET(GSTREAMER_PLUGIN_${_upper}_FOUND TRUE) ++ LIST(APPEND GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMER_${_upper}_INCLUDE_DIR) ++ LIST(APPEND GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMER_${_upper}_LIBRARY) ++ ELSE(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) ++ MESSAGE(STATUS "Could not find ${_plugin} plugin") ++ MESSAGE(STATUS "${_upper} library: ${GSTREAMER_${_upper}_LIBRARY}") ++ MESSAGE(STATUS "${_upper} include dir: ${GSTREAMER_${_upper}_INCLUDE_DIR}") ++ SET(GSTREAMER_PLUGIN_${_upper}_FOUND FALSE) ++ SET(GSTREAMER_PLUGIN_${_upper}_LIBRARY GSTREAMER_${_upper}_LIBRARY-NOTFOUND) ++ SET(GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR GSTREAMER_${_upper}_INCLUDE_DIR-NOTFOUND) ++ SET(GSTREAMERPLUGINSBASE_FOUND FALSE) ++ ENDIF(GSTREAMER_PLUGIN_${_upper}_LIBRARY AND GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) ++ ++ MARK_AS_ADVANCED(GSTREAMER_PLUGIN_${_upper}_LIBRARY ++ GSTREAMER_PLUGIN_${_upper}_INCLUDE_DIR) ++ENDMACRO(MACRO_FIND_GSTREAMER_PLUGIN) ++ + # + # Base plugins: + # audio +@@ -31,87 +75,21 @@ ENDIF (NOT WIN32) + # The gstinterfaces-0.10 library is found by FindGStreamer.cmake + # + +-FIND_LIBRARY(GSTREAMER_PLUGIN_AUDIO_LIBRARIES NAMES gstaudio-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_CDDA_LIBRARIES NAMES gstcdda-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES NAMES gstnetbuffer-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_PBUTILS_LIBRARIES NAMES gstpbutils-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_RIFF_LIBRARIES NAMES gstriff-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_RTP_LIBRARIES NAMES gstrtp-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_RTSP_LIBRARIES NAMES gstrtsp-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_SDP_LIBRARIES NAMES gstsdp-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_TAG_LIBRARIES NAMES gsttag-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +-FIND_LIBRARY(GSTREAMER_PLUGIN_VIDEO_LIBRARIES NAMES gstvideo-0.10 +- PATHS +- ${PKG_GSTREAMER_LIBRARY_DIRS} +- ) +- +-IF (GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND +- GSTREAMER_PLUGIN_CDDA_LIBRARIES AND +- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES AND +- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES AND +- GSTREAMER_PLUGIN_RIFF_LIBRARIES AND +- GSTREAMER_PLUGIN_RTP_LIBRARIES AND +- GSTREAMER_PLUGIN_RTSP_LIBRARIES AND +- GSTREAMER_PLUGIN_SDP_LIBRARIES AND +- GSTREAMER_PLUGIN_TAG_LIBRARIES AND +- GSTREAMER_PLUGIN_VIDEO_LIBRARIES) +- SET(GSTREAMERPLUGINSBASE_FOUND TRUE) +-ELSE (GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND +- GSTREAMER_PLUGIN_CDDA_LIBRARIES AND +- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES AND +- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES AND +- GSTREAMER_PLUGIN_RIFF_LIBRARIES AND +- GSTREAMER_PLUGIN_RTP_LIBRARIES AND +- GSTREAMER_PLUGIN_RTSP_LIBRARIES AND +- GSTREAMER_PLUGIN_SDP_LIBRARIES AND +- GSTREAMER_PLUGIN_TAG_LIBRARIES AND +- GSTREAMER_PLUGIN_VIDEO_LIBRARIES) +- SET(GSTREAMERPLUGINSBASE_FOUND FALSE) +-ENDIF (GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND +- GSTREAMER_PLUGIN_CDDA_LIBRARIES AND +- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES AND +- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES AND +- GSTREAMER_PLUGIN_RIFF_LIBRARIES AND +- GSTREAMER_PLUGIN_RTP_LIBRARIES AND +- GSTREAMER_PLUGIN_RTSP_LIBRARIES AND +- GSTREAMER_PLUGIN_SDP_LIBRARIES AND +- GSTREAMER_PLUGIN_TAG_LIBRARIES AND +- GSTREAMER_PLUGIN_VIDEO_LIBRARIES) ++SET(GSTREAMER_PLUGINSBASE_FOUND TRUE) ++MACRO_FIND_GSTREAMER_PLUGIN(audio audio.h) ++MACRO_FIND_GSTREAMER_PLUGIN(cdda gstcddabasesrc.h) ++MACRO_FIND_GSTREAMER_PLUGIN(netbuffer gstnetbuffer.h) ++MACRO_FIND_GSTREAMER_PLUGIN(pbutils pbutils.h) ++MACRO_FIND_GSTREAMER_PLUGIN(riff riff-ids.h) ++MACRO_FIND_GSTREAMER_PLUGIN(rtp gstrtpbuffer.h) ++MACRO_FIND_GSTREAMER_PLUGIN(rtsp gstrtspdefs.h) ++MACRO_FIND_GSTREAMER_PLUGIN(sdp gstsdp.h) ++MACRO_FIND_GSTREAMER_PLUGIN(tag tag.h) ++MACRO_FIND_GSTREAMER_PLUGIN(video video.h) + + IF (GSTREAMERPLUGINSBASE_FOUND) +- SET(GSTREAMERPLUGINS_FOUND TRUE) +-ELSE (GSTREAMERPLUGINSBASE_FOUND) +- SET(GSTREAMERPLUGINS_FOUND FALSE) +-ENDIF (GSTREAMERPLUGINSBASE_FOUND) +- +-IF (GSTREAMERPLUGINS_FOUND) ++ LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_LIBRARIES) ++ LIST(REMOVE_DUPLICATES GSTREAMERPLUGINSBASE_INCLUDE_DIRS) + IF (NOT GStreamer_Plugins_FIND_QUIETLY) + MESSAGE(STATUS "Found GStreamer Plugins: + ${GSTREAMER_PLUGIN_AUDIO_LIBRARIES} +@@ -125,20 +103,10 @@ IF (GSTREAMERPLUGINS_FOUND) + ${GSTREAMER_PLUGIN_TAG_LIBRARIES} + ${GSTREAMER_PLUGIN_VIDEO_LIBRARIES}") + ENDIF (NOT GStreamer_Plugins_FIND_QUIETLY) +-ELSE (GSTREAMERPLUGINS_FOUND) ++ELSE (GSTREAMERPLUGINSBASE_FOUND) ++ SET(GSTREAMERPLUGINSBASE_LIBRARIES GSTREAMERPLUGINSBASE_LIBRARIES-NOTFOUND) ++ SET(GSTREAMERPLUGINSBASE_INCLUDE_DIRS GSTREAMERPLUGINSBASE_INCLUDE_DIRS-NOTFOUND) + IF (GStreamer_Plugins_FIND_REQUIRED) + MESSAGE(SEND_ERROR "Could NOT find GStreamer Plugins") + ENDIF (GStreamer_Plugins_FIND_REQUIRED) +-ENDIF (GSTREAMERPLUGINS_FOUND) +- +-MARK_AS_ADVANCED(GSTREAMERPLUGINS_DEFINITIONS +- GSTREAMER_PLUGIN_AUDIO_LIBRARIES +- GSTREAMER_PLUGIN_CDDA_LIBRARIES +- GSTREAMER_PLUGIN_NETBUFFER_LIBRARIES +- GSTREAMER_PLUGIN_PBUTILS_LIBRARIES +- GSTREAMER_PLUGIN_RIFF_LIBRARIES +- GSTREAMER_PLUGIN_RTP_LIBRARIES +- GSTREAMER_PLUGIN_RTSP_LIBRARIES +- GSTREAMER_PLUGIN_SDP_LIBRARIES +- GSTREAMER_PLUGIN_TAG_LIBRARIES +- GSTREAMER_PLUGIN_VIDEO_LIBRARIES) ++ENDIF (GSTREAMERPLUGINSBASE_FOUND) +diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt +index d529fb6..c42710b 100644 +--- a/gstreamer/CMakeLists.txt ++++ b/gstreamer/CMakeLists.txt +@@ -20,6 +20,8 @@ if (BUILD_PHONON_GSTREAMER) + include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${GSTREAMER_INCLUDE_DIR} ++ ${GSTREAMER_PLUGIN_VIDEO_INCLUDE_DIR} ++ ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR} + ${GLIB2_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${X11_X11_INCLUDE_PATH}) +@@ -78,7 +80,7 @@ if (BUILD_PHONON_GSTREAMER) + ${QT_QTOPENGL_LIBRARY} + ${PHONON_LIBS} ${OPENGL_gl_LIBRARY} + ${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_INTERFACE_LIBRARY} +- ${GSTREAMER_PLUGIN_VIDEO_LIBRARIES} ${GSTREAMER_PLUGIN_AUDIO_LIBRARIES} ++ ${GSTREAMER_PLUGIN_VIDEO_LIBRARY} ${GSTREAMER_PLUGIN_AUDIO_LIBRARY} + ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES}) + if(ALSA_FOUND) + target_link_libraries(phonon_gstreamer ${ASOUND_LIBRARY}) +diff --git a/gstreamer/ConfigureChecks.cmake b/gstreamer/ConfigureChecks.cmake +index 095a0e9..73616fa 100644 +--- a/gstreamer/ConfigureChecks.cmake ++++ b/gstreamer/ConfigureChecks.cmake +@@ -16,8 +16,8 @@ macro_optional_find_package(GStreamer) + macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 0.10 is required for the multimedia backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10") + + macro_optional_find_package(GStreamerPlugins) +-macro_log_feature(GSTREAMER_PLUGIN_VIDEO_LIBRARIES "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10") +-macro_log_feature(GSTREAMER_PLUGIN_AUDIO_LIBRARIES "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10") ++macro_log_feature(GSTREAMER_PLUGIN_VIDEO_FOUND "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10") ++macro_log_feature(GSTREAMER_PLUGIN_AUDIO_FOUND "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10") + + macro_optional_find_package(GLIB2) + macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the gstreamer backend for Phonon" "http://www.gtk.org/download/" FALSE) +@@ -31,8 +31,8 @@ macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required to compile the gs + macro_optional_find_package(OpenGL) + macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE) + +-if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND) ++if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_FOUND AND GSTREAMER_PLUGIN_AUDIO_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND) + set(BUILD_PHONON_GSTREAMER TRUE) +-else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND) ++else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_FOUND AND GSTREAMER_PLUGIN_AUDIO_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND) + set(BUILD_PHONON_GSTREAMER FALSE) +-endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND) ++endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_FOUND AND GSTREAMER_PLUGIN_AUDIO_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND) +-- +1.7.1 + From 9767a35159bf7535d858dad315ac78ff8bd28564 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 8 May 2010 17:30:34 +0000 Subject: [PATCH 183/342] Update suckless urls. svn path=/nixpkgs/trunk/; revision=21664 --- pkgs/applications/window-managers/wmii/default.nix | 2 +- pkgs/applications/window-managers/wmii31/default.nix | 2 +- pkgs/development/libraries/libixp_for_wmii/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index 0750fc7b12d..3df24cf3360 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -2,7 +2,7 @@ args: with args; stdenv.mkDerivation { name = "wmii-20071116"; src = fetchurl { - url = http://code.suckless.org/dl/wmii/wmii-3.6.tar.gz; + url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216"; }; diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix index 1602f1ece39..d5705af5ce1 100644 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ b/pkgs/applications/window-managers/wmii31/default.nix @@ -2,7 +2,7 @@ args: with args; stdenv.mkDerivation { name = "wmiimenu-3.1"; src = fetchurl { - url = http://suckless.org/download/wmii-3.1.tar.gz; + url = http://dl.suckless.org/wmii/wmii-3.1.tar.gz; sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk"; }; diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index 52d6288316f..a322c087d89 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -r lib \$out "; src = fetchurl { - url = http://code.suckless.org/dl/libs/libixp-0.4.tar.gz; + url = http://dl.suckless.org/libs/libixp-0.4.tar.gz; sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; }; From 4f62c83781d1ce8ed86ab5a7246f1a938e4bec75 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 8 May 2010 17:30:43 +0000 Subject: [PATCH 184/342] Update pam_usb url. svn path=/nixpkgs/trunk/; revision=21665 --- pkgs/os-specific/linux/pam_usb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index ce038419731..05137acc043 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "pam_usb-0.4.2"; src = fetchurl { - url = mirror://sourceforge/pamusb/files/pam_usb/pam_usb-0.4.2/pam_usb-0.4.2.tar.gz; + url = mirror://sourceforge/pamusb/pam_usb/pam_usb-0.4.2/pam_usb-0.4.2.tar.gz; sha256 = "736afced7482c7c5d47127285f7defe0a304a6136a0090588fa8698d385ba202"; }; From c82a9ac9214cf73f9b920b9160959afd06b3a1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 8 May 2010 21:25:56 +0000 Subject: [PATCH 185/342] Updating blender svn path=/nixpkgs/trunk/; revision=21670 --- pkgs/applications/misc/blender/default.nix | 57 ++++++------------- .../misc/blender/python-chmod.patch | 14 +++++ pkgs/top-level/all-packages.nix | 16 +++--- 3 files changed, 39 insertions(+), 48 deletions(-) create mode 100644 pkgs/applications/misc/blender/python-chmod.patch diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 7ab744f6a36..2d806cc042d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,50 +1,29 @@ -args: with args; +{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL +, openexr, libsamplerate, libXi, libtiff, ilmbase }: + stdenv.mkDerivation { - name = "blender-2.48"; + name = "blender-2.50a"; src = fetchurl { - url = http://download.blender.org/source/blender-2.48a.tar.gz; - sha256 = "0ijfpy510ls8xq1i8fb6j6wd0vac1jvnzmpiga4g7x1j4fg4s7bq"; + url = http://download.blender.org/source/blender-2.50a1.tar.gz; + sha256 = "1cik05fmf9b8z3qpwsm6q9h1ia87w1piz87hxhfs24jw6l5pyiwr"; }; - phases="unpackPhase buildPhase"; + buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate + libXi libtiff ilmbase ]; - inherit scons SDL freetype openal python openexr mesa; + cmakeFlags = [ "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF" + "-DPYTHON_LIBPATH=${python}/lib" ]; - buildInputs = [python scons - gettext libjpeg libpng zlib freetype /* fmod smpeg */ freealut openal x11 mesa inputproto libtiff libXi - ]; + NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}"; - # patch SConstruct so that we can pass on additional include. Either blender - # or openEXR is broken. I think OpenEXR should use include "" isntead of <> to - # include files beeing in the same directory - buildPhase = " -cat >> user-config.py << EOF -WITH_BF_OPENAL = 'true' -WITH_BF_GAMEENGINE='true' -WITH_BF_BULLET = 'true' -WITH_BF_INTERNATIONAL = 'true' -WITH_BF_OPENEXR = 'true' -EOF - - sed -i -e \"s=##### END SETUP ##########=env['CPPFLAGS'].append(os.getenv('CPPFLAGS').split(':'))\\n##### END SETUP ##########=\" SConstruct\n" - + " CPPFLAGS=-I$openexr/include/OpenEXR" - + " scons PREFIX=\$out/nix-support" - + " BF_SDL=\$SDL" - + " BF_SDL_LIBPATH=\$SDL/lib" - + " BF_FREETYPE=\$freetype" - + " BF_OPENAL=\$openal" - + " BF_PYTHON=\$python" - + " BF_OPENEXR_INC=\$openexr/include" - + " BF_OPENEXR_LIBPATH=\$openexr/lib" - + " BF_INSTALLDIR=\$out/nix-support/dontLinkThatMuch \n" - + " ensureDir \$out/bin\n" - + " ln -s \$out/nix-support/dontLinkThatMuch/blender \$out/bin/blender" - ; + patches = [ ./python-chmod.patch ]; meta = { - description = "3D Creation/Animation/Publishing System"; - homepage = http://www.blender.org; - license = "GPL-2 BL"; - }; + description = "3D Creation/Animation/Publishing System"; + homepage = http://www.blender.org; + # They comment two licenses: GPLv2 and Blender License, but they + # say: "We've decided to cancel the BL offering for an indefinite period." + license = "GPLv2+"; + }; } diff --git a/pkgs/applications/misc/blender/python-chmod.patch b/pkgs/applications/misc/blender/python-chmod.patch new file mode 100644 index 00000000000..bda04b1cbb4 --- /dev/null +++ b/pkgs/applications/misc/blender/python-chmod.patch @@ -0,0 +1,14 @@ +As the code copied from the nix store, the files there do not have the 'writeable' permission. +Hence this fix, needed on nix but not on usual LSB linuces. +diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt +index 386ef1b..6a180fa 100644 +--- a/source/creator/CMakeLists.txt ++++ b/source/creator/CMakeLists.txt +@@ -152,6 +152,7 @@ IF(WITH_INSTALL) + COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here + COMMAND mkdir ${TARGETDIR}/.blender/python/lib/ + COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/ ++ COMMAND chmod -R +w ${TARGETDIR}/.blender/python/lib/ + + COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils + COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f34a369b41f..6848c1f244b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4920,6 +4920,8 @@ let version = "1.4.0"; }; + openexr = openexr_1_6_1; + openldap = import ../development/libraries/openldap { inherit fetchurl stdenv openssl cyrus_sasl db4 groff; }; @@ -7119,15 +7121,11 @@ let }; blender = import ../applications/misc/blender { - inherit cmake mesa gettext freetype SDL libtiff fetchurl glibc scons x11 lib - libjpeg libpng zlib /* smpeg sdl */ python; - inherit (xlibs) inputproto libXi; - freealut = freealut_soft; - openal = openalSoft; - openexr = openexr_1_4_0; - # using gcc43 makes blender segfault when pressing p then esc. - # is this related to the PHP bug? I'm to lazy to try recompilng it without optimizations - stdenv = overrideGCC stdenv gcc42; + inherit fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr + libsamplerate libtiff ilmbase; + inherit (xlibs) libXi; + python = python31Base; + stdenv = stdenv2; }; bmp = import ../applications/audio/bmp { From 8d9af6d5969e1831ae50603a0f31cacad614c47a Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 8 May 2010 21:51:47 +0000 Subject: [PATCH 186/342] patch provided by David Brown adding simple-build-tool which builds Scala packages svn path=/nixpkgs/trunk/; revision=21671 --- .../simple-build-tool/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/tools/build-managers/simple-build-tool/default.nix diff --git a/pkgs/development/tools/build-managers/simple-build-tool/default.nix b/pkgs/development/tools/build-managers/simple-build-tool/default.nix new file mode 100644 index 00000000000..218957ae360 --- /dev/null +++ b/pkgs/development/tools/build-managers/simple-build-tool/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl }: + +# Depends on a JRE at runtime. + +let + version = "0.7.3"; +in + stdenv.mkDerivation rec { + name = "simple-build-tool-${version}"; + src = fetchurl { + url = "http://simple-build-tool.googlecode.com/files/sbt-launch-${version}.jar"; + sha256 = "1nciifzf00cs54a4h57a7v1hyklm5vgln0sscmz5kzv96ggphs6k"; + }; + + installPhase = '' + mkdir -pv "$out/lib/java" + cp $src "$out/lib/java/sbt-launch-${version}.jar" + mkdir -p "$out/bin" + cat > "$out/bin/sbt" < Date: Sat, 8 May 2010 22:24:39 +0000 Subject: [PATCH 187/342] Avahi: Use /var as localstatedir. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Lluís Batlle. svn path=/nixpkgs/trunk/; revision=21672 --- pkgs/development/libraries/avahi/default.nix | 15 ++++++++++----- .../libraries/avahi/no-mkdir-localstatedir.patch | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index ad7ba37568b..f481c8d65e3 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -11,17 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0ndsrd357igp0m2cd8vwr16gmh6axlndf34hlg7qqnsiymsdj84j"; }; + patches = [ ./no-mkdir-localstatedir.patch ]; + buildInputs = [ pkgconfig libdaemon dbus perl perlXMLParser glib expat gettext intltool ] ++ lib.optional qt4Support qt4; - configureFlags = '' - --disable-qt3 --disable-gdbm --disable-gtk --disable-mono - --${if qt4Support then "enable" else "disable"}-qt4 - --with-distro=none --disable-python - ''; + configureFlags = + [ "--disable-qt3" "--disable-gdbm" "--disable-gtk" "--disable-mono" + "--${if qt4Support then "enable" else "disable"}-qt4" "--disable-python" + "--with-distro=none" "--localstatedir=/var" + ]; meta = { description = "Avahi, an mDNS/DNS-SD implementation"; @@ -34,5 +36,8 @@ stdenv.mkDerivation rec { homepage = http://avahi.org; license = "LGPLv2+"; + + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch new file mode 100644 index 00000000000..29e5a05e09d --- /dev/null +++ b/pkgs/development/libraries/avahi/no-mkdir-localstatedir.patch @@ -0,0 +1,14 @@ +Don't "mkdir $(localstatedir)" since we can't do it (/var). + +--- avahi-0.6.25/avahi-daemon/Makefile.in 2009-04-14 03:57:14.000000000 +0200 ++++ avahi-0.6.25/avahi-daemon/Makefile.in 2010-05-09 00:12:35.000000000 +0200 +@@ -1310,7 +1310,7 @@ xmllint: + done + + install-data-local: +- test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run" ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: + From d770597dda2c1133e6a41090b16dc9afcbdcd649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 8 May 2010 22:33:20 +0000 Subject: [PATCH 188/342] I wrote a bad 'name' for blender before. Fixing. svn path=/nixpkgs/trunk/; revision=21674 --- pkgs/applications/misc/blender/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2d806cc042d..87d91e59823 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL , openexr, libsamplerate, libXi, libtiff, ilmbase }: -stdenv.mkDerivation { - name = "blender-2.50a"; +stdenv.mkDerivation rec { + name = "blender-2.50a1"; src = fetchurl { - url = http://download.blender.org/source/blender-2.50a1.tar.gz; + url = "http://download.blender.org/source/${name}.tar.gz"; sha256 = "1cik05fmf9b8z3qpwsm6q9h1ia87w1piz87hxhfs24jw6l5pyiwr"; }; From 6fe4db1c7dd19e8491f3ddbc750a65c7aaad13c3 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 01:09:28 +0000 Subject: [PATCH 189/342] sane-backends update provided by David Brown svn path=/nixpkgs/trunk/; revision=21676 --- pkgs/misc/sane-backends/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index b0ea92e03e8..0b8a12799dd 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -4,11 +4,11 @@ assert hotplugSupport -> stdenv.system == "i686-linux"; stdenv.mkDerivation { - name = "sane-backends-1.0.20"; + name = "sane-backends-1.0.21"; src = fetchurl { - url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.20/sane-backends-1.0.20.tar.gz; - sha256 = "0fixmq3jbz77zcy2cikb882kz8bq3n40n0jaykiczfcjc4g57ccg"; + url = ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.21/sane-backends-1.0.21.tar.gz; + sha256 = "12wl4a86hxwlrx46lm5z6lw4id3j8wi82yv3khxcz5sqjai2ykp4"; }; udevSupport = hotplugSupport; From 9012b226c7eae0f624bc0cfa7b519067f01d2011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 9 May 2010 11:01:29 +0000 Subject: [PATCH 190/342] Fixing the 'awesome' tab completion on Run command svn path=/nixpkgs/trunk/; revision=21677 --- .../applications/window-managers/awesome/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index d706bae0ae6..831743a0522 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua , glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil , libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt}: +, docbook_xml_dtd_45, libxslt, coreutils}: stdenv.mkDerivation rec { name = "awesome-3.4.4"; @@ -15,6 +15,16 @@ stdenv.mkDerivation rec { imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt ]; + # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in + # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as + # dependencies. + patchPhase = '' + # Fix the tab completion (supporting bash or zsh) + sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in + # Remove the 'root' PATH override (I don't know why they have that) + sed /WHOAMI/d -i utils/awsetbg + ''; + # Somehow libev does not get into the rpath, although it should. # Something may be wrong in the gcc wrapper. preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a6ed81d9f..e3c60550705 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7075,7 +7075,7 @@ let awesome = import ../applications/window-managers/awesome { inherit fetchurl stdenv xz cmake gperf imagemagick pkgconfig imlib2 libxdg_basedir libstartup_notification libev asciidoc libxslt xmlto dbus docbook_xsl - docbook_xml_dtd_45; + docbook_xml_dtd_45 coreutils; inherit (gtkLibs) glib pango; inherit (xorg) libxcb xcbutil; lua = lua5; From b7af00b889a035738887ad9acedbe877a6146260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 9 May 2010 12:44:09 +0000 Subject: [PATCH 191/342] Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes, so the session 'bash' will receive the proper locale archive, and thus process UTF-8 properly. svn path=/nixpkgs/trunk/; revision=21678 --- pkgs/tools/networking/openssh/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index cd3074546f4..67ece3c907f 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -23,10 +23,11 @@ stdenv.mkDerivation rec { sha256 = "12kywhjnz6w6kx5fk526fhs2xc7rf234hwrms9p1hqv6zrpdvvin"; }; - patchPhase = stdenv.lib.optionalString hpnSupport + prePatch = stdenv.lib.optionalString hpnSupport '' gunzip -c ${hpnSrc} | patch -p1 ''; + patches = [ ./locale_archive.patch ]; buildInputs = [ zlib openssl perl libedit pkgconfig ] From 8edf4f1896e53a40c3c00598943d665e677c5198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 12:46:22 +0000 Subject: [PATCH 192/342] GNU Emacs 23.2. svn path=/nixpkgs/trunk/; revision=21680 --- pkgs/applications/editors/emacs-23/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index 866baa41ee8..a33dd29ce1b 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -18,13 +18,13 @@ assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-23.1"; + name = "emacs-23.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.bz2"; - sha256 = "076b4ixdp29l4c02bwic26d14gxlj0lcqyam33wyj3ksgi2z8d9b"; + sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z"; }; buildInputs = [ From 8b311ba7573b64c0c941d3a287c19f3d0cb4fc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 9 May 2010 12:53:46 +0000 Subject: [PATCH 193/342] Adding the openssh patch I forgot in a recent commit svn path=/nixpkgs/trunk/; revision=21681 --- .../tools/networking/openssh/locale_archive.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 pkgs/tools/networking/openssh/locale_archive.patch diff --git a/pkgs/tools/networking/openssh/locale_archive.patch b/pkgs/tools/networking/openssh/locale_archive.patch new file mode 100644 index 00000000000..a7f946d693a --- /dev/null +++ b/pkgs/tools/networking/openssh/locale_archive.patch @@ -0,0 +1,15 @@ +diff --git a/session.c b/session.c +index e032de6..44db2bb 100644 +--- a/session.c ++++ b/session.c +@@ -1196,6 +1196,10 @@ do_setup_env(Session *s, const char *shell) + if (getenv("TZ")) + child_set_env(&env, &envsize, "TZ", getenv("TZ")); + ++ /* NixOS path to the glibc locale archive, to be set in the upstart job */ ++ if (getenv("LOCALE_ARCHIVE")) ++ child_set_env(&env, &envsize, "LOCALE_ARCHIVE", getenv("LOCALE_ARCHIVE")); ++ + /* Set custom environment options from RSA authentication. */ + if (!options.use_login) { + while (custom_environment) { From 3e6777935a4205022d68c81b009e8e220428fc5c Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 14:15:37 +0000 Subject: [PATCH 194/342] fix thinking rock url svn path=/nixpkgs/trunk/; revision=21682 --- pkgs/applications/misc/thinking-rock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 0fb87f9555c..553e297cf7f 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -3,7 +3,7 @@ args.stdenv.mkDerivation { name = "thinkingrock-2.2.1-binary"; src = args.fetchurl { - url = mirror://sourceforge/thinkingrock/files/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz; + url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; From 6c21d81ae11ad684fb39bd4e198cbec18c66da21 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 14:17:15 +0000 Subject: [PATCH 195/342] update wmii. libixp vanished svn path=/nixpkgs/trunk/; revision=21683 --- pkgs/applications/window-managers/wmii/default.nix | 10 ++++++---- pkgs/development/libraries/libixp_for_wmii/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 5 +++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index 3df24cf3360..b417639db9d 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -1,12 +1,14 @@ args: with args; stdenv.mkDerivation { - name = "wmii-20071116"; + name = "wmii-3.9b1"; src = fetchurl { - url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; - sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216"; + url = http://dl.suckless.org/wmii/wmii+ixp-3.9b1.tbz; + name = "wmii+ixp-3.9b1.tar.bz2"; # srcUnpack does not know about tbz + sha256 = "0i04mf5cl4m6mn5kcy913mmrnd2ir0ardmskswchnr6fxpbcyvml"; }; - buildInputs = [ libX11 libixp xextproto libXt libXext ]; + buildInputs = [ libX11 libixp xextproto libXt libXext libXft + freetype libXrandr libXinerama pkgconfig]; inherit libixp; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index a322c087d89..fe953e263e3 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -7,15 +7,15 @@ stdenv.mkDerivation { sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk + config.mk make mkdir -p \$out/include cp -r include/*.h \$out/include cp -r lib \$out "; src = fetchurl { - url = http://dl.suckless.org/libs/libixp-0.4.tar.gz; - sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; + url = http://dl.suckless.org/libs/libixp-0.5.tar.gz; + sha256 = "0jqyw8xzih7x7apdp2s9w8agjry890kf55zj2habsg78cyxz1x35"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3c60550705..71226bc355a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8564,8 +8564,9 @@ let wmiiSnap = import ../applications/window-managers/wmii { libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk; - inherit (xlibs) libX11 xextproto libXt libXext; + inherit fetchurl /* fetchhg */ stdenv gawk + freetype pkgconfig; + inherit (xlibs) libX11 xextproto libXt libXext libXft libXrandr libXinerama; includeUnpack = getConfig ["stdenv" "includeUnpack"] false; }; From d86dace29b16619e858f68eb45f5053ad12ef01d Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 14:17:21 +0000 Subject: [PATCH 196/342] adding Eclipse note, readding older version. adding eclipseLatest top level name svn path=/nixpkgs/trunk/; revision=21684 --- pkgs/applications/editors/eclipse/default.nix | 100 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 92 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 225c94faa87..937c5df5894 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,24 +1,104 @@ { stdenv, fetchurl, patchelf, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib , glib, gtk, libXtst, jre + # defaulting to this version because not all installable plugins work with 3.5.2 yet + # can also be set to "latest" +, version ? "3.5.1" }: +/* + Note: Eclipse stores various Eclipse instance specific data in ~/.eclipse/*-instance/... + The '*' depends on the executable location of Eclipse. + + So if an Eclipse dependency such as gtk changes a different Eclipse setup directory will be used and + the plugins and update site list and more global settings seem to be gone. + + Staring Eclipse from ~/.nix-profile/bin/eclipse doesn't help. + + So I suggest copying the store path to ~/eclipse and run ~/eclipse/bin/eclipse instead. + + However this still has some drawbacks: If you run nix-collect-garbage the gtk + libs the wrapper refers to might be gone. It should be easy for you to + replace the imortant lines in the wrapper. + + You can also put this eclipse wrapper script (which was removed from + all-packages.nix -r 18458) + to your packageOverrides section and use that to run eclipse/eclipse. + + Its parameterized by system because you may want to run both: i686 and x86_64 systems. + + eclipseRunner = + pkgs.stdenv.mkDerivation { + name = "nix-eclipse-runner-script-${stdenv.system}"; + + phases = "installPhase"; + installPhase = '' + ensureDir $out/bin + target=$out/bin/nix-run-eclipse-${stdenv.system} + cat > $target << EOF + #!/bin/sh + export PATH=${pkgs.jre}/bin:\$PATH + export LD_LIBRARY_PATH=${pkgs.gtkLibs216.glib}/lib:${pkgs.gtkLibs216.gtk}/lib:${pkgs.xlibs.libXtst}/lib + # If you run out of XX space try these? -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m + eclipse="\$1"; shift + exec \$eclipse -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m "\$@" + EOF + chmod +x $target + ''; + + meta = { + description = "provide environment to run Eclipse"; + longDescription = '' + Is there one distribution providing support for up to date Eclipse installations? + There are various reasons why not. + Installing binaries just works. Get Eclipse binaries form eclipse.org/downloads + install this wrapper then run Eclipse like this: + nix-run-eclipse $PATH_TO_ECLIPSE/eclipse/eclipse + and be happy. Everything works including update sites. + ''; + maintainers = [pkgs.lib.maintainers.marcweber]; + platforms = pkgs.lib.platforms.linux; + }; + }; + +*/ + + +let + + v = if version == "latest" then "3.5.2" else version; + +in + assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "eclipse-3.5.2"; + name = "eclipse-${v}"; src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz; - md5 = "54e2ce0660b2b1b0eb4267acf70ea66d"; + if v == "3.5.2" then + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk-x86_64.tar.gz; + md5 = "54e2ce0660b2b1b0eb4267acf70ea66d"; + } + else + fetchurl { + url = http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz; + md5 = "bde55a2354dc224cf5f26e5320e72dac"; + } + else if v == "3.5.1" then + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk-x86_64.tar.gz; + sha256 = "132zd7q9q29h978wnlsfbrlszc85r1wj30yqs2aqbv3l5xgny1kk"; + } + else + fetchurl { + url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz; + sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56"; } - else - fetchurl { - url = http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/eclipse-SDK-3.5.2-linux-gtk.tar.gz; - md5 = "bde55a2354dc224cf5f26e5320e72dac"; - }; + else throw "no source for eclipse version ${v} known"; desktopItem = makeDesktopItem { name = "Eclipse"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71226bc355a..e94adea7bfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7358,13 +7358,14 @@ let inherit (xlibs) libX11; }; - eclipse = import ../applications/editors/eclipse { + eclipse = makeOverridable (import ../applications/editors/eclipse) { inherit stdenv fetchurl patchelf makeDesktopItem makeWrapper freetype fontconfig jre zlib; # GTK 2.18 gives glitches such as mouse clicks on buttons not # working correctly. inherit (gtkLibs216) glib gtk; inherit (xlibs) libX11 libXext libXrender libXtst; }; + eclipseLatest = eclipse.override { version = "latest"; }; ed = import ../applications/editors/ed { inherit fetchurl stdenv; From 258d886a1735311d18ca929f653f2b1070b3a48d Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 14:17:24 +0000 Subject: [PATCH 197/342] remove duplication in derivation adding tags to source svn path=/nixpkgs/trunk/; revision=21685 --- pkgs/misc/source-and-tags/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index b02c5e843e1..42101fa6ffe 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -48,7 +48,7 @@ args: with args; { sourceWithTags = { inherit (deriv) src; srcDir = if deriv ? srcDir then deriv.srcDir else "."; - name = deriv.name + "-src-with-tags"; + name = deriv.name; createTagFiles = [ { name = "${deriv.name}_haskell"; # tagCmd = "${toString ghcsAndLibs.ghc68.ghc}/bin/hasktags --ignore-close-implementation --ctags `find . -type f -name \"*.*hs\"`; sort tags > \$TAG_FILE"; } From 3303106e97a75327e1d69122346f8aa29cce2416 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 14:33:50 +0000 Subject: [PATCH 198/342] python: support ncurses, replace composedArgsAndFun by makeOverridable because composedArgsAndFun didn't pass values to the builder svn path=/nixpkgs/trunk/; revision=21686 --- pkgs/development/interpreters/python/2.5/default.nix | 3 +++ pkgs/development/interpreters/python/2.6/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 12 +++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/2.5/default.nix b/pkgs/development/interpreters/python/2.5/default.nix index 97a307be122..33aa66d765d 100644 --- a/pkgs/development/interpreters/python/2.5/default.nix +++ b/pkgs/development/interpreters/python/2.5/default.nix @@ -8,6 +8,7 @@ , tcl ? null , libX11 ? null , xproto ? null +, ncurses ? null }: assert zlibSupport -> zlib != null; @@ -30,6 +31,8 @@ let ++ optional (tcl != null) tcl ++ optional (libX11 != null) libX11 ++ optional (xproto != null) xproto + ++ optional (xproto != null) xproto + ++ optional (ncurses != null) ncurses ; in diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 88e9c32a808..8865738b0d7 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -10,6 +10,7 @@ , xproto ? null , arch ? null , sw_vers ? null +, ncurses ? null }: assert zlibSupport -> zlib != null; @@ -39,6 +40,7 @@ let ++ optional (xproto != null) xproto ++ optional (arch != null) arch ++ optional (sw_vers != null) sw_vers + ++ optional (ncurses != null) ncurses ; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e94adea7bfa..1cba0fc33fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2768,11 +2768,11 @@ let inherit fetchurl stdenv zlib bzip2; }; - python25Base = composedArgsAndFun (import ../development/interpreters/python/2.5) { + python25Base = makeOverridable (import ../development/interpreters/python/2.5) { inherit fetchurl stdenv zlib bzip2 gdbm; }; - python25Full = lowPrio (python25Base.passthru.function { + python25Full = lowPrio (python25Base.override { # FIXME: We lack ncurses support, needed, e.g., for `gpsd'. db4 = if getConfig ["python" "db4Support"] true then db4 else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; @@ -2782,15 +2782,16 @@ let tcl = if getConfig ["python" "tkSupport"] true then tcl else null; libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; + ncurses = if getConfig ["python" "curses"] true then ncurses else null; }); - python26Base = composedArgsAndFun (import ../development/interpreters/python/2.6) { + python26Base = makeOverridable (import ../development/interpreters/python/2.6) { inherit fetchurl stdenv zlib bzip2 gdbm; arch = if stdenv.isDarwin then darwinArchUtility else null; sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; }; - python26Full = lowPrio (python26Base.passthru.function { + python26Full = lowPrio (python26Base.override { # FIXME: We lack ncurses support, needed, e.g., for `gpsd'. db4 = if getConfig ["python" "db4Support"] true then db4 else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; @@ -2800,9 +2801,10 @@ let tcl = if getConfig ["python" "tkSupport"] true then tcl else null; libX11 = if getConfig ["python" "tkSupport"] true then xlibs.libX11 else null; xproto = if getConfig ["python" "tkSupport"] true then xlibs.xproto else null; + ncurses = if getConfig ["python" "curses"] true then ncurses else null; }); - python31Base = lowPrio (composedArgsAndFun (import ../development/interpreters/python/3.1) { + python31Base = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) { inherit fetchurl stdenv zlib bzip2 gdbm; arch = if stdenv.isDarwin then darwinArchUtility else null; sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null; From fd8c6ae43dca2f795660e9b67e770a14bf70f685 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 9 May 2010 16:01:44 +0000 Subject: [PATCH 199/342] Moved 'maintainers' attribute into the meta section of the expression. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I've also set the 'platforms' attribute to ensure that Hydra actually builds these packages. Thanks to Lluís Batlle i Rossell for pointing out these mistakes. svn path=/nixpkgs/trunk/; revision=21688 --- pkgs/applications/science/math/maxima/default.nix | 4 ++-- pkgs/development/interpreters/maude/default.nix | 14 +++++++------- .../tools/build-managers/scons/default.nix | 4 ++-- pkgs/tools/networking/pdsh/default.nix | 13 +++++++------ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index e9728ac984d..a06d3805209 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Maxima computer algebra system"; homepage = http://maxima.sourceforge.net; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; - - maintainers = [ stdenv.lib.maintainers.simons ]; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index c41c17c6e3c..4dc64fc15a9 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -3,12 +3,6 @@ stdenv.mkDerivation rec { name = "maude-2.4"; - meta = { - homepage = "http://maude.cs.uiuc.edu/"; - description = "Maude -- a high-level specification language"; - license = "GPLv2"; - }; - src = fetchurl { url = "http://maude.cs.uiuc.edu/download/current/Maude-2.4.tar.gz"; sha256 = "0bydkf8fd5v267bfak4mm5lmm3vvnr6ir1jr7gimgyzqygdk0in2"; @@ -43,5 +37,11 @@ stdenv.mkDerivation rec { mv maude-2.3.0-extras/* $out/share/doc/maude/ ''; - maintainers = [ stdenv.lib.maintainers.simons ]; + meta = { + homepage = "http://maude.cs.uiuc.edu/"; + description = "Maude -- a high-level specification language"; + license = "GPLv2"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 2e72047354c..3e549fe7bbe 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { SCons is an easier, more reliable and faster way to build software. ''; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; - - maintainers = [ stdenv.lib.maintainers.simons ]; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 3ea7a7bdd5c..1034d7e09f5 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -2,11 +2,6 @@ stdenv.mkDerivation rec { name = "pdsh-2.18"; - meta = { - homepage = "https://computing.llnl.gov/linux/pdsh.html"; - description = "A high-performance, parallel remote shell utility."; - license = "GPLv2"; - }; src = fetchurl { url = "mirror://sourceforge/pdsh/${name}.tar.bz2"; sha256 = "8c94acb17b4af8a9f553db180b4d5745c9c98844a5dc070e2ce80590e8e8a539"; @@ -40,5 +35,11 @@ stdenv.mkDerivation rec { + " --disable-debug" ; - maintainers = [ stdenv.lib.maintainers.simons ]; + meta = { + homepage = "https://computing.llnl.gov/linux/pdsh.html"; + description = "A high-performance, parallel remote shell utility."; + license = "GPLv2"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; } From 7ccbfc17467a46550f431666851aa254db4b362c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 9 May 2010 19:14:06 +0000 Subject: [PATCH 200/342] Fixing nfsUtils rpc.statd about pointing to the sm-notify binary. It pointed to /usr/sbin svn path=/nixpkgs/trunk/; revision=21689 --- pkgs/os-specific/linux/nfs-utils/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 14be5f196f8..b651d39b888 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -18,11 +18,13 @@ stdenv.mkDerivation rec { ]; patchPhase = - '' for i in "tests/"*.sh - do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' - chmod +x "$i" - done + '' + for i in "tests/"*.sh + do + sed -i "$i" -e's|/bin/bash|/bin/sh|g' + chmod +x "$i" + done + sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c ''; preBuild = From 6a9f333ceaa4bd90fe2c317af4bf6b95471a7657 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 20:38:12 +0000 Subject: [PATCH 201/342] geos update 3.2.2 because of postgis svn path=/nixpkgs/trunk/; revision=21690 --- pkgs/development/libraries/geos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index d30f55b95c6..cbb0c23e311 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -10,11 +10,11 @@ composableDerivation {} { # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else []) # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };} - name = "geos-3.0.3"; + name = "geos-3.2.2"; src = fetchurl { - url = http://download.osgeo.org/geos/geos-3.0.3.tar.bz2; - sha256 = "1pxk20jcbyidp3bvip1vdf8wfw2wvh8pcn810qkf1y3zfnki0c7k"; + url = http://download.osgeo.org/geos/geos-3.2.2.tar.bz2; + sha256 = "0711wcq46h7zgvp0bk4m60vmx1wal9db1q36mayf0vwk34hprpr4"; }; # for development version. can be removed ? From 27ef15a6bd952d867517e5a981a73fc306b850d4 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 9 May 2010 20:38:16 +0000 Subject: [PATCH 202/342] adding postgis + script enabling postgis features Exporting builder.pl because it will be used in NixOS postgresql module svn path=/nixpkgs/trunk/; revision=21691 --- .../development/libraries/postgis/default.nix | 51 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/libraries/postgis/default.nix diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix new file mode 100644 index 00000000000..41068c4e39a --- /dev/null +++ b/pkgs/development/libraries/postgis/default.nix @@ -0,0 +1,51 @@ +{stdenv, fetchurl, libxml2, postgresql, geos, proj, perl}: + +# TODO: the bin commands to have gtk gui +# compile this optionally ? + +# NixOS - usage: services.posgresql.extraPlugins = [ pkgs.postgis ]; + +stdenv.mkDerivation { + name = "postgis"; + + src = fetchurl { + url = http://postgis.refractions.net/download/postgis-1.5.1.tar.gz; + sha256 = "0nymvqqi6pp4nh4dcshzqm76x4sraf119jp7l27c2q1lygm6p6jr"; + }; + + makeFlags = "PERL=${perl}/bin/perl"; + + # default both defaul to postgis location !? + preConfigure = '' + configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" + + # makeFlags="DESTDIR=$out " + ''; + + # create a script enabling postgis features + postInstall = '' + cat >> $out/bin/enable_postgis_for_db << EOF + #!/bin/sh + set -x + t=$out/share/contrib/postgis-1.5 + for db in "\$@"; do + createlang plpgsql \$db + for f in postgis spatial_ref_sys; do + psql -d \$db -f \$t/\$f.sql + done + done + EOF + chmod +x $out/bin/enable_postgis_for_db + ''; + + buildInputs = [libxml2 postgresql geos proj perl]; + + meta = { + description = "Geographic Objects for PostgreSQL"; + homepage = "http://postgis.refractions.net"; + license = "GPLv2"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1cba0fc33fe..bf8e544519e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -218,6 +218,7 @@ let theAttrSet = arg; }; + buildEnvScript = ../build-support/buildenv/builder.pl; buildEnv = import ../build-support/buildenv { inherit stdenv perl; }; @@ -5012,6 +5013,10 @@ let inherit fetchurl stdenv; }; + postgis = import ../development/libraries/postgis { + inherit stdenv fetchurl libxml2 postgresql geos proj perl; + }; + pth = import ../development/libraries/pth { inherit fetchurl stdenv; }; From e583aae98cf2ede5ad66934dfe1730305fa1da6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 23:14:23 +0000 Subject: [PATCH 203/342] Emacs: Add optional dependencies on GConf and librsvg. svn path=/nixpkgs/trunk/; revision=21694 --- pkgs/applications/editors/emacs-23/default.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index a33dd29ce1b..fac7abadcb4 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -6,7 +6,8 @@ , xftSupport ? false , stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null , pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null -, libpng, libjpeg, libungif, libtiff, texinfo +, libpng, libjpeg, libungif, libtiff, librsvg, texinfo +, gconf ? null }: assert xawSupport -> libXaw != null; @@ -33,14 +34,14 @@ stdenv.mkDerivation rec { (if xpmSupport then libXpm else null) (if dbusSupport then dbus else null) (if xaw3dSupport then Xaw3d else null) - libpng libjpeg libungif libtiff # maybe not strictly required? + libpng libjpeg libungif libtiff librsvg ] ++ (if gtkGUI then [pkgconfig gtk] else []) - ++ (if xftSupport then [libXft] else []); + ++ (if xftSupport then [libXft] else []) + ++ stdenv.lib.optional (gconf != null) gconf; - configureFlags = " - ${if gtkGUI then "--with-x-toolkit=gtk --enable-font-backend --with-xft" else ""} - "; + configureFlags = + stdenv.lib.optionals gtkGUI [ "--with-x-toolkit=gtk" "--with-xft" ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf8e544519e..2defc50c704 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7399,9 +7399,10 @@ let emacs23 = import ../applications/editors/emacs-23 { inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d - libpng libjpeg libungif libtiff texinfo dbus; + libpng libjpeg libungif libtiff librsvg texinfo dbus; inherit (xlibs) libXaw libXpm libXft; inherit (gtkLibs) gtk; + gconf = gnome.GConf; # optional GConf support. xawSupport = stdenv.isDarwin || getPkgConfig "emacs" "xawSupport" false; xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; gtkGUI = getPkgConfig "emacs" "gtkSupport" true; From 11d4a76c272dc87b3a447fb2870e4c313573d915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 23:14:29 +0000 Subject: [PATCH 204/342] gnupdate: Use SSAX instead of SXML to reduce the memory & CPU overhead. * maintainers/scripts/gnu/gnupdate.scm (xml-element->snix): New procedure. (xml->snix): Rewrite to use a parser generated by `ssax:make-parser'. (%options)[sxml]: Remove. (main): Update accordingly. svn path=/nixpkgs/trunk/; revision=21695 --- maintainers/scripts/gnu/gnupdate.scm | 242 ++++++++++++--------------- 1 file changed, 106 insertions(+), 136 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index e43e5baf32c..53d52e73ab9 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -17,13 +17,12 @@ (cond-expand (guile-2 #t) (else (error "GNU Guile 2.0 is required"))) -(use-modules (sxml simple) +(use-modules (sxml ssax) (ice-9 popen) (ice-9 match) (ice-9 rdelim) (ice-9 regex) (ice-9 vlist) - (sxml-match) (srfi srfi-1) (srfi srfi-9) (srfi srfi-11) @@ -47,6 +46,13 @@ (and line column path (make-location path (string->number line) (string->number column)))) +;; XXX: Hack to add missing exports from `(sxml ssax)' as of 1.9.10. +(let ((ssax (resolve-module '(sxml ssax)))) + (for-each (lambda (sym) + (module-add! (current-module) sym + (module-variable ssax sym))) + '(ssax:warn ssax:skip-pi nl))) + ;; Nix object types visible in the XML output of `nix-instantiate' and ;; mapping to S-expressions (we map to sexps, not records, so that we ;; can do pattern matching): @@ -58,7 +64,7 @@ ;; bool #f|#t ;; derivation (derivation drv-path out-path attributes) ;; ellipsis '... -;; expr (expr loc body ...) +;; expr (snix loc body ...) ;; function (function loc at|attrspat|varpat) ;; int int ;; list list @@ -73,118 +79,100 @@ ;; lazily because the whole SXML tree has to be traversed to maintain the ;; list of known derivations. -(define (sxml->snix tree) +(define (xml-element->snix elem attributes body derivations) + ;; Return an SNix element corresponding to XML element ELEM. + + (define (loc) + (->loc (assq-ref attributes 'line) + (assq-ref attributes 'column) + (assq-ref attributes 'path))) + + (case elem + ((at) + (values `(at ,(car body) ,(cadr body)) derivations)) + ((attr) + (let ((name (assq-ref attributes 'name))) + (cond ((null? body) + (values `(attribute-pattern ,name) derivations)) + ((and (pair? body) (null? (cdr body))) + (values `(attribute ,(loc) ,name ,(car body)) + derivations)) + (else + (error "invalid attribute body" name (loc) body))))) + ((attrs) + (values `(attribute-set ,(reverse body)) derivations)) + ((attrspat) + (values `(attribute-set-pattern ,body) derivations)) + ((bool) + (values (string-ci=? "true" (assq-ref attributes 'value)) + derivations)) + ((derivation) + (let ((drv-path (assq-ref attributes 'drvPath)) + (out-path (assq-ref attributes 'outPath))) + (if (equal? body '(repeated)) + (let ((body (vhash-assoc drv-path derivations))) + (if (pair? body) + (values `(derivation ,drv-path ,out-path ,(cdr body)) + derivations) + (error "no previous occurrence of derivation" + drv-path))) + (values `(derivation ,drv-path ,out-path ,body) + (vhash-cons drv-path body derivations))))) + ((ellipsis) + (values '... derivations)) + ((expr) + (values `(snix ,(loc) ,@body) derivations)) + ((function) + (values `(function ,(loc) ,body) derivations)) + ((int) + (values (string->number (assq-ref attributes 'value)) + derivations)) + ((list) + (values body derivations)) + ((null) + (values 'null derivations)) + ((path) + (values (assq-ref attributes 'value) derivations)) + ((repeated) + (values 'repeated derivations)) + ((string) + (values (assq-ref attributes 'value) derivations)) + ((unevaluated) + (values 'unevaluated derivations)) + ((varpat) + (values `(varpat ,(assq-ref attributes 'name)) derivations)) + (else (error "unhandled Nix XML element" elem)))) + +(define xml->snix ;; Return the SNix represention of TREE, an SXML tree as returned by ;; parsing the XML output of `nix-instantiate' on Nixpkgs. + (let ((parse + (ssax:make-parser NEW-LEVEL-SEED + (lambda (elem-gi attributes namespaces expected-content + seed) + (cons '() (cdr seed))) - ;; FIXME: We should use SSAX to avoid the SXML step otherwise we end up - ;; eating memory up to the point where fork(2) returns ENOMEM! + FINISH-ELEMENT + (lambda (elem-gi attributes namespaces parent-seed + seed) + (let ((snix (car seed)) + (derivations (cdr seed))) + (let-values (((snix derivations) + (xml-element->snix elem-gi + attributes + snix + derivations))) + (cons (cons snix (car parent-seed)) + derivations)))) - (define whitespace - ;; The whitespace marker. - (cons 'white 'space)) - - (let loop ((node tree) - (derivations vlist-null)) - (define (process-body body) - (let ((result+derivations - (fold (lambda (node result) - (let-values (((out derivations) - (loop node (cdr result)))) - (if (eq? out whitespace) - result - (cons (cons out (car result)) - derivations)))) - (cons '() derivations) - body))) - (values (reverse (car result+derivations)) - (cdr result+derivations)))) - - (sxml-match node - (,x - (guard (and (string? x) (string=? (string-trim-both x) ""))) - (values whitespace derivations)) - ((*TOP* (*PI* ,_ ...) (expr ,body ...)) - ;; The entry/exit point. Of the two values returned, the second one - ;; is likely to be discarded by the caller (thanks to multiple-value - ;; truncation). - (let-values (((body derivations) (process-body body))) - (values (cons* 'snix #f body) - derivations))) - ((at ,body ...) - (let-values (((body derivations) (process-body body))) - (values (list 'at body) derivations))) - ((attr (@ (name ,name) - (line (,line #f)) (column (,column #f)) (path (,path #f))) - ,body ...) - (let-values (((body derivations) (process-body body))) - (values (cons* 'attribute - (->loc line column path) - name - (if (or (null? body) - (and (pair? body) (null? (cdr body)))) - body - (error 'sxml->snix "invalid attribute body" - body))) - derivations))) - ((attrs ,body ...) - (let-values (((body derivations) (process-body body))) - (values (list 'attribute-set body) - derivations))) - ((attrspat ,body ...) - (let-values (((body derivations) (process-body body))) - (values (cons 'attribute-set-pattern body) - derivations))) - ((bool (@ (value ,value))) - (values (string-ci=? value "true") derivations)) - ((derivation (@ (drvPath ,drv-path) (outPath ,out-path)) ,body ...) - (let-values (((body derivations) (process-body body))) - (let ((repeated? (equal? body '(repeated)))) - (values (list 'derivation drv-path out-path - (if repeated? - (let ((body (vhash-assoc drv-path derivations))) - (if (pair? body) - (cdr body) - (error "no previous occurrence of derivation" - drv-path))) - body)) - (if repeated? - derivations - (vhash-cons drv-path body derivations)))))) - ((ellipsis) - (values '... derivations)) - ((function (@ (line (,line #f)) (column (,column #f)) (path (,path #f))) - ,body ...) - (let-values (((body derivations) (process-body body))) - (values (cons* 'function - (->loc line column path) - (if (and (pair? body) (null? (cdr body))) - body - (error 'sxml->snix "invalid function body" - body))) - derivations))) - ((int (@ (value ,value))) - (values (string->number value) derivations)) - (,x - ;; We can't use `(list ,body ...)', which has a different meaning, - ;; hence the guard hack. - (guard (and (pair? x) (eq? (car x) 'list))) - (process-body (cdr x))) - ((null) - (values 'null derivations)) - ((path (@ (value ,value))) - (values value derivations)) - ((repeated) - ;; This is then handled in `derivation' above. - (values 'repeated derivations)) - ((string (@ (value ,value))) - (values value derivations)) - ((unevaluated) - (values 'unevaluated derivations)) - ((varpat (@ (name ,name))) - (values (list 'varpat name) derivations)) - (,x - (error 'sxml->snix "unmatched sxml form" x))))) + CHAR-DATA-HANDLER + (lambda (string1 string2 seed) + ;; Discard inter-node strings, which are blanks. + seed)))) + (lambda (port) + ;; Discard the second value returned by the parser (the derivation + ;; vhash). + (caar (parse port (cons '() vlist-null)))))) (define (call-with-package snix proc) (match snix @@ -658,20 +646,15 @@ (format #t "~%") (format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%") (format #t " from FILE.~%") - (format #t " -s, --sxml=FILE Read SXML output of `nix-instantiate'~%") - (format #t " from FILE.~%") (format #t " -h, --help Give this help list.~%~%") (format #t "Report bugs to ~%") (exit 0))) (option '(#\x "xml") #t #f (lambda (opt name arg result) - (alist-cons 'xml-file arg result))) - (option '(#\s "sxml") #t #f - (lambda (opt name arg result) - (alist-cons 'sxml-file arg result))))) + (alist-cons 'xml-file arg result))))) -(define (main . args) +(define-public (main . args) ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs. (let* ((opts (args-fold args %options (lambda (opt name arg result) @@ -682,24 +665,11 @@ (home (getenv "HOME")) (path (or (getenv "NIXPKGS") (string-append home "/src/nixpkgs"))) - (sxml (or (and=> (assoc-ref opts 'sxml-file) - (lambda (input) - (format (current-error-port) - "reading SXML...~%") - (read-disable 'positions) ;; reduce memory usage - (with-input-from-file input read))) - (begin - (format (current-error-port) "parsing XML...~%") - (xml->sxml - (or (and=> (assoc-ref opts 'xml-file) - open-input-file) - (open-nixpkgs path)))))) - (snix (let ((s (begin - (format (current-error-port) - "producing SNix tree...~%") - (sxml->snix sxml)))) - (set! sxml #f) (gc) - s)) + (snix (begin + (format (current-error-port) "parsing XML...~%") + (xml->snix + (or (and=> (assoc-ref opts 'xml-file) open-input-file) + (open-nixpkgs path))))) (packages (match snix (('snix _ ('attribute-set attributes)) attributes) From c63a2c79a4e4d60a0b452475fc0933b8522b88bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 23:14:34 +0000 Subject: [PATCH 205/342] GNU Zile 2.3.16. svn path=/nixpkgs/trunk/; revision=21696 --- pkgs/applications/editors/zile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index 332033d48d7..3cc8d984a8c 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ncurses, help2man }: stdenv.mkDerivation rec { - name = "zile-2.3.15"; + name = "zile-2.3.16"; src = fetchurl { url = "mirror://gnu/zile/${name}.tar.gz"; - sha256 = "09argmn5klh5w6nn9xq2msrv1pcc7c11glanlc7ip9kbkbgxlm3w"; + sha256 = "1lm24sw2ziqsib11sddz7gcqzw5iwfnsx65m1i461kxq218xl59h"; }; buildInputs = [ ncurses help2man ]; From a5bfd4541979c408fd20534ab2dd00225945ac68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 23:14:39 +0000 Subject: [PATCH 206/342] GNU gv 3.6.9. svn path=/nixpkgs/trunk/; revision=21697 --- pkgs/applications/misc/gv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index c01f516599f..cce4c54b828 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, Xaw3d, ghostscriptX }: stdenv.mkDerivation rec { - name = "gv-3.6.8"; + name = "gv-3.6.9"; src = fetchurl { url = "mirror://gnu/gv/${name}.tar.gz"; - sha256 = "1i86a4wfswp908gp4i0f6jbksn8bqqzkfy58r9ishspzkp2fb510"; + sha256 = "1b7n4xbgbgjvbq9kmacmk12vfwzc443bcs38p8k4yb60m7r7qzkb"; }; buildInputs = [ Xaw3d ghostscriptX ]; From 601f46e716260c5adfc3cb5e305ee4cc1b57ba0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 23:14:44 +0000 Subject: [PATCH 207/342] GNU libtasn1 2.6. svn path=/nixpkgs/trunk/; revision=21698 --- pkgs/development/libraries/libtasn1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index 31ae886d2e4..48575ee2bff 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.5"; + name = "libtasn1-2.6"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "0xr4hsrs7cjx5zy7nkm6a93gkx7dkynyycgk2ayhscf5n5z96pyz"; + sha256 = "1izrmbmrj29822qbp2dlsjkdck0hnjilplcq2i23cwgdqk79rsvs"; }; doCheck = true; From 53c13c689275fa7676ac1c6375b4355607059e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 23:14:50 +0000 Subject: [PATCH 208/342] GNU libunistring 0.9.3. svn path=/nixpkgs/trunk/; revision=21699 --- pkgs/development/libraries/libunistring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 4219142250f..c7e76447e3f 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation (rec { - name = "libunistring-0.9.2.1"; + name = "libunistring-0.9.3"; src = fetchurl { url = "mirror://gnu/libunistring/${name}.tar.gz"; - sha256 = "1y9dcj972in9rx9lw9xkmirdfv92m00ccd553hhr37dby1gzinjl"; + sha256 = "18q620269xzpw39dwvr9zpilnl2dkw5z5kz3mxaadnpv4k3kw3b1"; }; propagatedBuildInputs = From 7e4f5567d4ad6f7d014e9e7064f3a42055322a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 9 May 2010 23:14:55 +0000 Subject: [PATCH 209/342] gnupdate: Add quirk for `commoncpp2'. * maintainers/scripts/gnu/gnupdate.scm (ftp-server/directory)[quirks]: Add `commoncpp2'. svn path=/nixpkgs/trunk/; revision=21700 --- maintainers/scripts/gnu/gnupdate.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index 53d52e73ab9..b64d4f41397 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -466,7 +466,8 @@ (define (ftp-server/directory project) (define quirks - '(("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t) + '(("commoncpp2" "ftp.gnu.org" "/gnu/commoncpp" #f) + ("libgcrypt" "ftp.gnupg.org" "/gcrypt" #t) ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t) ("gnupg" "ftp.gnupg.org" "/gcrypt" #t) ("gnu-ghostscript" "ftp.gnu.org" "/ghostscript" #f) From e47a2a9651895a158c4917f73a0081e2eb9beb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 10 May 2010 10:20:51 +0000 Subject: [PATCH 210/342] Adding blender 2.49, additional to the last 'alpha' 2.50 there already was in nixpkgs. I put the alpha in lowPrio too; too many things don't work still, there. svn path=/nixpkgs/trunk/; revision=21701 --- pkgs/applications/misc/blender/2.49.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 +++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/misc/blender/2.49.nix diff --git a/pkgs/applications/misc/blender/2.49.nix b/pkgs/applications/misc/blender/2.49.nix new file mode 100644 index 00000000000..6a66c45b94f --- /dev/null +++ b/pkgs/applications/misc/blender/2.49.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, cmake, mesa, gettext, python, libjpeg, libpng, zlib, openal, SDL +, openexr, libsamplerate, libXi, libtiff, ilmbase, freetype}: + +stdenv.mkDerivation rec { + name = "blender-2.49b"; + + src = fetchurl { + url = "http://download.blender.org/source/${name}.tar.gz"; + sha256 = "1214fp2asij7l1sci2swh46nfjgpm72gk2qafq70xc0hmas4sm93"; + }; + + buildInputs = [ cmake mesa gettext python libjpeg libpng zlib openal SDL openexr libsamplerate + libXi libtiff ilmbase freetype ]; + + cmakeFlags = [ "-DFREETYPE_INC=${freetype}/include" "-DOPENEXR_INC=${openexr}/include/OpenEXR" "-DWITH_OPENCOLLADA=OFF" + "-DPYTHON_LIBPATH=${python}/lib" ]; + + NIX_LDFLAGS = "-lX11"; + NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2"; + + installPhase = '' + ensureDir $out/bin + cp bin/* $out/bin + ''; + + meta = { + description = "3D Creation/Animation/Publishing System"; + homepage = http://www.blender.org; + # They comment two licenses: GPLv2 and Blender License, but they + # say: "The BL has not been activated yet." + license = "GPLv2+"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2defc50c704..9c07cf88f86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7131,13 +7131,21 @@ let openal = openalSoft; }; - blender = import ../applications/misc/blender { + blender = import ../applications/misc/blender/2.49.nix { + inherit fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr + libsamplerate libtiff ilmbase freetype; + inherit (xlibs) libXi; + python = python26Base; + stdenv = stdenv2; + }; + + blender_2_50 = lowPrio (import ../applications/misc/blender { inherit fetchurl cmake mesa gettext libjpeg libpng zlib openal SDL openexr libsamplerate libtiff ilmbase; inherit (xlibs) libXi; python = python31Base; stdenv = stdenv2; - }; + }); bmp = import ../applications/audio/bmp { inherit fetchurl stdenv pkgconfig libogg libvorbis alsaLib id3lib; From e4fecd6b8e5eb79c722b6db212e29000f073fd4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 12:33:58 +0000 Subject: [PATCH 211/342] gnupdate: Fix typo. svn path=/nixpkgs/trunk/; revision=21703 --- maintainers/scripts/gnu/gnupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 741ce7e63ee..31340ca2399 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -1,4 +1,4 @@ #!/bin/sh exec "${GUILE:-guile}" $GUILE_FLAGS -L . -l gnupdate.scm \ - -e '(apply main (cdr (command-line)))' -- "$@" + -c '(apply main (cdr (command-line)))' -- "$@" From 86e3de70e1b07d8157f12c15e514391cd49f2a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 12:57:10 +0000 Subject: [PATCH 212/342] GNU gettext 0.18 (not in stdenv). svn path=/nixpkgs/trunk/; revision=21704 --- pkgs/development/libraries/gettext/0.18.nix | 66 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/libraries/gettext/0.18.nix diff --git a/pkgs/development/libraries/gettext/0.18.nix b/pkgs/development/libraries/gettext/0.18.nix new file mode 100644 index 00000000000..72d23b4c9a9 --- /dev/null +++ b/pkgs/development/libraries/gettext/0.18.nix @@ -0,0 +1,66 @@ +# XXX: Remove me when `stdenv-updates' is merged. + +{ stdenv, fetchurl, libiconv }: + +stdenv.mkDerivation (rec { + name = "gettext-0.18"; + + src = fetchurl { + url = "mirror://gnu/gettext/${name}.tar.gz"; + sha256 = "1rbgm6sxgq218pridn2vji5nlj3hdf4vs75rz00wc0wcw4fjqd02"; + }; + + configureFlags = "--disable-csharp"; + + # On cross building, gettext supposes that the wchar.h from libc + # does not fulfill gettext needs, so it tries to work with its + # own wchar.h file, which does not cope well with the system's + # wchar.h and stddef.h (gcc-4.3 - glibc-2.9) + preConfigure = '' + if test -n "$crossConfig"; then + echo gl_cv_func_wcwidth_works=yes > cachefile + configureFlags="$configureFlags --cache-file=`pwd`/cachefile" + fi + ''; + + crossAttrs = { + buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) + stdenv.gccCross.libc.libiconv.hostDrv; + }; + + meta = { + description = "GNU gettext, a well integrated set of translation tools and documentation"; + + longDescription = '' + Usually, programs are written and documented in English, and use + English at execution time for interacting with users. Using a common + language is quite handy for communication between developers, + maintainers and users from all countries. On the other hand, most + people are less comfortable with English than with their own native + language, and would rather be using their mother tongue for day to + day's work, as far as possible. Many would simply love seeing their + computer screen showing a lot less of English, and far more of their + own language. + + GNU `gettext' is an important step for the GNU Translation Project, as + it is an asset on which we may build many other steps. This package + offers to programmers, translators, and even users, a well integrated + set of tools and documentation. Specifically, the GNU `gettext' + utilities are a set of tools that provides a framework to help other + GNU packages produce multi-lingual messages. + ''; + + homepage = http://www.gnu.org/software/gettext/; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} + +// + +(if (!stdenv.isLinux) # any non-GNU system + then { + buildInputs = [ libiconv ]; + } + else {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c07cf88f86..1f2e93067b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3823,6 +3823,11 @@ let inherit fetchurl stdenv libiconv; }; + # XXX: Remove me when `stdenv-updates' is merged. + gettext_0_18 = import ../development/libraries/gettext/0.18.nix { + inherit fetchurl stdenv libiconv; + }; + gd = import ../development/libraries/gd { inherit fetchurl stdenv zlib libpng freetype libjpeg fontconfig; }; From fbb4886d493f8b0c865d6df75f8054f346de1628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 14:30:35 +0000 Subject: [PATCH 213/342] gnupdate: Fix typo in the GNU predicate. * maintainers/scripts/gnu/gnupdate.scm (gnu?): Fix typo analyzing `meta.homepage'. svn path=/nixpkgs/trunk/; revision=21706 --- maintainers/scripts/gnu/gnupdate.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index b64d4f41397..3dc2e566f6c 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -440,7 +440,7 @@ (match attr (('attribute _ "description" value) (string-prefix? "GNU" value)) - (('attribute "homepage" value) + (('attribute _ "homepage" value) (string-contains value "www.gnu.org")) (_ #f))) metas)) From 714937bfa3453e4e855fee12d1aa0522cbb0646f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 14:30:39 +0000 Subject: [PATCH 214/342] GNU Hello 2.6. svn path=/nixpkgs/trunk/; revision=21707 --- pkgs/applications/misc/hello/ex-2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index ad153341a27..a7cf2b19762 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-2.5"; + name = "hello-2.6"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0in467phypnis2ify1gkmvc5l2fxyz3s4xss7g74gwk279ylm4r2"; + sha256 = "1h6fjkkwr7kxv0rl5l61ya0b49imzfaspy7jk9jas1fil31sjykl"; }; + doCheck = true; + meta = { description = "A program that produces a familiar, friendly greeting"; longDescription = '' @@ -16,5 +18,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/hello/manual/; license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; } From 340f826442c846389d3e3ddce689204db1cce864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 14:30:44 +0000 Subject: [PATCH 215/342] GNU Wdiff 0.6.1. svn path=/nixpkgs/trunk/; revision=21708 --- pkgs/tools/text/wdiff/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index da1ff92add3..fd3d4f94769 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "wdiff-0.5.95"; + name = "wdiff-0.6.1"; src = fetchurl { url = "http://alpha.gnu.org/gnu/wdiff/${name}.tar.gz"; - sha256 = "1rha2x8b6i0gk9s2gp61x4acakkx5q9ar1k54x9grmgr6w7fzd97"; + sha256 = "0cgmx9k8sj0l79kp4m2lmn4ifx55ah68q4qk7xsanx69m1061ghf"; }; - + + doCheck = true; + meta = { homepage = http://www.gnu.org/software/wdiff/; - description = "A front-end to diff for comparing files on a word per word basis"; - license = "GPLv3"; - maintainers = [ stdenv.lib.maintainers.eelco ]; + description = "GNU wdiff, comparing files on a word by word basis"; + license = "GPLv3+"; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; } From d1bca917cdf66da7c96b9f01805e717d7b97aba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 14:30:48 +0000 Subject: [PATCH 216/342] GNU Scientific Library 1.14. svn path=/nixpkgs/trunk/; revision=21709 --- pkgs/development/libraries/gsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 781db753cd3..d479610838c 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.13"; + name = "gsl-1.14"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "1ix2ic7m8spkbmkxz9549385agpy2vxi6wim0vhcnm08wjk4hih9"; + sha256 = "1yzsazwz7w9pckh7y0mnbl75ykfcv20426vrjwxwgrx1v6plfjix"; }; doCheck = true; From f64cc94638d43df0d0eb33f211b30313cd1eef3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 14:30:52 +0000 Subject: [PATCH 217/342] GnuTLS 2.8.6. svn path=/nixpkgs/trunk/; revision=21710 --- pkgs/development/libraries/gnutls/default.nix | 6 ++---- .../libraries/gnutls/gnutls-cli-libgcrypt.patch | 14 -------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/gnutls/gnutls-cli-libgcrypt.patch diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 9950e1f7177..b5b385ee20a 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,15 +5,13 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.8.5"; + name = "gnutls-2.8.6"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "1s6a2plds995q8rb8x19rz3c8v6xfqc4wvqqw01f6l8myyfw4jcj"; + sha256 = "0mm3i2b6pvchx4cxgg0c2xkvflv9wz75vmpbk8nfxwsa0skldy6n"; }; - patches = [ ./gnutls-cli-libgcrypt.patch ]; - configurePhase = '' ./configure --prefix="$out" \ --disable-dependency-tracking --enable-fast-install \ diff --git a/pkgs/development/libraries/gnutls/gnutls-cli-libgcrypt.patch b/pkgs/development/libraries/gnutls/gnutls-cli-libgcrypt.patch deleted file mode 100644 index b8af852705d..00000000000 --- a/pkgs/development/libraries/gnutls/gnutls-cli-libgcrypt.patch +++ /dev/null @@ -1,14 +0,0 @@ -This patch is to make sure `gnutls-cli' is explicitly linked against -libgcrypt since it really needs to. - ---- gnutls-2.8.5/src/Makefile.in 2009-11-02 11:36:01.000000000 +0100 -+++ gnutls-2.8.5/src/Makefile.in 2009-11-06 23:30:42.000000000 +0100 -@@ -840,6 +840,7 @@ libcmd_psk_la_CFLAGS = - libcmd_psk_la_SOURCES = psk.gaa psk-gaa.h psk-gaa.c - gnutls_cli_SOURCES = cli.c common.h common.c - gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \ -+ -lgcrypt \ - libcmd-cli.la ../gl/libgnu.la $(LIBSOCKET) $(GETADDRINFO_LIB) - libcmd_cli_la_CFLAGS = - libcmd_cli_la_SOURCES = cli.gaa cli-gaa.h cli-gaa.c - From fd9d4a5747100ac8a7df7fa1870f5477ac3bdd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 14:30:55 +0000 Subject: [PATCH 218/342] gnupdate: Add quirk for MIT/GNU Scheme. * maintainers/scripts/gnu/gnupdate.scm (ftp-server/directory)[quirks]: Add `mit-scheme'. (nixpkgs->gnu-name)[quirks]: Ditto. svn path=/nixpkgs/trunk/; revision=21711 --- maintainers/scripts/gnu/gnupdate.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index 3dc2e566f6c..88917e71ad6 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -472,6 +472,7 @@ ("gnupg" "ftp.gnupg.org" "/gcrypt" #t) ("gnu-ghostscript" "ftp.gnu.org" "/ghostscript" #f) ("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f) + ("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg") ("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f) ("TeXmacs" "ftp.texmacs.org" "/TeXmacs/targz" #f))) @@ -493,6 +494,7 @@ ("gnused" . "sed") ("gnutar" . "tar") ("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz + ("mitscheme" . "mit-scheme") ("texmacs" . "TeXmacs"))) (or (assoc-ref quirks project) project)) From e97d2900d443eff7e62ed487ab7b552bda6f518a Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 10 May 2010 14:46:17 +0000 Subject: [PATCH 219/342] ctags: never use build dir as TMP svn path=/nixpkgs/trunk/; revision=21712 --- pkgs/development/tools/misc/ctags/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 29384a1d157..57718088080 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { ''; buildInputs = [ automake autoconf ]; + + # don't use $T(E)MP which is set to the build directory + configureFlags="--enable-tmpdir=/tmp"; + meta = { description = "Exuberant Ctags, a tool for fast source code browsing"; @@ -29,4 +33,5 @@ stdenv.mkDerivation rec { license = "GPLv2+"; }; + } From 659e48bbb03803d3771338981e94675de2f78a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 17:54:26 +0000 Subject: [PATCH 220/342] GNU wdiff: Fix URL. svn path=/nixpkgs/trunk/; revision=21713 --- pkgs/tools/text/wdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index fd3d4f94769..7ae7241c40b 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -2,9 +2,9 @@ stdenv.mkDerivation rec { name = "wdiff-0.6.1"; - + src = fetchurl { - url = "http://alpha.gnu.org/gnu/wdiff/${name}.tar.gz"; + url = "mirror://gnu/wdiff/${name}.tar.gz"; sha256 = "0cgmx9k8sj0l79kp4m2lmn4ifx55ah68q4qk7xsanx69m1061ghf"; }; From d8c33c182008e67363d8f225b42b830ba782bede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 21:26:43 +0000 Subject: [PATCH 221/342] gnupdate: Handle FTP logins with password. * maintainers/scripts/gnu/gnupdate.scm (%ftp-login): New procedure. (ftp-open): Use it. svn path=/nixpkgs/trunk/; revision=21714 --- maintainers/scripts/gnu/gnupdate.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index 88917e71ad6..1401f5b94e3 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -307,6 +307,14 @@ message (throw 'ftp-error port command code message)))) +(define (%ftp-login user pass port) + (display (string-append "USER " user (string #\newline)) port) + (let-values (((code message) (%ftp-listen port))) + (case code + ((230) #t) + ((331) (%ftp-command (string-append "PASS " pass) 230 port)) + (else (throw 'ftp-error port command code message))))) + (define (ftp-open host) (catch 'getaddrinfo-error (lambda () @@ -319,8 +327,7 @@ (if (eqv? code 220) (begin ;(%ftp-command "OPTS UTF8 ON" 200 s) - ;; FIXME: When `USER' returns 331, we should do a `PASS email'. - (%ftp-command "USER anonymous" 230 s) + (%ftp-login "anonymous" "ludo@example.com" s) (%make-ftp-connection s ai)) (begin (format (current-error-port) "FTP to `~a' failed: ~A: ~A~%" From 5dd1036a04140af37507b19f126e8ed8f64a64a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 21:26:48 +0000 Subject: [PATCH 222/342] gnupdate: Add optional directory argument to `ftp-list'. * maintainers/scripts/gnu/gnupdate.scm (ftp-list): Add optional DIRECTORY argument. (releases): Pass DIRECTORY to `ftp-list'. svn path=/nixpkgs/trunk/; revision=21715 --- maintainers/scripts/gnu/gnupdate.scm | 32 +++++++++++++++------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index 1401f5b94e3..4df48f931fe 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -360,7 +360,7 @@ (throw 'ftp-error conn "PASV" 227 message))))) -(define (ftp-list conn) +(define* (ftp-list conn #:optional directory) (define (address-with-port sa port) (let ((fam (sockaddr:fam sa)) (addr (sockaddr:addr sa))) @@ -372,6 +372,9 @@ (sockaddr:scopeid sa))) (else #f)))) + (if directory + (ftp-chdir conn directory)) + (let* ((port (ftp-pasv conn)) (ai (ftp-connection-addrinfo conn)) (s (socket (addrinfo:fam ai) (addrinfo:socktype ai) @@ -514,21 +517,20 @@ (catch #t (lambda () (let-values (((server directory) (ftp-server/directory project))) - (let ((conn (ftp-open server))) - (ftp-chdir conn directory) - (let ((files (ftp-list conn))) - (ftp-close conn) - (map (lambda (tarball) - (let ((end (string-contains tarball ".tar"))) - (substring tarball 0 end))) + (let* ((conn (ftp-open server)) + (files (ftp-list conn directory))) + (ftp-close conn) + (map (lambda (tarball) + (let ((end (string-contains tarball ".tar"))) + (substring tarball 0 end))) - ;; Filter out signatures, deltas, and files which are potentially - ;; not releases of PROJECT (e.g., in /gnu/guile, filter out - ;; guile-oops and guile-www). - (filter (lambda (file) - (and (not (string-suffix? ".sig" file)) - (regexp-exec release-rx file))) - files)))))) + ;; Filter out signatures, deltas, and files which are potentially + ;; not releases of PROJECT (e.g., in /gnu/guile, filter out + ;; guile-oops and guile-www). + (filter (lambda (file) + (and (not (string-suffix? ".sig" file)) + (regexp-exec release-rx file))) + files))))) (lambda (key subr message . args) (format (current-error-port) "failed to get release list for `~A': ~A ~A~%" From 5583d516d284f0c51149b9d3a263b05be3d3542d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 21:26:53 +0000 Subject: [PATCH 223/342] gnupdate: Add `--dry-run' option. * maintainers/scripts/gnu/gnupdate.scm (%options): Add `dry-run'. (main): Handle `--dry-run'. svn path=/nixpkgs/trunk/; revision=21716 --- maintainers/scripts/gnu/gnupdate.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index 4df48f931fe..c0018466588 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -658,9 +658,13 @@ (format #t "~%") (format #t " -x, --xml=FILE Read XML output of `nix-instantiate'~%") (format #t " from FILE.~%") + (format #t " -d, --dry-run Don't actually update Nix expressions~%") (format #t " -h, --help Give this help list.~%~%") (format #t "Report bugs to ~%") (exit 0))) + (option '(#\d "dry-run") #f #f + (lambda (opt name arg result) + (alist-cons 'dry-run #t result))) (option '(#\x "xml") #t #f (lambda (opt name arg result) @@ -695,8 +699,13 @@ old-version old-hash new-version new-hash location) - (update-nix-expression (location-file location) - old-version old-hash - new-version new-hash)) + (if (assoc-ref opts 'dry-run) + (format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%" + name old-version new-version + old-hash new-hash) + (update-nix-expression (location-file location) + old-version old-hash + new-version new-hash))) (_ #f))) - updates))) + updates) + #t)) From b43b098513abaecfc1d4635d39a7d8df38a54012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 10 May 2010 21:26:57 +0000 Subject: [PATCH 224/342] gnupdate: Re-fix thinko. svn path=/nixpkgs/trunk/; revision=21717 --- maintainers/scripts/gnu/gnupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index 31340ca2399..741ce7e63ee 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -1,4 +1,4 @@ #!/bin/sh exec "${GUILE:-guile}" $GUILE_FLAGS -L . -l gnupdate.scm \ - -c '(apply main (cdr (command-line)))' -- "$@" + -e '(apply main (cdr (command-line)))' -- "$@" From f19a35aeebcc8aa7ed1dc6d64666b357989235af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 11 May 2010 14:56:28 +0000 Subject: [PATCH 225/342] Magit: Latest version. The tarball at crypt.to had vanished, and hopefully `fetchgit' over HTTP will work for everyone. svn path=/nixpkgs/trunk/; revision=21722 --- .../editors/emacs-modes/magit/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 4f0b760ae20..1a783fdbd8a 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, emacs, texinfo, autoconf, automake}: +{ stdenv, fetchgit, emacs, texinfo, autoconf, automake }: let - version = "0.7-109-g0fc3980"; + version = "0.7-180-gcb458d5"; in stdenv.mkDerivation { name = "magit-${version}"; - src = fetchurl { - url = "http://cryp.to/magit-mainline-${version}.tar.gz"; - sha256 = "0jyx57znvn49xm0h92kh8iywn44ip130dpflzq2ns2k6gspg36b6"; + src = fetchgit { + url = "http://git.gitorious.org/magit/mainline.git"; + rev = "cb458d59182a4497b3435090ae71357b6b8c385d"; + sha256 = "1vbafn0drkzhrr6yrgvf62aa9bnk785vavdgsmngjfxql1ngaq2x"; }; unpackCmd = "tar xf $src"; preConfigure = "./autogen.sh"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f2e93067b6..6b824a7ed4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7484,7 +7484,8 @@ let }; magit = import ../applications/editors/emacs-modes/magit { - inherit fetchurl stdenv emacs texinfo autoconf automake; + inherit fetchgit stdenv emacs texinfo autoconf; + automake = automake111x; }; maudeMode = import ../applications/editors/emacs-modes/maude { From 001a74368fc68b7365b395892eeee80a06c2e15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 11 May 2010 16:17:26 +0000 Subject: [PATCH 226/342] Adding the Microchip software for the PICKit2 programmer: pk2cmd svn path=/nixpkgs/trunk/; revision=21726 --- pkgs/tools/misc/pk2cmd/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/pk2cmd/default.nix diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix new file mode 100644 index 00000000000..1012c724b62 --- /dev/null +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, libusb, makeWrapper}: + +stdenv.mkDerivation { + name = "pk2cmd-1.20"; + src = fetchurl { + url = http://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz; + sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; + }; + + makeFlags = [ "LIBUSB=${libusb}" "linux" ]; + + installPhase = '' + ensureDir $out/bin $out/share/pk2 + cp pk2cmd $out/bin + cp PK2DeviceFile.dat $out/share/pk2 + wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 + ''; + + buildInputs = [ libusb makeWrapper ]; + + meta = { + homepage = http://www.microchip.com/pickit2; + license = "nonfree"; + description = "Microchip PIC programming software for the PICKit2 programmer"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b824a7ed4f..3e3d397b11d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1386,6 +1386,10 @@ let inherit (gnome) glib gtk; }; + pk2cmd = import ../tools/misc/pk2cmd { + inherit fetchurl stdenv libusb makeWrapper; + }; + plan9port = import ../tools/system/plan9port { inherit fetchurl stdenv; inherit (xlibs) libX11 xproto libXt xextproto; From 06eab9d0a73503b06a728dc711e31dcf23205912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 11 May 2010 16:17:31 +0000 Subject: [PATCH 227/342] Enabling AUTH_LOGIN in cyrus_sasl (thanks d3z#nixos) svn path=/nixpkgs/trunk/; revision=21727 --- pkgs/development/libraries/cyrus-sasl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 3552ad32346..c9d14fe8465 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0dmi41hfy015pzks8n93qsshgvi0az7pv81nls4nxayb810crvr0"; }; preConfigure='' - configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2" + configureFlags="--with-openssl=${openssl} --with-plugindir=$out/lib/sasl2 --with-configdir=$out/lib/sasl2 --enable-login" ''; buildInputs = [ openssl db4 gettext ]; patches = [ ./cyrus-sasl-2.1.22-bad-elif.patch ]; From 074e7db41aa7fee5731835034490c8518320091c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 11 May 2010 16:17:35 +0000 Subject: [PATCH 228/342] Adding an assertion for pk2cmd to build only on linux. svn path=/nixpkgs/trunk/; revision=21728 --- pkgs/tools/misc/pk2cmd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 1012c724b62..e3a9e7b87c3 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, libusb, makeWrapper}: +assert stdenv.isLinux; + stdenv.mkDerivation { name = "pk2cmd-1.20"; src = fetchurl { From f1fc3e3ef124b98228dd36048e252120257d41fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 11 May 2010 16:17:39 +0000 Subject: [PATCH 229/342] Fixing the putty name, from putty-rNUM to putty-NUM, so nix-env -i putty installs it. svn path=/nixpkgs/trunk/; revision=21729 --- pkgs/applications/networking/remote/putty/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 747413400b3..980bb894aa2 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,7 +1,10 @@ { stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut }: +let + rev = 8934; +in stdenv.mkDerivation { - name = "putty-r8934"; + name = "putty-${toString rev}"; # builder = ./builder.sh; preConfigure = '' @@ -17,7 +20,7 @@ stdenv.mkDerivation { # I don't know of any better URL src = fetchsvn { url = svn://svn.tartarus.org/sgt/putty; - rev = 8934; + rev = rev; sha256 = "1yg5jhk7jp4yrnhpi0lvz71qqaf5gfpcwy8p198qqs8xgd1w51jc"; }; From 57cffe5040fc6827d3193c779850049529d00bc1 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 11 May 2010 17:28:54 +0000 Subject: [PATCH 230/342] pidgin plugin sipe contributed by David Brown svn path=/nixpkgs/trunk/; revision=21730 --- .../pidgin-plugins/sipe/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix new file mode 100644 index 00000000000..b80f81010da --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -0,0 +1,22 @@ +args: with args; + +let + version = "1.10.0"; +in +stdenv.mkDerivation { + name = "pidgin-sipe-${version}"; + src = fetchurl { + url = "mirror://sourceforge/sipe/sipe/pidgin-sipe-${version}/pidgin-sipe-${version}.tar.gz"; + sha256 = "11d85qxix1dmwvzs3lx0sycsx1d5sy67r9y78fs7z716py4mg9np"; + }; + + meta = { + description = "SIPE plugin for Pidgin IM."; + homepage = http://sipe.sourceforge.net/; + license = "GPLv2"; + }; + + postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; + + buildInputs = [pidgin intltool libxml2]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e3d397b11d..367e99223e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8216,6 +8216,10 @@ let inherit fetchurl stdenv libotr pidgin; }; + pidginsipe = import ../applications/networking/instant-messengers/pidgin-plugins/sipe { + inherit fetchurl stdenv pidgin intltool libxml2; + }; + pinfo = import ../applications/misc/pinfo { inherit fetchurl stdenv ncurses readline; }; From 76167b5bd37f61138b0276cb62417df9faf26e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Tue, 11 May 2010 19:58:47 +0000 Subject: [PATCH 231/342] Added a few new Haskell libraries. svn path=/nixpkgs/trunk/; revision=21733 --- .../libraries/haskell/GlomeVec/default.nix | 13 +++++++++++++ .../libraries/haskell/bitmap/default.nix | 13 +++++++++++++ .../libraries/haskell/cmdargs/default.nix | 14 ++++++++++++++ .../libraries/haskell/stb-image/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 16 ++++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 pkgs/development/libraries/haskell/GlomeVec/default.nix create mode 100644 pkgs/development/libraries/haskell/bitmap/default.nix create mode 100644 pkgs/development/libraries/haskell/cmdargs/default.nix create mode 100644 pkgs/development/libraries/haskell/stb-image/default.nix diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix new file mode 100644 index 00000000000..4ca87d9bced --- /dev/null +++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "GlomeVec"; + version = "0.1.2"; + sha256 = "6023c11977bf16baf487235087e94f5a2f465e8403b8e40ab513e7879dd52639"; + meta = { + description = "Simple 3D vector library"; + license = "GPL"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix new file mode 100644 index 00000000000..aff1eea1f0c --- /dev/null +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "bitmap"; + version = "0.0.1"; + sha256 = "281ad4d9234349cfd14f91977b48e2d1861c037f4b6562aa138cddd25c801a7e"; + meta = { + description = "A library for handling and manipulating bitmaps"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix new file mode 100644 index 00000000000..b7d3e81160a --- /dev/null +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -0,0 +1,14 @@ +{cabal, filepath, mtl}: + +cabal.mkDerivation (self : { + pname = "cmdargs"; + version = "0.1"; + sha256 = "1ec8a0b49dedc0b159c4e8f6b02ae57ba918b27d8648294998a13e04cf257ebf"; + propagatedBuildInputs = [filepath mtl]; + meta = { + description = "Command line argument processing"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix new file mode 100644 index 00000000000..4574b80ce2a --- /dev/null +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -0,0 +1,14 @@ +{cabal, bitmap}: + +cabal.mkDerivation (self : { + pname = "stb-image"; + version = "0.2"; + sha256 = "7d027b6de52d07bbe439a84897aaa6e26a8f05c6fa6f4aeaa3060be23ae11937"; + propagatedBuildInputs = [bitmap]; + meta = { + description = "A wrapper around Sean Barrett's JPEG/PNG decoder"; + license = "free"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c13b50eff5a..78da26b35e2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -57,6 +57,10 @@ rec { inherit cabal; }; + bitmap = import ../development/libraries/haskell/bitmap { + inherit cabal; + }; + bytestring = import ../development/libraries/haskell/bytestring { inherit cabal; }; @@ -78,6 +82,10 @@ rec { inherit cabal mtl network parsec xhtml; }; + cmdargs = import ../development/libraries/haskell/cmdargs { + inherit cabal filepath mtl; + }; + colorizeHaskell = import ../development/libraries/haskell/colorize-haskell { inherit cabal ansiTerminal haskellLexer; }; @@ -206,6 +214,10 @@ rec { network = network2217; }; + GlomeVec = import ../development/libraries/haskell/GlomeVec { + inherit cabal; + }; + GLUT2121 = import ../development/libraries/haskell/GLUT/2.1.2.1.nix { inherit cabal; OpenGL = OpenGL2230; @@ -679,6 +691,10 @@ rec { inherit cabal; }; + stbImage = import ../development/libraries/haskell/stb-image { + inherit cabal bitmap; + }; + stm = import ../development/libraries/haskell/stm { inherit cabal; }; From afbb01c90d4a10191bc68b68e2d484283eea329c Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 11 May 2010 20:14:46 +0000 Subject: [PATCH 232/342] Add expression for Coq 8.3 beta svn path=/nixpkgs/trunk/; revision=21734 --- pkgs/applications/science/logic/coq/beta.nix | 53 +++++++++++++++++++ .../science/logic/coq/coq-8.3-beta0-1.patch | 20 +++++++ pkgs/top-level/all-packages.nix | 5 ++ 3 files changed, 78 insertions(+) create mode 100644 pkgs/applications/science/logic/coq/beta.nix create mode 100644 pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch diff --git a/pkgs/applications/science/logic/coq/beta.nix b/pkgs/applications/science/logic/coq/beta.nix new file mode 100644 index 00000000000..c5c4221ac1e --- /dev/null +++ b/pkgs/applications/science/logic/coq/beta.nix @@ -0,0 +1,53 @@ +# TODO: +# - coqide compilation should be optional or (better) separate; +# - coqide libraries are not installed; + +{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}: + +stdenv.mkDerivation { + name = "coq-8.3-beta0-1"; + + src = fetchurl { + url = http://coq.inria.fr/distrib/V8.3-beta0/files/coq-8.3-beta0-1.tar.gz; + sha256 = "01m1x0gpzfsiybyqanm82ls8q63q0g2d9vvfs99zf4z1nny7vlf1"; + }; + + buildInputs = [ ocaml camlp5 ncurses lablgtk ]; + + prefixKey = "-prefix "; + + preConfigure = '' + ARCH=`uname -s` + CAMLDIR=`type -p ocamlc` + ''; + + configureFlags = + "-arch $ARCH " + + "-camldir $CAMLDIR " + + "-camldir ${ocaml}/bin " + + "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " + + "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " + + "-opt -coqide opt"; + + buildFlags = "world"; # Debug with "world VERBOSE=1"; + + patches = [ ./coq-8.3-beta0-1.patch ]; + + postPatch = '' + substituteInPlace scripts/coqmktop.ml --replace \ + "\"-I\"; \"+lablgtk2\"" \ + "\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\"" + ''; + + meta = { + description = "Coq proof assistant"; + longDescription = '' + Coq is a formal proof management system. It provides a formal language + to write mathematical definitions, executable algorithms and theorems + together with an environment for semi-interactive development of + machine-checked proofs. + ''; + homepage = "http://coq.inria.fr"; + license = "LGPL"; + }; +} diff --git a/pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch b/pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch new file mode 100644 index 00000000000..a5259eb43c0 --- /dev/null +++ b/pkgs/applications/science/logic/coq/coq-8.3-beta0-1.patch @@ -0,0 +1,20 @@ +diff -Nurp coq-8.3-beta0-1/configure coq-8.3-beta0-1-nix/configure +--- coq-8.3-beta0-1/configure 2010-02-16 12:37:58.000000000 +0100 ++++ coq-8.3-beta0-1-nix/configure 2010-05-11 17:47:44.000000000 +0200 +@@ -394,7 +394,6 @@ case $camldir_spec in + ocamlyaccexec=$CAMLBIN/ocamlyacc + ocamlmktopexec=$CAMLBIN/ocamlmktop + ocamlmklibexec=$CAMLBIN/ocamlmklib +- camlp4oexec=$CAMLBIN/camlp4o + esac + + if test ! -f "$CAMLC" ; then +@@ -626,7 +625,7 @@ case $COQIDE in + no) LABLGTKLIB=+lablgtk2 # Pour le message + LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile + yes) LABLGTKLIB="$lablgtkdir" # Pour le message +- LABLGTKINCLUDES="-I \"$LABLGTKLIB\"";; # Pour le makefile ++ LABLGTKINCLUDES="-I $LABLGTKLIB";; # Pour le makefile + esac;; + no) LABLGTKINCLUDES="";; + esac diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 367e99223e7..a4a0a996b96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9209,6 +9209,11 @@ let camlp5 = camlp5_transitional; }; + coq_beta = import ../applications/science/logic/coq/beta.nix { + inherit stdenv fetchurl ocaml lablgtk ncurses; + camlp5 = camlp5_transitional; + }; + hol_light = import ../applications/science/logic/hol_light { inherit stdenv fetchurl ocaml_with_sources; }; From 75ca72cf75c29960891840293bb510a401695ad4 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 11 May 2010 22:19:37 +0000 Subject: [PATCH 233/342] adding GIS application OpenJUMP svn path=/nixpkgs/trunk/; revision=21735 --- pkgs/applications/misc/openjump/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/openjump/default.nix diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix new file mode 100644 index 00000000000..3b42f0f3322 --- /dev/null +++ b/pkgs/applications/misc/openjump/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation { + name = "openjump-1.3.1"; + + src = fetchurl { + url = mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip; + sha256 = "0y4z53yx0x7rp3c8rnj028ni3gr47r35apgcpqp3jl7r2di6zgqm"; + }; + + # ln jump.log hack: a different user will probably get a permission denied + # error. Still this is better than getting it always. + # TODO: build from source and patch this + unpackPhase = '' + ensureDir $out/bin; + cd $out; unzip $src + s=$out/bin/OpenJump + dir=$(echo $out/openjump-*) + cat >> $s << EOF + #!/bin/sh + cd $dir/bin + exec /bin/sh openjump.sh + EOF + chmod +x $s + ln -s /tmp/openjump.log $dir/bin/jump.log + ''; + + installPhase = ":"; + + buildInputs = [unzip]; + + meta = { + description = "open source Geographic Information System (GIS) written in the Java programming language"; + homepage = http://www.openjump.org/index.html; + license = "GPLv2"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a0a996b96..d03aa22683f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8141,6 +8141,10 @@ let inherit fetchurl stdenv ncurses; }; + openjump = import ../applications/misc/openjump { + inherit stdenv fetchurl unzip; + }; + openoffice = import ../applications/office/openoffice { inherit fetchurl stdenv pam python tcsh libxslt perl zlib libjpeg expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron From 657ae2a6213b3407f3866a2507ebc82e0646dfa0 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 12 May 2010 00:50:01 +0000 Subject: [PATCH 234/342] adding libdwg - optional dependency of grass svn path=/nixpkgs/trunk/; revision=21736 --- pkgs/development/libraries/libdwg/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/libdwg/default.nix diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix new file mode 100644 index 00000000000..a92a48bf75f --- /dev/null +++ b/pkgs/development/libraries/libdwg/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libdwg-0.3"; + + src = fetchurl { + url = mirror://sourceforge/libdwg/libdwg-0.3.tar.bz2; + sha256 = "0lx7ih00m11qw9wsc5ksmwvi3d80l0yfwnbrn5qfz182w4d3fpc9"; + }; + + meta = { + description = "library reading dwg files"; + homepage = http://libdwg.sourceforge.net/en/; + license = "GPLv3"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d03aa22683f..277e3aa0b9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3913,6 +3913,10 @@ let libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc; + libdwg = import ../development/libraries/libdwg { + inherit stdenv fetchurl; + }; + eglibc = import ../development/libraries/eglibc { inherit fetchsvn stdenv; kernelHeaders = linuxHeaders; From 55a322022ce5d322eb41ab3d2f0be9a82c0bbaf4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 12 May 2010 09:09:55 +0000 Subject: [PATCH 235/342] pkgs/applications/editors/emacs-modes/magit: bumped to 0.8 release svn path=/nixpkgs/trunk/; revision=21737 --- .../editors/emacs-modes/magit/default.nix | 19 +++++++++---------- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 1a783fdbd8a..45de918a472 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,20 +1,17 @@ -{ stdenv, fetchgit, emacs, texinfo, autoconf, automake }: +{ stdenv, fetchurl, emacs, texinfo }: let - version = "0.7-180-gcb458d5"; + version = "0.8"; in stdenv.mkDerivation { name = "magit-${version}"; - src = fetchgit { - url = "http://git.gitorious.org/magit/mainline.git"; - rev = "cb458d59182a4497b3435090ae71357b6b8c385d"; - sha256 = "1vbafn0drkzhrr6yrgvf62aa9bnk785vavdgsmngjfxql1ngaq2x"; + src = fetchurl { + url = "http://github.com/downloads/philjackson/magit/magit-${version}.tar.gz"; + sha256 = "4d1b55dcb118e506c6b8838acd4a50dbdd5348b1d12edd9789a3109a582e2954"; }; - unpackCmd = "tar xf $src"; - preConfigure = "./autogen.sh"; - buildInputs = [emacs texinfo autoconf automake]; + buildInputs = [emacs texinfo]; meta = { description = "An an interface to Git, implemented as an extension to Emacs."; @@ -32,6 +29,8 @@ stdenv.mkDerivation { ''; license = "GPLv3+"; - homepage = "http://zagadka.vm.bytemark.co.uk/magit/"; + homepage = "http://github.com/philjackson/magit"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 277e3aa0b9a..a5e61be80b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7492,8 +7492,7 @@ let }; magit = import ../applications/editors/emacs-modes/magit { - inherit fetchgit stdenv emacs texinfo autoconf; - automake = automake111x; + inherit fetchurl stdenv emacs texinfo; }; maudeMode = import ../applications/editors/emacs-modes/maude { From da7e1fbea30140a517fe822814ba2e39b07b5cd4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 May 2010 09:31:46 +0000 Subject: [PATCH 236/342] * Do not silently ignore broken "example" and "default" attributes when generating the documentation. If they're broken, they should be fixed. svn path=/nixpkgs/trunk/; revision=21738 --- pkgs/lib/options.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index edcbfaa4830..d975f904085 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -251,12 +251,6 @@ rec { # the set generated with filterOptionSets. optionAttrSetToDocList = ignore: newOptionAttrSetToDocList; newOptionAttrSetToDocList = attrs: - let tryEval = v: - let res = builtins.tryEval v; in - if builtins ? tryEval then - if res.success then res.value else "" - else v; - in let options = collect isOption attrs; in fold (opt: rest: let @@ -268,8 +262,8 @@ rec { declarations = map (x: toString x.source) opt.declarations; definitions = map (x: toString x.source) opt.definitions; } - // optionalAttrs (opt ? example) { example = tryEval opt.example; } - // optionalAttrs (opt ? default) { default = tryEval opt.default; }; + // optionalAttrs (opt ? example) { example = opt.example; } + // optionalAttrs (opt ? default) { default = opt.default; }; subOptions = if opt ? options then From 9ec34da2ee947930621f68b1856a636b46391ed4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 May 2010 11:07:49 +0000 Subject: [PATCH 237/342] * In the generation of the `options.xml' file used to produce the NixOS manual and manpages, remove all derivation attributes except the `name' attribute. This cuts the size of `options.xml' from 7.0 MiB to 473 KiB, and more importantly, cuts evaluation time of the system derivation from 1.63s to 1.10s on my laptop (a 32% improvement). svn path=/nixpkgs/trunk/; revision=21739 --- pkgs/lib/options.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index d975f904085..38dfb106ff5 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -262,8 +262,8 @@ rec { declarations = map (x: toString x.source) opt.declarations; definitions = map (x: toString x.source) opt.definitions; } - // optionalAttrs (opt ? example) { example = opt.example; } - // optionalAttrs (opt ? default) { default = opt.default; }; + // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; } + // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; }; subOptions = if opt ? options then @@ -275,4 +275,16 @@ rec { ) [] options; + /* This function recursively removes all derivation attributes from + `x' except for the `name' attribute. This is to make the + generation of `options.xml' much more efficient: the XML + representation of derivations is very large (on the order of + megabytes) and is not actually used by the manual generator. */ + scrubOptionValue = x: + if isDerivation x then { type = "derivation"; drvPath = x.name; name = x.name; } + else if isList x then map scrubOptionValue x + else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) x + else x; + + } From 3b9cee463820f543b5d4f790097773b4f7ba8771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 12:22:40 +0000 Subject: [PATCH 238/342] gnupdate: Fix unbound-variable in `%ftp-login'. * maintainers/scripts/gnu/gnupdate.scm (%ftp-login): Bind `command' to the command. svn path=/nixpkgs/trunk/; revision=21742 --- maintainers/scripts/gnu/gnupdate.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate.scm b/maintainers/scripts/gnu/gnupdate.scm index c0018466588..33a2d530b22 100644 --- a/maintainers/scripts/gnu/gnupdate.scm +++ b/maintainers/scripts/gnu/gnupdate.scm @@ -308,12 +308,13 @@ (throw 'ftp-error port command code message)))) (define (%ftp-login user pass port) - (display (string-append "USER " user (string #\newline)) port) - (let-values (((code message) (%ftp-listen port))) - (case code - ((230) #t) - ((331) (%ftp-command (string-append "PASS " pass) 230 port)) - (else (throw 'ftp-error port command code message))))) + (let ((command (string-append "USER " user (string #\newline)))) + (display command port) + (let-values (((code message) (%ftp-listen port))) + (case code + ((230) #t) + ((331) (%ftp-command (string-append "PASS " pass) 230 port)) + (else (throw 'ftp-error port command code message)))))) (define (ftp-open host) (catch 'getaddrinfo-error From 7a491b54fad97ac67648505eb3b1a3cd54cb13f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 12:22:44 +0000 Subject: [PATCH 239/342] releaseTools.coverageAnalysis: Add `lcovExtraTraceFiles' parameter. svn path=/nixpkgs/trunk/; revision=21743 --- pkgs/build-support/release/nix-build.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index 385abe53140..d0acce96113 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -7,6 +7,7 @@ { doCoverageAnalysis ? false , lcovFilter ? [] +, lcovExtraTraceFiles ? [] , src, stdenv , name ? if doCoverageAnalysis then "nix-coverage" else "nix-build" , ... } @ args: @@ -73,8 +74,9 @@ stdenv.mkDerivation ( ${args.lcov}/bin/lcov --remove app.info $lcovFilter > app2.info set +o noglob mv app2.info app.info + mkdir $out/coverage - ${args.lcov}/bin/genhtml app.info -o $out/coverage > log + ${args.lcov}/bin/genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log # Grab the overall coverage percentage for use in release overviews. grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate @@ -85,6 +87,7 @@ stdenv.mkDerivation ( lcovFilter = ["/nix/store/*"] ++ lcovFilter; + inherit lcovExtraTraceFiles; meta = (if args ? meta then args.meta else {}) // { description = if doCoverageAnalysis then "Coverage analysis" else "Native Nix build on ${stdenv.system}"; From d4785a25dd387c2a372f422cd3c7cae19c10aa2a Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 May 2010 12:25:23 +0000 Subject: [PATCH 240/342] Add myself to nixpkgs/pkgs/lib/maintainers.nix svn path=/nixpkgs/trunk/; revision=21744 --- pkgs/lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 1efeabc4b54..a09dbb61652 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -17,4 +17,5 @@ sander = "Sander van der Burg "; urkud = "Yury G. Kudryashov "; viric = "Lluís Batlle i Rossell "; + z77z = "Marco Maggesi "; } From 891868a4fe3cdf5e0e900ab22042325959d699be Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Wed, 12 May 2010 13:17:19 +0000 Subject: [PATCH 241/342] Add package for Fossil svn path=/nixpkgs/trunk/; revision=21746 --- .../version-management/fossil/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/version-management/fossil/default.nix diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix new file mode 100644 index 00000000000..e0464152280 --- /dev/null +++ b/pkgs/applications/version-management/fossil/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, zlib, openssl}: + +let + version = "20100318142033"; +in + +stdenv.mkDerivation { + name = "fossil-${version}"; + + src = fetchurl { + url = "http://www.fossil-scm.org/download/fossil-src-${version}.tar.gz"; + sha256 = "16kd9sg99s8v549n9ggr5ynjrz36i71fvj1r66djdbdclg5sxlxv"; + }; + + buildInputs = [ zlib openssl ]; + + installPhase = '' + ensureDir $out/bin + INSTALLDIR=$out/bin make install + ''; + + meta = { + description = "Simple, high-reliability, distributed software configuration management."; + longDescription = '' + Fossil is a software configuration management system. Fossil is + software that is designed to control and track the development of a + software project and to record the history of the project. There are + many such systems in use today. Fossil strives to distinguish itself + from the others by being extremely simple to setup and operate. + ''; + homepage = http://www.fossil-scm.org/; + license = "GPLv2"; + maintainers = [ #Add your name here! + stdenv.lib.maintainers.z77z + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e61be80b9..00342cb5dd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7556,6 +7556,10 @@ let inherit stdenv fetchurl openssl; }; + fossil = import ../applications/version-management/fossil { + inherit stdenv fetchurl zlib openssl; + }; + grip = import ../applications/misc/grip { inherit fetchurl stdenv lib grip pkgconfig curl cdparanoia libid3tag; inherit (gtkLibs) gtk glib; From cde9d0fb134a8135ec91cbfbf722102188ff734e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 May 2010 13:24:09 +0000 Subject: [PATCH 242/342] * The old evaluator segfaults if the `outPath' attribute is missing. Work around it for the moment. svn path=/nixpkgs/trunk/; revision=21747 --- pkgs/lib/options.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/lib/options.nix b/pkgs/lib/options.nix index 38dfb106ff5..3db9b671fe3 100644 --- a/pkgs/lib/options.nix +++ b/pkgs/lib/options.nix @@ -281,7 +281,7 @@ rec { representation of derivations is very large (on the order of megabytes) and is not actually used by the manual generator. */ scrubOptionValue = x: - if isDerivation x then { type = "derivation"; drvPath = x.name; name = x.name; } + if isDerivation x then { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; } else if isList x then map scrubOptionValue x else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) x else x; From 5738f20c8358675d62446863858591116de2c193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 15:46:38 +0000 Subject: [PATCH 243/342] Add GNU Mach (headers). svn path=/nixpkgs/trunk/; revision=21749 --- pkgs/os-specific/gnu/mach/default.nix | 49 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/os-specific/gnu/mach/default.nix diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix new file mode 100644 index 00000000000..9bb08ef36fb --- /dev/null +++ b/pkgs/os-specific/gnu/mach/default.nix @@ -0,0 +1,49 @@ +{ fetchgit, stdenv, mig ? null, autoconf, automake, texinfo +, headersOnly ? true }: + +assert (!headersOnly) -> (mig != null); + +let rev = "7987a711e8f13c0543e87a0211981f4b40ef6d94"; +in +stdenv.mkDerivation (rec { + name = "gnumach-1.4-${rev}"; + + src = fetchgit { + url = "git://git.sv.gnu.org/hurd/gnumach.git"; + sha256 = "7b383a23b7fbe1ec812951cc0f553c85da3279f4f723dd6a65e45976f9d5ca2d"; + inherit rev; + }; + + configureFlags = "--build=i586-pc-gnu"; + + buildInputs = [ autoconf automake texinfo ] + ++ stdenv.lib.optional (mig != null) mig; + + preConfigure = "autoreconf -vfi"; + + meta = { + description = "GNU Mach, the microkernel used by the GNU Hurd"; + + longDescription = + '' GNU Mach is the microkernel that the GNU Hurd system is based on. + + It is maintained by the Hurd developers for the GNU project and + remains compatible with Mach 3.0. + + The majority of GNU Mach's device drivers are from Linux 2.0. They + were added using glue code, i.e., a Linux emulation layer in Mach. + ''; + + license = "GPLv2+"; + + homepage = http://www.gnu.org/software/hurd/microkernel/mach/gnumach.html; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} + +// + +(if headersOnly + then { buildPhase = ":"; installPhase = "make install-data"; } + else {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00342cb5dd1..cf62ec263ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6483,6 +6483,12 @@ let inherit fetchurl stdenv; }; + machHeaders = import ../os-specific/gnu/mach { + inherit fetchgit stdenv autoconf texinfo; + automake = automake111x; + headersOnly = true; + }; + mdadm = import ../os-specific/linux/mdadm { inherit fetchurl stdenv groff; }; From 32fcf8d32bf3c8a9480e2899db726aa566bf7643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 15:46:43 +0000 Subject: [PATCH 244/342] Add GNU MIG. svn path=/nixpkgs/trunk/; revision=21750 --- pkgs/development/tools/misc/mig/default.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/tools/misc/mig/default.nix diff --git a/pkgs/development/tools/misc/mig/default.nix b/pkgs/development/tools/misc/mig/default.nix new file mode 100644 index 00000000000..d09dc9dd4b0 --- /dev/null +++ b/pkgs/development/tools/misc/mig/default.nix @@ -0,0 +1,41 @@ +{ fetchgit, stdenv, autoconf, automake, flex, bison, machHeaders +, cross ? null }: + +let rev = "4fee6a5652f609cb68cdbd9049d4da7a194f15f8"; in +stdenv.mkDerivation rec { + name = "mig-1.4-${rev}"; + + src = fetchgit { + url = "git://git.sv.gnu.org/hurd/mig.git"; + sha256 = "d6958d9b60925d4600aac133c9505bc873a16b203c69260bd0fb228922ee9273"; + inherit rev; + }; + + buildInputs = [ autoconf automake flex bison machHeaders ]; + + preConfigure = "autoreconf -vfi"; + + configureFlags = + stdenv.lib.optionalString (cross != null) "--build=${cross.config}"; + + meta = { + description = "GNU MIG, the Mach interface generator"; + + longDescription = + '' GNU MIG is the GNU distribution of the Mach 3.0 interface generator + MIG, as maintained by the GNU Hurd developers for the GNU project. + + You need this tool to compile the GNU Mach and GNU Hurd + distributions, and to compile the GNU C library for the Hurd. Also, + you will need it for other software in the GNU system that uses + Mach-based inter-process communication. + ''; + + license = "GPLv2+"; + + homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html; + + # platforms = stdenv.lib.platforms.gnu; # really GNU/Hurd + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf62ec263ea..92a876d1f70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3255,6 +3255,11 @@ let inherit fetchurl stdenv builderDefs stringsWithDeps lib elfutils; }; + migCross = forceBuildDrv (import ../development/tools/misc/mig { + inherit fetchgit stdenv autoconf automake flex bison machHeaders; + cross = assert crossSystem != null; crossSystem; + }); + mk = import ../development/tools/build-managers/mk { inherit fetchurl stdenv; }; From 2d4fa8897e1d3c0be52f4b4b91e86790d582cf4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 15:46:47 +0000 Subject: [PATCH 245/342] Add GNU Hurd (headers). svn path=/nixpkgs/trunk/; revision=21751 --- pkgs/os-specific/gnu/hurd/default.nix | 44 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +++++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/os-specific/gnu/hurd/default.nix diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix new file mode 100644 index 00000000000..c9e1a1e6cab --- /dev/null +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -0,0 +1,44 @@ +{ fetchgit, stdenv, autoconf, automake, libtool, texinfo +, machHeaders, mig, headersOnly ? true }: + +let rev = "7913beaef3e6a2c4f7f315a8db7a31dbe1f713e0"; in +stdenv.mkDerivation (rec { + name = "hurd-0.4-${rev}"; + + src = fetchgit { + url = "git://git.sv.gnu.org/hurd/hurd.git"; + sha256 = "bf4f1376b26b0dcdfd23ff9c9b01440f50d032f48946fad6d3861539978f8f4d"; + inherit rev; + }; + + buildInputs = [ autoconf automake libtool texinfo mig ]; + propagatedBuildInputs = [ machHeaders ]; + + configureFlags = "--build=i586-pc-gnu"; + + preConfigure = "autoreconf -vfi"; + + meta = { + description = "The GNU Hurd, GNU project's replacement for the Unix kernel"; + + longDescription = + '' The GNU Hurd is the GNU project's replacement for the Unix kernel. + It is a collection of servers that run on the Mach microkernel to + implement file systems, network protocols, file access control, and + other features that are implemented by the Unix kernel or similar + kernels (such as Linux). + ''; + + license = "GPLv2+"; + + homepage = http://www.gnu.org/software/hurd/; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} + +// + +(if headersOnly + then { buildPhase = ":"; installPhase = "make install-headers"; } + else {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92a876d1f70..2f4534d42f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6065,6 +6065,13 @@ let inherit fetchurl stdenv ncurses; }; + hurdHeaders = import ../os-specific/gnu/hurd { + inherit fetchgit stdenv autoconf libtool texinfo machHeaders; + mig = migCross; + automake = automake111x; + headersOnly = true; + }; + hwdata = import ../os-specific/linux/hwdata { inherit fetchurl stdenv; }; From 7e08174782cc8a3af15f6b90b35db161dc87ba62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 15:46:51 +0000 Subject: [PATCH 246/342] glibc 2.11: Cross-build for GNU/Hurd. svn path=/nixpkgs/trunk/; revision=21752 --- .../libraries/glibc-2.11/common.nix | 17 ++++++++++++++-- .../libraries/glibc-2.11/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 20 +++++++++++++------ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix index fcdccd90f2e..cdd968b4582 100644 --- a/pkgs/development/libraries/glibc-2.11/common.nix +++ b/pkgs/development/libraries/glibc-2.11/common.nix @@ -5,6 +5,7 @@ cross : { name, fetchurl, stdenv, installLocales ? false , gccCross ? null, kernelHeaders ? null +, machHeaders ? null, hurdHeaders ? null, mig ? null , profilingLibraries ? false, meta , preConfigure ? "", ... }@args : @@ -77,7 +78,8 @@ stdenv.mkDerivation ({ "--without-fp" ]; - buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]; + buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] + ++ stdenv.lib.optional (mig != null) mig; # Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to # prevent a retained dependency on the bootstrap tools in the stdenv-linux @@ -149,4 +151,15 @@ stdenv.mkDerivation ({ maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.linux; } // meta; -}) +} + +// + +(if (cross != null && cross.config == "i586-pc-gnu") + then { + # Work around the fact that the configure snippet that looks for + # does not honor `--with-headers=$sysheaders' and that + # glibc expects both Mach and Hurd headers to be in the same place. + CPATH = "${hurdHeaders}/include:${machHeaders}/include"; + } + else { })) diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix index 32c37aaac34..9bbc7740896 100644 --- a/pkgs/development/libraries/glibc-2.11/default.nix +++ b/pkgs/development/libraries/glibc-2.11/default.nix @@ -1,10 +1,14 @@ { stdenv, fetchurl, kernelHeaders +, machHeaders ? null, hurdHeaders ? null , installLocales ? true , profilingLibraries ? false , gccCross ? null +, mig ? null }: assert stdenv.gcc.gcc != null; +assert (mig != null) -> (machHeaders != null); +assert (machHeaders != null) -> (hurdHeaders != null); let build = import ./common.nix; @@ -37,6 +41,12 @@ in // + (if hurdHeaders != null + then { inherit machHeaders hurdHeaders mig; } + else { }) + + // + (if cross != null then { preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f4534d42f0..0d4d5a898ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3901,12 +3901,20 @@ let installLocales = getPkgConfig "glibc" "locales" false; }; - glibc211Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) { - inherit stdenv fetchurl; - gccCross = gccCrossStageStatic; - kernelHeaders = linuxHeadersCross; - installLocales = getPkgConfig "glibc" "locales" false; - }); + glibc211Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) + (let crossGNU = (crossSystem.config == "i586-pc-gnu"); + in ({ + inherit stdenv fetchurl; + gccCross = gccCrossStageStatic; + kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross; + installLocales = getPkgConfig "glibc" "locales" false; + } + + // + + (if crossGNU + then { inherit machHeaders hurdHeaders; mig = migCross; } + else { })))); glibcCross = glibc211Cross; From e4b15a9cee3e1edaf43717232d4fcc70722254b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 15:46:55 +0000 Subject: [PATCH 247/342] release-cross: Add `crossGNU' job. svn path=/nixpkgs/trunk/; revision=21753 --- pkgs/top-level/release-cross.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 79e6975ea93..0845d73175c 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -136,4 +136,21 @@ in { windows.wxMSW.hostDrv = nativePlatforms; gccCrossStageFinal = nativePlatforms; }; +}) // ( + +/* GNU aka. GNU/Hurd. */ +let + crossSystem = { + config = "i586-pc-gnu"; + bigEndian = false; + arch = "i586"; + float = "hard"; + withTLS = true; + platform = pkgs.platforms.pc; + libc = "glibc"; + }; +in { + crossGNU = mapTestOnCross crossSystem { + gccCrossStageFinal = nativePlatforms; + }; }) From ed55a19bc7d5a8d616a76864b5f850c7d6392097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 12 May 2010 19:31:03 +0000 Subject: [PATCH 248/342] Adding FUSE to the sheevaplug kernel, as a module svn path=/nixpkgs/trunk/; revision=21754 --- pkgs/top-level/platforms.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 5244769a261..d8a1394bbdb 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -62,6 +62,8 @@ rec { ATM_HE n SCSI_ACARD n BLK_DEV_CMD640_ENHANCED n + + FUSE_FS m ''; kernelTarget = "uImage"; uboot = "sheevaplug"; From 146cfcba6c289ff7d402d624bef1823c57fdd5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 12 May 2010 19:31:18 +0000 Subject: [PATCH 249/342] Fixing glibcInfo - it did not build. svn path=/nixpkgs/trunk/; revision=21755 --- pkgs/development/libraries/glibc-2.11/info.nix | 3 ++- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc-2.11/info.nix b/pkgs/development/libraries/glibc-2.11/info.nix index 926598b3760..84a16fefce9 100644 --- a/pkgs/development/libraries/glibc-2.11/info.nix +++ b/pkgs/development/libraries/glibc-2.11/info.nix @@ -2,7 +2,8 @@ let build = import ./common.nix; in - build { + /* null cross builder */ + build null { name = "glibc-info"; inherit fetchurl stdenv; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d4d5a898ec..626ae579c2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7991,6 +7991,11 @@ let inherit fetchurl stdenv nasm; }; + larswm = import ../applications/window-managers/larswm { + inherit fetchurl stdenv; + inherit (xlibs) imake libX11 libXext libXmu; + }; + ladspaH = import ../applications/audio/ladspa-plugins/ladspah.nix { inherit fetchurl stdenv builderDefs stringsWithDeps; }; From 632ad9e73c5ab84d66bc79cd3b5a7ab6f243f672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 20:49:57 +0000 Subject: [PATCH 250/342] glibc: Check whether `crossSystem' is null before accessing it. svn path=/nixpkgs/trunk/; revision=21756 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 626ae579c2d..23c8cc02bbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3902,7 +3902,7 @@ let }; glibc211Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) - (let crossGNU = (crossSystem.config == "i586-pc-gnu"); + (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); in ({ inherit stdenv fetchurl; gccCross = gccCrossStageStatic; From 45944d3aee0008ed7af15bbc7c3328133ff8f833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 12 May 2010 21:53:42 +0000 Subject: [PATCH 251/342] I forgot the nix file for larswm svn path=/nixpkgs/trunk/; revision=21757 --- .../window-managers/larswm/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 pkgs/applications/window-managers/larswm/default.nix diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix new file mode 100644 index 00000000000..cac5e155f13 --- /dev/null +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, imake, libX11, libXext, libXmu}: + +stdenv.mkDerivation { + name = "larswm-7.5.3"; + src = /home/viric/larswm-7.5.3.tar.gz; + + buildInputs = [ imake libX11 libXext libXmu ]; + + configurePhase = '' + xmkmf + makeFlags="DESTDIR=$out" + ''; + + meta = { + homepage = http://larswm.fnurt.net/; + description = "9wm-like tiling window manager"; + license = "free"; + }; +} From d994faca9bbb047fc9c31585389ec01f46bc4f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 12 May 2010 21:59:06 +0000 Subject: [PATCH 252/342] Fixing larswm src. svn path=/nixpkgs/trunk/; revision=21758 --- pkgs/applications/window-managers/larswm/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index cac5e155f13..010a00b8fab 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -2,7 +2,11 @@ stdenv.mkDerivation { name = "larswm-7.5.3"; - src = /home/viric/larswm-7.5.3.tar.gz; + + src = fetchurl { + url = mirror://sourceforge/larswm/larswm-7.5.3.tar.gz; + sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; + }; buildInputs = [ imake libX11 libXext libXmu ]; From a07de1d9b1e8237ba8c7b560a30f7153b22e7980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 12 May 2010 22:08:45 +0000 Subject: [PATCH 253/342] The installation path of larswm was wrong (Lots of commits for that larswm!) svn path=/nixpkgs/trunk/; revision=21759 --- pkgs/applications/window-managers/larswm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index 010a00b8fab..3cd3e18b13b 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configurePhase = '' xmkmf - makeFlags="DESTDIR=$out" + makeFlags="BINDIR=$out/bin" ''; meta = { From 7a34b3a7a9bdce073e0ab612b320f3c3d6b8bb06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 12 May 2010 23:54:20 +0000 Subject: [PATCH 254/342] glibc: Get the Hurd-specific glibc branch. svn path=/nixpkgs/trunk/; revision=21761 --- .../libraries/glibc-2.11/common.nix | 44 ++++++++++++++----- .../libraries/glibc-2.11/default.nix | 7 +-- pkgs/top-level/all-packages.nix | 5 ++- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix index cdd968b4582..178dfcdcbeb 100644 --- a/pkgs/development/libraries/glibc-2.11/common.nix +++ b/pkgs/development/libraries/glibc-2.11/common.nix @@ -5,14 +5,21 @@ cross : { name, fetchurl, stdenv, installLocales ? false , gccCross ? null, kernelHeaders ? null -, machHeaders ? null, hurdHeaders ? null, mig ? null +, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null , profilingLibraries ? false, meta , preConfigure ? "", ... }@args : -let version = "2.11.1"; in +let + rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f"; + version = if hurdHeaders != null then "0.0-pre" + rev else "2.11.1"; +in assert (cross != null) -> (gccCross != null); +assert (mig != null) -> (machHeaders != null); +assert (machHeaders != null) -> (hurdHeaders != null); +assert (hurdHeaders != null) -> (fetchgit != null); + stdenv.mkDerivation ({ inherit kernelHeaders installLocales; @@ -21,7 +28,8 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; - patches = [ + patches = + stdenv.lib.optional (fetchgit == null) /* Fix for NIXPKGS-79: when doing host name lookups, when nsswitch.conf contains a line like @@ -45,6 +53,7 @@ stdenv.mkDerivation ({ failure to find mdns4_minimal. */ ./nss-skip-unavail.patch + ++ [ /* Make it possible to override the locale-archive in NixOS. */ ./locale-override.patch @@ -53,10 +62,11 @@ stdenv.mkDerivation ({ /* Make sure `nscd' et al. are linked against `libssp'. */ ./stack-protector-link.patch + ] + ++ stdenv.lib.optional (fetchgit == null) /* MOD_NANO definition, for ntp (taken from glibc upstream) */ - ./mod_nano.patch - ]; + ./mod_nano.patch; configureFlags = [ "-C" @@ -100,10 +110,20 @@ stdenv.mkDerivation ({ name = name + "-${version}" + stdenv.lib.optionalString (cross != null) "-${cross.config}"; - src = fetchurl { - url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; - sha256 = "18azb6518ryqhkfmddr25p0h1s2msrmx7dblij58sjlnzh61vq34"; - }; + src = + if hurdHeaders != null + then fetchgit { + # Shamefully the "official" glibc won't build on GNU, so use the one + # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. + # See . + url = "git://git.sv.gnu.org/hurd/glibc.git"; + sha256 = "f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e"; + inherit rev; + } + else fetchurl { + url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; + sha256 = "18azb6518ryqhkfmddr25p0h1s2msrmx7dblij58sjlnzh61vq34"; + }; srcPorts = fetchurl { url = "mirror://gnu/glibc/glibc-ports-2.11.tar.bz2"; @@ -155,11 +175,15 @@ stdenv.mkDerivation ({ // -(if (cross != null && cross.config == "i586-pc-gnu") +(if hurdHeaders != null then { # Work around the fact that the configure snippet that looks for # does not honor `--with-headers=$sysheaders' and that # glibc expects both Mach and Hurd headers to be in the same place. CPATH = "${hurdHeaders}/include:${machHeaders}/include"; + + # `fetchgit' is a function and thus should not be passed to the + # `derivation' primitive. + fetchgit = null; } else { })) diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix index 9bbc7740896..7c92a0fe41b 100644 --- a/pkgs/development/libraries/glibc-2.11/default.nix +++ b/pkgs/development/libraries/glibc-2.11/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchurl, kernelHeaders -, machHeaders ? null, hurdHeaders ? null +, machHeaders ? null, hurdHeaders ? null, mig ? null, fetchgit ? null , installLocales ? true , profilingLibraries ? false , gccCross ? null -, mig ? null }: assert stdenv.gcc.gcc != null; -assert (mig != null) -> (machHeaders != null); -assert (machHeaders != null) -> (hurdHeaders != null); let build = import ./common.nix; @@ -42,7 +39,7 @@ in // (if hurdHeaders != null - then { inherit machHeaders hurdHeaders mig; } + then { inherit machHeaders hurdHeaders mig fetchgit; } else { }) // diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23c8cc02bbb..0a976860bf4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3913,7 +3913,10 @@ let // (if crossGNU - then { inherit machHeaders hurdHeaders; mig = migCross; } + then { + inherit machHeaders hurdHeaders fetchgit; + mig = migCross; + } else { })))); glibcCross = glibc211Cross; From c7d36ccd9726e1caf98bac288994cae6c3b67e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 13 May 2010 12:18:09 +0000 Subject: [PATCH 255/342] Update Awesome to 3.4.5 svn path=/nixpkgs/trunk/; revision=21762 --- pkgs/applications/window-managers/awesome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 831743a0522..3d8782e4505 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,11 +4,11 @@ , docbook_xml_dtd_45, libxslt, coreutils}: stdenv.mkDerivation rec { - name = "awesome-3.4.4"; + name = "awesome-3.4.5"; src = fetchurl { - url = http://awesome.naquadah.org/download/awesome-3.4.4.tar.xz; - sha256 = "1d1ida8mznn02pzj2kfh6m59mwrz8vk1cy66npgyfpzyrv8a558y"; + url = http://awesome.naquadah.org/download/awesome-3.4.5.tar.xz; + sha256 = "124g6k4n2yf9shw3ig9lj1jdwiysfbj13mnjd38k22hqbj3yhnbi"; }; buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango From 46bce5a7895e0e4e6209a341d77b210f4e920a7c Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 13 May 2010 15:56:04 +0000 Subject: [PATCH 256/342] Add gobject-introspection svn path=/nixpkgs/trunk/; revision=21763 --- .../gobject-introspection/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/gobject-introspection/default.nix diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix new file mode 100644 index 00000000000..62d021e251e --- /dev/null +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python, cairo }: + +let + baseName = "gobject-introspection"; + v = "0.6.10"; +in + +stdenv.mkDerivation rec { + name = "${baseName}-${v}"; + + buildInputs = [ flex bison glib pkgconfig python cairo ]; + propagatedBuildInputs = [ libffi ]; + configureFlags = "--enable-gcov"; + + src = fetchurl { + url = "mirror://gnome/sources/${baseName}/0.6/${name}.tar.bz2"; + sha256 = "0jwd7bybgvg6dwhg64da8k9yjrs37y5p153gaaapz5j59ld53g9n"; + }; + + meta = with stdenv.lib; { + maintainers = [ maintainers.urkud ]; + platforms = [ platforms.linux ]; + homepage = http://live.gnome.org/GObjectIntrospection; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a976860bf4..95f086c5284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3996,6 +3996,10 @@ let gmpxx = gmp.override { cxx = true; }; + gobjectIntrospection = makeOverridable (import ../development/libraries/gobject-introspection) { + inherit fetchurl stdenv pkgconfig flex bison glib libffi python cairo; + }; + goffice = import ../development/libraries/goffice { inherit fetchurl stdenv pkgconfig libgsf libxml2 cairo intltool gettext bzip2; From a309626c49ebf9f183089ae44cd1652f48afe49f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 13 May 2010 15:57:37 +0000 Subject: [PATCH 257/342] Fix a typo in gobject-introspection svn path=/nixpkgs/trunk/; revision=21764 --- pkgs/development/libraries/gobject-introspection/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 62d021e251e..f5fed1e1604 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = [ maintainers.urkud ]; - platforms = [ platforms.linux ]; + platforms = platforms.linux; homepage = http://live.gnome.org/GObjectIntrospection; }; } From 01d171e81192ff4e5c69a59c538d8d78f9e0fba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 13 May 2010 16:21:38 +0000 Subject: [PATCH 258/342] Added vector library for Haskell. svn path=/nixpkgs/trunk/; revision=21765 --- .../libraries/haskell/primitive/default.nix | 13 +++++++++++++ .../libraries/haskell/vector/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/haskell/primitive/default.nix create mode 100644 pkgs/development/libraries/haskell/vector/default.nix diff --git a/pkgs/development/libraries/haskell/primitive/default.nix b/pkgs/development/libraries/haskell/primitive/default.nix new file mode 100644 index 00000000000..ea2de19592f --- /dev/null +++ b/pkgs/development/libraries/haskell/primitive/default.nix @@ -0,0 +1,13 @@ +{cabal}: + +cabal.mkDerivation (self : { + pname = "primitive"; + version = "0.3"; + sha256 = "b63cb5dd3417433429b3ad5489791bddd0973b96b7c3314a4ecc9e6a68b2a35d"; + meta = { + description = "Wrappers for primitive operations"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/vector/default.nix b/pkgs/development/libraries/haskell/vector/default.nix new file mode 100644 index 00000000000..bf9dbd818ed --- /dev/null +++ b/pkgs/development/libraries/haskell/vector/default.nix @@ -0,0 +1,14 @@ +{cabal, primitive}: + +cabal.mkDerivation (self : { + pname = "vector"; + version = "0.6.0.1"; + sha256 = "b0cba9b3aa94688321a2ec7b4fb4b41781073b2605584ad41957ba1c6892acce"; + propagatedBuildInputs = [primitive]; + meta = { + description = "Efficient arrays"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 78da26b35e2..a04ba8919f7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -562,6 +562,10 @@ rec { inherit cabal binary; }; + primitive = import ../development/libraries/haskell/primitive { + inherit cabal; + }; + QuickCheck = QuickCheck1; QuickCheck1 = import ../development/libraries/haskell/QuickCheck { @@ -782,6 +786,10 @@ rec { inherit cabal vacuum gtk2hs parallel strictConcurrency; }; + vector = import ../development/libraries/haskell/vector { + inherit cabal primitive; + }; + vty = import ../development/libraries/haskell/vty { inherit cabal utf8String terminfo; }; From 5bf578f7f9fb7ddc537d48e7609ee72daab9975f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 13 May 2010 16:35:32 +0000 Subject: [PATCH 259/342] Updated cpphs version. svn path=/nixpkgs/trunk/; revision=21766 --- pkgs/development/tools/misc/cpphs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 2d67dd0143c..bb527e63c1e 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self : { pname = "cpphs"; - version = "1.9"; - sha256 = "d93fab09e8bc10b54d483daf2b636ee07548c9f8fb60a900f1d665d568b7b9c8"; + version = "1.11"; + sha256 = "26124ca2b1af9a9804ba37c627dbbca3977bde93925f979f08b342895548db01"; meta = { description = "A liberalised re-implementation of cpp, the C pre-processor"; }; From a7e554d43ca972ae646e69e68b37d8789d51644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 13 May 2010 17:23:33 +0000 Subject: [PATCH 260/342] Added Vec and Ranged-sets libraries for Haskell. svn path=/nixpkgs/trunk/; revision=21767 --- .../libraries/haskell/Ranged-sets/default.nix | 14 ++++++++++++++ pkgs/development/libraries/haskell/Vec/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 8 ++++++++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/haskell/Ranged-sets/default.nix create mode 100644 pkgs/development/libraries/haskell/Vec/default.nix diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix new file mode 100644 index 00000000000..547ac31b03c --- /dev/null +++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix @@ -0,0 +1,14 @@ +{cabal, HUnit, QuickCheck}: + +cabal.mkDerivation (self : { + pname = "Ranged-sets"; + version = "0.2.1"; + sha256 = "dee83d2ea0ae56ff31eb7c74a0785328ca8621792c0859e223b12c17bb775f12"; + propagatedBuildInputs = [HUnit QuickCheck]; + meta = { + description = "Ranged sets for Haskell"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix new file mode 100644 index 00000000000..92e1a68db28 --- /dev/null +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -0,0 +1,14 @@ +{cabal, QuickCheck}: + +cabal.mkDerivation (self : { + pname = "Vec"; + version = "0.9.7"; + sha256 = "a67197f4dc022d6119a790e029a9475a17bb04ad812006bb154e5da9cd8f7ac7"; + propagatedBuildInputs = [QuickCheck]; + meta = { + description = "Fixed-length lists and low-dimensional linear algebra"; + license = "BSD"; + maintainers = [self.stdenv.lib.maintainers.andres]; + }; +}) + diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a04ba8919f7..16b8ce7c422 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -576,6 +576,10 @@ rec { inherit cabal mtl; }; + RangedSets = import ../development/libraries/haskell/Ranged-sets { + inherit cabal HUnit QuickCheck; + }; + readline = import ../development/libraries/haskell/readline { inherit cabal; inherit (pkgs) readline ncurses; @@ -786,6 +790,10 @@ rec { inherit cabal vacuum gtk2hs parallel strictConcurrency; }; + Vec = import ../development/libraries/haskell/Vec { + inherit cabal QuickCheck; + }; + vector = import ../development/libraries/haskell/vector { inherit cabal primitive; }; From 975b88f57360abf047b2e9d5a8406da05424313d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Thu, 13 May 2010 18:47:04 +0000 Subject: [PATCH 261/342] Updated parsec-3. svn path=/nixpkgs/trunk/; revision=21768 --- pkgs/development/libraries/haskell/parsec/3.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/parsec/3.nix b/pkgs/development/libraries/haskell/parsec/3.nix index 883f1adabd6..048dc87b547 100644 --- a/pkgs/development/libraries/haskell/parsec/3.nix +++ b/pkgs/development/libraries/haskell/parsec/3.nix @@ -1,12 +1,14 @@ -{cabal,mtl}: +{cabal, mtl}: cabal.mkDerivation (self : { pname = "parsec"; - version = "3.0.1"; - sha256 = "619d0c2eb093cfe6d6caab2ff94f31a6208720b4bcc85b9f98600253bb505542"; + version = "3.1.0"; + sha256 = "962d39944bae18b0fea60961c77513f455f95c0f67ae4b10ab15484a27b6fb98"; propagatedBuildInputs = [mtl]; meta = { + license = "BSD"; description = "Monadic parser combinators"; + maintainer = [self.stdenv.lib.maintainers.andres]; }; -}) +}) From 43106b4d045621bbf2cd5b52dbe68e65a22a6129 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 13 May 2010 22:05:08 +0000 Subject: [PATCH 262/342] Apply upstream security patch to kget svn path=/nixpkgs/trunk/; revision=21769 --- pkgs/desktops/kde-4.4/network/default.nix | 3 +- pkgs/desktops/kde-4.4/network/kget-cve.patch | 212 +++++++++++++++++++ 2 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/kde-4.4/network/kget-cve.patch diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix index 54331b69b8d..b91b97dfdf8 100644 --- a/pkgs/desktops/kde-4.4/network/default.nix +++ b/pkgs/desktops/kde-4.4/network/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation { }; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l - libXi libXtst libXdamage libXxf86vm + libXi libXtst libXdamage libXxf86vm kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ]; + patches = [ ./kget-cve.patch ]; meta = { description = "KDE network utilities"; longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface"; diff --git a/pkgs/desktops/kde-4.4/network/kget-cve.patch b/pkgs/desktops/kde-4.4/network/kget-cve.patch new file mode 100644 index 00000000000..26b77e7b127 --- /dev/null +++ b/pkgs/desktops/kde-4.4/network/kget-cve.patch @@ -0,0 +1,212 @@ +Index: kget/transfer-plugins/metalink/metalink.cpp +=================================================================== +--- a/kget/transfer-plugins/metalink/metalink.cpp (revision 1124973) ++++ b/kget/transfer-plugins/metalink/metalink.cpp (revision 1124974) +@@ -99,6 +99,7 @@ + void Metalink::metalinkInit(const KUrl &src, const QByteArray &data) + { + kDebug(5001); ++ + bool justDownloaded = !m_localMetalinkLocation.isValid(); + if (!src.isEmpty()) + { +@@ -121,7 +122,9 @@ + //error + if (!m_metalink.isValid()) + { +- kDebug(5001) << "Unknown error when trying to load the .metalink-file"; ++ kError(5001) << "Unknown error when trying to load the .metalink-file. Metalink is not valid."; ++ setStatus(Job::Aborted); ++ setTransferChange(Tc_Status, true); + return; + } + +@@ -202,7 +205,7 @@ + if (!m_dataSourceFactory.size()) + { + KMessageBox::error(0, i18n("Download failed, no working URLs were found."), i18n("Error")); +- setStatus(Job::Aborted, i18n("An error occurred...."), SmallIcon("document-preview")); ++ setStatus(Job::Aborted); + setTransferChange(Tc_Status, true); + return; + } +@@ -227,16 +230,29 @@ + ui.treeView->hideColumn(FileItem::SignatureVerified); + dialog->setMainWidget(widget); + dialog->setCaption(i18n("File Selection")); +- dialog->setButtons(KDialog::Ok); +- connect(dialog, SIGNAL(finished()), this, SLOT(filesSelected())); ++ dialog->setButtons(KDialog::Ok | KDialog::Cancel); ++ connect(dialog, SIGNAL(finished(int)), this, SLOT(fileDlgFinished(int))); + + dialog->show(); + } + } + +-void Metalink::filesSelected() ++void Metalink::fileDlgFinished(int result) + { ++ //BEGIN HACK if the dialog was not accepted untick every file, so that the download does not start ++ //generally setStatus should do the job as well, but does not as it appears ++ if (result != QDialog::Accepted) { ++ for (int row = 0; row < fileModel()->rowCount(); ++row) { ++ QModelIndex index = fileModel()->index(row, FileItem::File); ++ if (index.isValid()) { ++ fileModel()->setData(index, Qt::Unchecked, Qt::CheckStateRole); ++ } ++ } ++ } ++ //END ++ + QModelIndexList files = fileModel()->fileIndexes(FileItem::File); ++ int numFilesSelected = 0; + foreach (const QModelIndex &index, files) + { + const KUrl dest = fileModel()->getUrl(index); +@@ -244,6 +260,9 @@ + if (m_dataSourceFactory.contains(dest)) + { + m_dataSourceFactory[dest]->setDoDownload(doDownload); ++ if (doDownload) { ++ ++numFilesSelected; ++ } + } + } + +@@ -252,9 +271,15 @@ + processedSizeChanged(); + speedChanged(); + ++ //no files selected to download or dialog rejected, stop the download ++ if (!numFilesSelected || (result != QDialog::Accepted)) { ++ setStatus(Job::Stopped);//FIXME ++ setTransferChange(Tc_Status, true); ++ return; ++ } ++ + //some files may be set to download, so start them as long as the transfer is not stopped +- if (status() != Job::Stopped) +- { ++ if (status() != Job::Stopped) { + startMetalink(); + } + } +Index: kget/transfer-plugins/metalink/metalink.h +=================================================================== +--- a/kget/transfer-plugins/metalink/metalink.h (revision 1124973) ++++ b/kget/transfer-plugins/metalink/metalink.h (revision 1124974) +@@ -81,7 +81,7 @@ + + private Q_SLOTS: + void metalinkInit(const KUrl &url = KUrl(), const QByteArray &data = QByteArray()); +- void filesSelected(); ++ void fileDlgFinished(int result); + void totalSizeChanged(KIO::filesize_t size); + void processedSizeChanged(); + void speedChanged(); +Index: kget/ui/metalinkcreator/metalinker.h +=================================================================== +--- a/kget/ui/metalinkcreator/metalinker.h (revision 1124973) ++++ b/kget/ui/metalinkcreator/metalinker.h (revision 1124974) +@@ -259,6 +259,14 @@ + KIO::filesize_t size; + CommonData data; + Resources resources; ++ ++ private: ++ /** ++ * Controlls if the name attribute is valid, i.e. it is not empty and ++ * does not contain any directory traversal directives or information, ++ * as described in the Metalink 4.0 specification 4.1.2.1. ++ */ ++ bool isValidNameAttribute() const; + }; + + class Files +Index: kget/ui/metalinkcreator/metalinker.cpp +=================================================================== +--- a/kget/ui/metalinkcreator/metalinker.cpp (revision 1124973) ++++ b/kget/ui/metalinkcreator/metalinker.cpp (revision 1124974) +@@ -528,14 +528,14 @@ + + bool KGetMetalink::File::isValid() const + { +- return !name.isEmpty() && resources.isValid(); ++ return isValidNameAttribute() && resources.isValid(); + } + + void KGetMetalink::File::load(const QDomElement &e) + { + data.load(e); + +- name = e.attribute("name"); ++ name = QUrl::fromPercentEncoding(e.attribute("name").toAscii()); + size = e.firstChildElement("size").text().toULongLong(); + + verification.load(e); +@@ -575,6 +575,22 @@ + resources.clear(); + } + ++ ++bool KGetMetalink::File::isValidNameAttribute() const ++{ ++ if (name.isEmpty()) { ++ kError(5001) << "Name attribute of Metalink::File is empty."; ++ return false; ++ } ++ ++ if (name.contains(QRegExp("$(\\.\\.?)?/")) || name.contains("/../") || name.endsWith("/..")) { ++ kError(5001) << "Name attribute of Metalink::File contains directory traversal directives:" << name; ++ return false; ++ } ++ ++ return true; ++} ++ + #ifdef HAVE_NEPOMUK + QHash KGetMetalink::File::properties() const + { +@@ -584,13 +600,28 @@ + + bool KGetMetalink::Files::isValid() const + { +- bool isValid = !files.empty(); +- foreach (const File &file, files) +- { +- isValid &= file.isValid(); ++ if (files.isEmpty()) { ++ return false; + } + +- return isValid; ++ QStringList fileNames; ++ foreach (const File &file, files) { ++ fileNames << file.name; ++ if (!file.isValid()) { ++ return false; ++ } ++ } ++ ++ //The value of name must be unique for each file ++ while (!fileNames.isEmpty()) { ++ const QString fileName = fileNames.takeFirst(); ++ if (fileNames.contains(fileName)) { ++ kError(5001) << "Metalink::File name" << fileName << "exists multiple times."; ++ return false; ++ } ++ } ++ ++ return true; + } + + void KGetMetalink::Files::load(const QDomElement &e) +@@ -751,7 +782,7 @@ + + for (QDomElement elem = filesElem.firstChildElement("file"); !elem.isNull(); elem = elem.nextSiblingElement("file")) { + File file; +- file.name = elem.attribute("name"); ++ file.name = QUrl::fromPercentEncoding(elem.attribute("name").toAscii()); + file.size = elem.firstChildElement("size").text().toULongLong(); + + file.data = parseCommonData(elem); From dd6d459130a0147a19d06ccaf9a049847b66a29e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 13 May 2010 22:14:16 +0000 Subject: [PATCH 263/342] Add otr support to kopete svn path=/nixpkgs/trunk/; revision=21770 --- pkgs/desktops/kde-4.4/default.nix | 2 +- pkgs/desktops/kde-4.4/network/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 562813f23ca..3982301c8d1 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -146,7 +146,7 @@ pkgs.recurseIntoAttrs (rec { kdenetwork = import ./network { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; - inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l; + inherit (pkgs) libidn libvncserver libmsn giflib gpgme boost libv4l libotr; inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm; inherit kdelibs kdepimlibs; inherit automoc4 phonon qca2 soprano qimageblitz strigi; diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix index b91b97dfdf8..382119b68e0 100644 --- a/pkgs/desktops/kde-4.4/network/default.nix +++ b/pkgs/desktops/kde-4.4/network/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn -, libvncserver, libmsn, giflib, gpgme, boost, libv4l +, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr , libXi, libXtst, libXdamage, libXxf86vm , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}: @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn libvncserver libmsn giflib gpgme boost stdenv.gcc.libc libv4l - libXi libXtst libXdamage libXxf86vm + libotr libXi libXtst libXdamage libXxf86vm kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ]; patches = [ ./kget-cve.patch ]; meta = { From 22d901d935a6e8ac0685fd12d8acdc96345db189 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 May 2010 08:57:16 +0000 Subject: [PATCH 264/342] * Updated Nix. svn path=/nixpkgs/trunk/; revision=21771 --- pkgs/tools/package-management/nix/sqlite.nix | 15 +++++++-------- pkgs/tools/package-management/nix/unstable.nix | 13 ++++++------- pkgs/top-level/all-packages.nix | 8 ++++---- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index 445008c5858..17cea9bd6f7 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchurl, aterm, perl, curl, bzip2, sqlite, openssl ? null +{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-0.15pre20563"; + name = "nix-0.15pre21760"; src = fetchurl { - url = "http://hydra.nixos.org/build/322387/download/4/${name}.tar.bz2"; - sha256 = "20d2d7f231c2c92e68c8d828292ecde4e3858a95965dfc6b7066feb24659541e"; + url = "http://hydra.nixos.org/build/406130/download/4/${name}.tar.bz2"; + sha256 = "b382540807400a9aeacdcd9c1618ead1cb6b61e922f64d1e7c29f63c0b678b02"; }; - buildInputs = [perl curl openssl]; + buildInputs = [ perl curl openssl ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-aterm=${aterm} --with-bzip2=${bzip2} --with-sqlite=${sqlite} + --with-bzip2=${bzip2} --with-sqlite=${sqlite} --disable-init-state + CFLAGS=-O3 CXXFLAGS=-O3 ''; doCheck = true; - passthru = { inherit aterm; }; - meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 03386da9a57..7b99a5e480c 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null +{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-0.16pre21576"; + name = "nix-0.16pre21748"; src = fetchurl { - url = "http://hydra.nixos.org/build/395008/download/4/${name}.tar.bz2"; - sha256 = "1axmipk8vp9vwsq5wnhshgb0pcgbhanlxz8z2m3f5vxvixvw3i19"; + url = http://hydra.nixos.org/build/405917/download/4/nix-0.16pre21741.tar.bz2; + sha256 = "048a9d0658906a5f344f27a0ba39c0a4d926666cef9f4e93a35f73607dd0e947"; }; buildNativeInputs = [ perl ]; @@ -17,14 +17,13 @@ stdenv.mkDerivation rec { configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-aterm=${aterm} --with-bzip2=${bzip2} + --with-bzip2=${bzip2} --disable-init-state + CFLAGS=-O3 CXXFLAGS=-O3 ''; doCheck = true; - passthru = { inherit aterm; }; - meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95f086c5284..7eb15b90335 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -743,11 +743,11 @@ let }; dos2unix = import ../tools/text/dos2unix { - inherit fetchurl stdenv; + inherit fetchurl stdenv; }; unix2dos = import ../tools/text/unix2dos { - inherit fetchurl stdenv; + inherit fetchurl stdenv; }; gawk = useFromStdenv "gawk" @@ -9465,14 +9465,14 @@ let }; nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { - inherit fetchurl stdenv perl curl bzip2 openssl aterm; + inherit fetchurl stdenv perl curl bzip2 openssl; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }; # The SQLite branch. nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) { - inherit fetchurl stdenv perl curl bzip2 openssl aterm sqlite; + inherit fetchurl stdenv perl curl bzip2 openssl sqlite; storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; }); From b5feb272d75f8e85f1d85b65b6394e02d7f37ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 14 May 2010 09:23:04 +0000 Subject: [PATCH 265/342] Added ppm package for Haskell. svn path=/nixpkgs/trunk/; revision=21772 --- pkgs/development/libraries/haskell/ppm/default.nix | 13 +++++++++++++ pkgs/top-level/haskell-packages.nix | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ppm/default.nix diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix new file mode 100644 index 00000000000..e3cfd77bbdb --- /dev/null +++ b/pkgs/development/libraries/haskell/ppm/default.nix @@ -0,0 +1,13 @@ +{cabal, mtl}: + +cabal.mkDerivation (self : { + pname = "ppm"; + version = "2009.5.13"; + sha256 = "9e390ca9a9e6e740fa71d2b72fa2c9c3d521118b0ebb35f10fabbbe543ecfb5b"; + propagatedBuildInputs = [mtl]; + meta = { + license = "BSD"; + description = "a tiny PPM image generator"; + maintainer = [self.stdenv.lib.maintainers.andres]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 16b8ce7c422..a5d36088b72 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -558,6 +558,10 @@ rec { inherit cabal; }; + ppm = import ../development/libraries/haskell/ppm { + inherit cabal mtl; + }; + pureMD5 = import ../development/libraries/haskell/pureMD5 { inherit cabal binary; }; From 8f8b0bc3ad80011ea5ec77db21dcab8e2953d700 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 14 May 2010 09:54:31 +0000 Subject: [PATCH 266/342] pkgs/applications/editors/emacs-{22,23}: don't restrict this build to Linux It looks like the recent update broke the package on all platforms other than Linux, but no-one seems to have noticed. Hydra certainly didn't. That's not particularly satisfactory. Surely, we would like Emacs to build on Darwin, BSD, and other platforms, too? svn path=/nixpkgs/trunk/; revision=21773 --- pkgs/applications/editors/emacs-22/default.nix | 8 ++++---- pkgs/applications/editors/emacs-23/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs-22/default.nix b/pkgs/applications/editors/emacs-22/default.nix index da3c4babbf6..89c8af070e0 100644 --- a/pkgs/applications/editors/emacs-22/default.nix +++ b/pkgs/applications/editors/emacs-22/default.nix @@ -16,17 +16,17 @@ stdenv.mkDerivation rec { name = "emacs-22.3"; builder = ./builder.sh; - + src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.gz"; sha256 = "05hd89bchcpwzcx5la0alcp0wb7xywvnf98dxrshrqlfvccvgnbv"; }; - + buildInputs = [ncurses x11] ++ stdenv.lib.optional xawSupport (if xaw3dSupport then Xaw3d else libXaw) ++ stdenv.lib.optional xpmSupport libXpm ++ stdenv.lib.optionals gtkGUI [pkgconfig gtk]; - + configureFlags = stdenv.lib.optional gtkGUI "--with-x-toolkit=gtk"; @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/emacs/; license = "GPLv3+"; - platforms = stdenv.lib.platforms.linux; # GTK & co. are needed. + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index fac7abadcb4..a68cd5935c5 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.linux; # GTK & co. are needed. + platforms = stdenv.lib.platforms.all; }; } From 4cc26f3ab72435979e9ddeb7bf9f164e6385b434 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 May 2010 18:20:38 +0000 Subject: [PATCH 267/342] * Remove some empty directories. svn path=/nixpkgs/trunk/; revision=21774 From 52c65a1e62afa7c8a0f2a2f355dcd5372dc8eb50 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:47:32 +0000 Subject: [PATCH 268/342] Add rekonq browser (both 0.4.0 and latest git) svn path=/nixpkgs/trunk/; revision=21779 --- .../networking/browsers/rekonq/default.nix | 18 +++++++++++++ .../networking/browsers/rekonq/source.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +++++ 3 files changed, 52 insertions(+) create mode 100644 pkgs/applications/networking/browsers/rekonq/default.nix create mode 100644 pkgs/applications/networking/browsers/rekonq/source.nix diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix new file mode 100644 index 00000000000..8c8b4774cea --- /dev/null +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl +, v ? "0.4.0" }: +let + s = import ./source.nix { inherit fetchurl fetchgit; }; in + +stdenv.mkDerivation ( + builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; }) + // { + buildInputs = [ cmake qt4 kdelibs automoc4 phonon perl ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = [ maintainers.urkud ]; + description = "KDE Webkit browser"; + homepage = http://rekonq.sourceforge.net; + }; + } +) diff --git a/pkgs/applications/networking/browsers/rekonq/source.nix b/pkgs/applications/networking/browsers/rekonq/source.nix new file mode 100644 index 00000000000..a30de7bfbee --- /dev/null +++ b/pkgs/applications/networking/browsers/rekonq/source.nix @@ -0,0 +1,27 @@ +{ fetchurl, fetchgit }: + +builtins.listToAttrs +[ + { + name = "0.4.0"; + value = rec { + name = "rekonq-0.4.0"; + src = fetchurl { + url = "mirror://sourceforge/rekonq/${name}.tar.bz2"; + sha256 = "1dxpzkifqy85kwj94mhazan6f9glxvl7i02c50n3f0a12wiywwvy"; + }; + }; + } + + { + name = "scm"; + value = { + name = "rekonq-0.4.0-20100514"; + src = fetchgit { + url = git://gitorious.org/rekonq/mainline.git; + rev = "6b4f4d69a3c599bc958ccddc5f7ac1c8648a7042"; + sha256 = "1qcwf7rsrnsbnq62cl44r48bmavc2nysi2wqhy1jxmj2ndwvsxy1"; + }; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7eb15b90335..a341ad56197 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8342,6 +8342,13 @@ let libstdcpp5 = gcc33.gcc; }); + rekonq = makeOverridable (import ../applications/networking/browsers/rekonq) { + inherit fetchurl fetchgit stdenv cmake perl; + inherit (kde4) qt4 kdelibs automoc4 phonon; + }; + + rekonqScm = rekonq.override { v = "scm"; }; + rsync = import ../applications/networking/sync/rsync { inherit fetchurl stdenv acl perl; enableACLs = !stdenv.isDarwin; From e69bf4f278f865fbb2ea27d202b1f8a1284708da Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:49:07 +0000 Subject: [PATCH 269/342] Remove unused lines svn path=/nixpkgs/trunk/; revision=21780 --- pkgs/applications/networking/browsers/rekonq/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix index 8c8b4774cea..f011009c111 100644 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ b/pkgs/applications/networking/browsers/rekonq/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl , v ? "0.4.0" }: -let - s = import ./source.nix { inherit fetchurl fetchgit; }; in stdenv.mkDerivation ( builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; }) From 82201f14e92d457df67e0c448bcdd3582dd216c7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:54:35 +0000 Subject: [PATCH 270/342] Upgrade to udev-153. Use /etc/firmware:/root/test-firmware path svn path=/nixpkgs/trunk/; revision=21781 --- pkgs/os-specific/linux/udev/default.nix | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index 988d0a3df3b..d60db970e2b 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -4,29 +4,23 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "udev-145"; + name = "udev-153"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv"; + sha256 = "0i3ns4qhfbnci284k8zri0rfxw88ccajdynb5djh6k182a6nn3la"; }; buildInputs = [gperf pkgconfig glib acl libusb usbutils]; - configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids"; - - preConfigure = - '' - substituteInPlace extras/keymap/Makefile.in \ - --replace /usr/include ${stdenv.glibc}/include - ''; + configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids + --disable-introspection + --with-firmware-path=/etc/firmware:/root/test-firmware"; postInstall = '' # Install some rules that really should be installed by default. - for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do - cp rules/packages/$i $out/libexec/rules.d/ - done + cp rules/packages/40-pilot-links.rules $out/libexec/rules.d/ # The path to rule_generator.functions in write_cd_rules and # write_net_rules is broken. Also, don't store the mutable @@ -39,12 +33,7 @@ stdenv.mkDerivation rec { done # Don't set PATH to /bin:/sbin; won't work in NixOS. - substituteInPlace $out/libexec/rule_generator.functions \ - --replace 'PATH=' '#PATH=' - - # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the - # environment of the caller. - sed '3,4d' -i $out/libexec/firmware.sh + sed -e '/PATH=/d' -i $out/libexec/rule_generator.functions ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit ''; From 1c9a08d3eb0bdabf1b90d2312093bc92fd96b467 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:54:42 +0000 Subject: [PATCH 271/342] Changed udev firmware path to /root/test-firmware:/var/run/current-system/firmware /etc/firmware -> /var/run/current-system/firmware was disscussed on ML I've also changed the order because "emergency" path should be of higher priority svn path=/nixpkgs/trunk/; revision=21782 --- pkgs/os-specific/linux/udev/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index d60db970e2b..5f33a3b3733 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids --disable-introspection - --with-firmware-path=/etc/firmware:/root/test-firmware"; + --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware"; postInstall = '' From 9c7c6a9202c2b38681cbbdbe8dbcb38f3a680d42 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:54:50 +0000 Subject: [PATCH 272/342] consolekit-0.4.1 svn path=/nixpkgs/trunk/; revision=21783 --- pkgs/development/libraries/consolekit/default.nix | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix index f41e8c6fbd1..06b48b37580 100644 --- a/pkgs/development/libraries/consolekit/default.nix +++ b/pkgs/development/libraries/consolekit/default.nix @@ -1,21 +1,18 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, - libX11, policykit, expat, ... }: + libX11, polkit, expat }: stdenv.mkDerivation rec { - name = "consolekit-0.2.10"; + name = "consolekit-0.4.1"; src = fetchurl { - url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.2.10.tar.gz; - sha256 = "1jrv33shrmc1klwpgp02pycmbk9lfaxkd5q7bqxb6v95cl7m3f82"; + url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2; + sha256 = "0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph"; }; - buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 policykit expat ]; + buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ]; configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc"; - # Needed for pthread_cancel(). - NIX_LDFLAGS = "-lgcc_s"; - installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a341ad56197..b1bd8fbcb57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3601,7 +3601,7 @@ let }; consolekit = makeOverridable (import ../development/libraries/consolekit) { - inherit stdenv fetchurl pkgconfig dbus_glib zlib pam policykit expat glib; + inherit stdenv fetchurl pkgconfig dbus_glib zlib pam polkit expat glib; inherit (xlibs) libX11; }; From 84984310e922791a657fc43dded94eac9976bfa6 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:54:56 +0000 Subject: [PATCH 273/342] Update polkit-1 meta info svn path=/nixpkgs/trunk/; revision=21784 --- pkgs/development/libraries/polkit/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index d3b2c67a010..fa802a661cb 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }: stdenv.mkDerivation rec { - name = "policy-kit-0.92"; + name = "polkit-0.92"; src = fetchurl { - url = http://hal.freedesktop.org/releases/polkit-0.92.tar.gz; + url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "18x4xp4m14fm4aayra4njh82g2jzf6ccln40yybmhxqpb5a3nii8"; }; @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { --replace /usr/bin/pk-example-frobnicate $out/bin/pk-example-frobnicate ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.freedesktop.org/wiki/Software/PolicyKit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; + platforms = platforms.linux; + maintainers = [ maintainers.urkud ]; }; } From 0e8261b0bea737722277accee1ed30f504e3ba21 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:55:08 +0000 Subject: [PATCH 274/342] eggdbus-0.6 svn path=/nixpkgs/trunk/; revision=21785 --- pkgs/development/tools/misc/eggdbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 3811d7ea1f1..97031a533fa 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }: stdenv.mkDerivation rec { - name = "eggdbus-0.5"; + name = "eggdbus-0.6"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "0g1s9nzfyjyhnmv4hzll3izayh4c4pjy3i51ihwgkz3wmd1xaq9j"; + sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; buildInputs = [ pkgconfig glib dbus.libs dbus_glib ]; From 062c48db4bf2a097041c49b4ddd160c55d4a6867 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:55:15 +0000 Subject: [PATCH 275/342] Start migrating to polkit-0.9.6 svn path=/nixpkgs/trunk/; revision=21786 --- pkgs/development/libraries/polkit/default.nix | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index fa802a661cb..ac6f10a09b9 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }: +{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext, + gobjectIntrospection }: stdenv.mkDerivation rec { - name = "polkit-0.92"; + name = "polkit-0.96"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "18x4xp4m14fm4aayra4njh82g2jzf6ccln40yybmhxqpb5a3nii8"; + sha256 = "0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il"; }; - buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext ]; + buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext + gobjectIntrospection ]; - configureFlags = "--localstatedir=/var"; + configureFlags = "--localstatedir=/var --sysconfdir=/etc"; +# TODO: PACKAGE_DATA_DIR, PACKAGE_LIBEXEC_DIR, PACKAGE_LIB_DIR installFlags = "localstatedir=$(TMPDIR)/var"; # keep `make install' happy @@ -19,10 +22,6 @@ stdenv.mkDerivation rec { # Allow some files with paranoid permissions to be stripped in # the fixup phase. chmod a+rX -R $out - - # Fix the pathname in the frobnicate example. - substituteInPlace $out/share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy \ - --replace /usr/bin/pk-example-frobnicate $out/bin/pk-example-frobnicate ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1bd8fbcb57..13115100cf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5019,7 +5019,8 @@ let }; polkit = import ../development/libraries/polkit { - inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext glib; + inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext glib + gobjectIntrospection; }; policykit = makeOverridable (import ../development/libraries/policykit) { From 3fbd71aa88576874f1853250cc0854b1ac2714b4 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:55:22 +0000 Subject: [PATCH 276/342] udev-154 svn path=/nixpkgs/trunk/; revision=21787 --- pkgs/os-specific/linux/udev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index 5f33a3b3733..d6007c9f957 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -4,11 +4,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "udev-153"; + name = "udev-154"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "0i3ns4qhfbnci284k8zri0rfxw88ccajdynb5djh6k182a6nn3la"; + sha256 = "1aw5vn96gasvkjh6nfivaf68l6ph33y63zf7gnp3mc7c7zfncm0c"; }; buildInputs = [gperf pkgconfig glib acl libusb usbutils]; From 07c11bbec2648341a84b2d4ec1bd9993f17b849b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 09:55:31 +0000 Subject: [PATCH 277/342] Make polkit compile svn path=/nixpkgs/trunk/; revision=21788 --- pkgs/development/libraries/polkit/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index ac6f10a09b9..81d35a65550 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,22 +1,34 @@ { stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext, gobjectIntrospection }: +let + system="/var/run/current-system/sw"; + foolVars = { + LOCALSTATE = "/var"; + SYSCONF = "/etc"; + LIBEXEC = "${system}/libexec"; + LIB = "${system}/lib"; + DATA = "${system}/share"; + }; +in + stdenv.mkDerivation rec { name = "polkit-0.96"; - + src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il"; }; - + buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext gobjectIntrospection ]; - configureFlags = "--localstatedir=/var --sysconfdir=/etc"; -# TODO: PACKAGE_DATA_DIR, PACKAGE_LIBEXEC_DIR, PACKAGE_LIB_DIR + # Ugly hack to overwrite hardcoded directories + # TODO: investigate a proper patch which will be accepted upstream + CFLAGS = stdenv.lib.concatStringsSep " " + ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'') + (builtins.attrNames foolVars) ); - installFlags = "localstatedir=$(TMPDIR)/var"; # keep `make install' happy - postInstall = '' # Allow some files with paranoid permissions to be stripped in From 39b2ec2488f5d53aa00d13405432843c0dc06669 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 May 2010 10:38:28 +0000 Subject: [PATCH 278/342] Fix git-send-email. git-send-email depends on Net::SMTP and Net::SMTP::SSL. Make sendEmailSupport a config for git, and bring these libraries. Wrap the send-email script, or replace with a not supported script. svn path=/nixpkgs/trunk/; revision=21789 --- .../git-and-tools/default.nix | 8 +++ .../git-and-tools/git/default.nix | 15 +++++- pkgs/top-level/perl-packages.nix | 54 +++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 699007b0970..f99de479a18 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -15,13 +15,21 @@ rec { cpio tcl tk makeWrapper subversion; svnSupport = config "svnSupport" false; # for git-svn support guiSupport = config "guiSupport" false; + sendEmailSupport = config "sendEmailSupport" false; perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; + smtpPerlLibs = [ + perlPackages.NetSMTP perlPackages.NetSMTPSSL + perlPackages.IOSocketSSL perlPackages.NetSSLeay + perlPackages.MIMEBase64 perlPackages.AuthenSASL + perlPackages.DigestHMAC + ]; }; # The full-featured Git. gitFull = git.override { svnSupport = true; guiSupport = true; + sendEmailSupport = true; }; gitGit = import ./git/git-git.nix { diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 00254c9d1ff..8b675307caa 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,9 +1,10 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper -, svnSupport, subversion, perlLibs +, svnSupport, subversion, perlLibs, smtpPerlLibs , guiSupport , pythonSupport ? true +, sendEmailSupport }: let @@ -60,6 +61,18 @@ stdenv.mkDerivation rec { notSupported $out/bin/git-svn "reinstall with config git = { svnSupport = true } set" '') + + (if sendEmailSupport then + ''# wrap git-send-email + gitperllib=$out/lib/perl5/site_perl + for i in ${builtins.toString smtpPerlLibs}; do + gitperllib=$gitperllib:$i/lib/perl5/site_perl + done + wrapProgram "$out/libexec/git-core/git-send-email" \ + --set GITPERLLIB "$gitperllib" '' + else '' # replace git-send-email by notification script + notSupported $out/bin/git-send-email "reinstall with config git = { sendEmailSupport = true } set" + '') + + ''# Install man pages and Info manual make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \ -C Documentation '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 19ee6ac2bef..e4a95bfa67c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -88,6 +88,15 @@ rec { }; }; + AuthenSASL = buildPerlPackage rec { + name = "Authen-SASL-2.1401"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GB/GBARR/${name}.tar.gz"; + sha256 = "1vx97xnqj5jqlh767l04jbqmsiqd5qcbw2jnbd3qh7fhh0slff6d"; + }; + propagatedBuildInputs = [DigestHMAC]; + }; + Autobox = buildPerlPackage rec { name = "autobox-2.55"; src = fetchurl { @@ -1429,6 +1438,16 @@ rec { }; }; + IOSocketSSL = buildPerlPackage { + name = "IO-Socket-SSL-1.33"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-1.33.tar.gz; + sha256 = "1lpp2cs794d989b9gfhssjv1bkcs9lmrkjcpnxsavj7822izs4xj"; + }; + propagatedBuildInputs = [NetSSLeay]; + # TODO: IOSocketINET6 + }; + IOString = buildPerlPackage rec { name = "IO-String-1.08"; src = fetchurl { @@ -1668,6 +1687,14 @@ rec { propagatedBuildInputs = [TimeDate TestPod]; }; + MIMEBase64 = buildPerlPackage rec { + name = "MIME-Base64-3.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + sha256 = "1gi2zyxwkkmyng8jawfnbxpsybvybz6h6ryq0wfdljmmjpjbmzzc"; + }; + }; + MIMETypes = buildPerlPackage rec { name = "MIME-Types-1.27"; src = fetchurl { @@ -1846,6 +1873,33 @@ rec { doCheck = false; # seems to hang waiting for connections }; + NetSMTP = buildPerlPackage { + name = "Net-SMTP-1.22"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GB/GBARR/libnet-1.22.tar.gz; + sha256 = "113c36qilbvd69yhkm2i2ba20ajff7cdpgvlqx96j9bb1hfmhb1p"; + }; + }; + + NetSMTPSSL = buildPerlPackage { + name = "Net-SMTP-SSL-1.01"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CW/CWEST/Net-SMTP-SSL-1.01.tar.gz; + sha256 = "12b2xvrd253ngvzwf81s9han4jr94l39vs5ca70pzr3wpi39qn8k"; + }; + propagatedBuildInputs = [IOSocketSSL]; + }; + + NetSSLeay = buildPerlPackage { + name = "Net-SSLeay-1.36"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FL/FLORA/Net-SSLeay-1.36.tar.gz; + sha256 = "1kjk5kdwsklchxrv21m4ii80akbxrg3i6y4zwfb91an5cdr8jqp2"; + }; + buildInputs = [pkgs.openssl]; + OPENSSL_PREFIX = pkgs.openssl; + }; + NetTwitterLite = buildPerlPackage { name = "Net-Twitter-Lite-0.08003"; From 6edea62ea59581ffdc8e205b2ec22c2ccfebc048 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 17:07:46 +0000 Subject: [PATCH 279/342] make freetype overridable svn path=/nixpkgs/trunk/; revision=21790 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13115100cf5..d8e21863664 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3778,7 +3778,7 @@ let inherit fetchurl stdenv x11 mesa; }; - freetype = import ../development/libraries/freetype { + freetype = makeOverridable (import ../development/libraries/freetype) { inherit fetchurl stdenv; }; From ff03fa451121acc03ac71267b87169c0316498cd Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 18:43:10 +0000 Subject: [PATCH 280/342] Upgrade lvm2 svn path=/nixpkgs/trunk/; revision=21791 --- pkgs/os-specific/linux/lvm2/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 26c2e3c392a..a0346336273 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, udev }: + +let + v = "2.02.64"; +in stdenv.mkDerivation { - name = "lvm2-2.02.56"; + name = "lvm2-${v}"; src = fetchurl { - url = ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.56.tgz; - sha256 = "0hrgca93jnc3k05cgc3rc5klvc03anxmqydgljv6qq59nhnfz5lw"; + url = "ftp://sources.redhat.com/pub/lvm2/LVM2.${v}.tgz"; + sha256 = "130yg8a9l0266hraklalm2k26n25a8kb2nvhj13cnczfxbz5a4m0"; }; configureFlags = "--disable-readline --enable-udev_rules --enable-udev_sync"; + + buildInputs = [ udev ]; # To prevent make install from failing. preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8e21863664..3cd896ffaa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6508,7 +6508,7 @@ let }; lvm2 = import ../os-specific/linux/lvm2 { - inherit fetchurl stdenv; + inherit fetchurl stdenv udev; }; machHeaders = import ../os-specific/gnu/mach { From 64f0f42d4f023896f8c805bfe200f7b792675f97 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 15 May 2010 18:43:24 +0000 Subject: [PATCH 281/342] Upgrade mdadm svn path=/nixpkgs/trunk/; revision=21792 --- pkgs/os-specific/linux/mdadm/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index dd1708e8379..9de10be0553 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,20 +1,23 @@ {stdenv, fetchurl, groff}: -stdenv.mkDerivation { - name = "mdadm-2.6"; +stdenv.mkDerivation rec { + name = "mdadm-3.1.2"; src = fetchurl { - url = http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-2.6.tgz; - md5 = "15019078eacc8c21eac7b0b7faf86129"; + url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; + sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz"; }; buildNativeInputs = [groff]; - preBuild = '' - makeFlags="INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man" - if [ -n "$crossConfig" ]; then - makeFlags="$makeFlags CROSS_COMPILE=$crossConfig-" - fi - ''; + patchPhase = "sed -e 's@/lib/udev@\${out}/lib/udev@' -i Makefile"; + + preBuild = + '' + makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man) + if [[ -n "$crossConfig" ]]; then + makeFlagsArray+=(CROSS_COMPILE=$crossConfig-) + fi + ''; meta = { description = "Programs for managing RAID arrays under Linux"; From 4df5343e78b00b2db1ffb5a6c00e012ed7eb1637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 16 May 2010 16:23:17 +0000 Subject: [PATCH 282/342] Adding x2x. Patch by Oleksandr Kozachuk svn path=/nixpkgs/trunk/; revision=21796 --- pkgs/tools/X11/x2x/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/X11/x2x/default.nix diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix new file mode 100644 index 00000000000..abe5c9b59d6 --- /dev/null +++ b/pkgs/tools/X11/x2x/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, imake, libX11, libXtst, libXext}: + +stdenv.mkDerivation { + name = "x2x-1.27"; + + src = fetchurl { + url = "http://github.com/downloads/dottedmag/x2x/x2x-1.27.tar.gz"; + sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj"; + }; + + buildInputs = [ imake libX11 libXtst libXext ]; + + configurePhase = '' + xmkmf + makeFlags="BINDIR=$out/bin x2x" + ''; + + installPhase = '' + ensureDir $out/bin + ensureDir $out/man/man1 + cp x2x $out/bin/ + cp x2x.1 $out/man/man1/ + ''; + + meta = { + description = "x2x allows the keyboard, mouse on one X display to be used to control another X display."; + homepage = http://x2x.dottedmag.net; + license = "BSD"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cd896ffaa5..45cb314c808 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9660,6 +9660,11 @@ let flex = pkgsi686Linux.flex2535; }; + x2x = import ../tools/X11/x2x { + inherit stdenv fetchurl; + inherit (xlibs) imake libX11 libXtst libXext; + }; + xosd = import ../misc/xosd { inherit fetchurl stdenv; inherit (xlibs) libX11 libXext libXt xextproto xproto; From a286b7c9b2cb66fb036c4d1d2230a59ec26aa372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 16 May 2010 16:23:32 +0000 Subject: [PATCH 283/342] Adding tor 0.2.1.26 (Patch sent by roconnor) svn path=/nixpkgs/trunk/; revision=21797 --- pkgs/tools/security/tor/default.nix | 30 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/security/tor/default.nix diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix new file mode 100644 index 00000000000..136a6efe7a1 --- /dev/null +++ b/pkgs/tools/security/tor/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, libevent, openssl, zlib}: + +stdenv.mkDerivation { + name = "tor-0.2.1.26"; + + src = fetchurl { + url = "http://www.torproject.org/dist/tor-0.2.1.26.tar.gz"; + sha256 = "18kz1hs6lvckkddy4y36gi7ly03ar2il2xzkrf8bfgif1gnn1p3c"; + }; + + buildInputs = [libevent openssl zlib]; + + doCheck = true; + + meta = { + homepage = http://www.torproject.org/; + description = "Tor is an onion router enabling Internet anonymity by thwarting network traffic analysis"; + longDescription='' + Tor protects you by bouncing your communications around a distributed + network of relays run by volunteers all around the world: it prevents + somebody watching your Internet connection from learning what sites you + visit, and it prevents the sites you visit from learning your physical + location. Tor works with many of your existing applications, including + web browsers, instant messaging clients, remote login, and other + applications based on the TCP protocol. + ''; + license="bsd"; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45cb314c808..8f9873d6b27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1695,6 +1695,10 @@ let inherit (xlibs) libX11 libXext; }; + tor = import ../tools/security/tor { + inherit fetchurl stdenv libevent openssl zlib; + }; + ttf2pt1 = import ../tools/misc/ttf2pt1 { inherit fetchurl stdenv perl freetype; }; From c239f0d20ef1dec473d59eb0394b9b9d557e39cf Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 16 May 2010 16:31:04 +0000 Subject: [PATCH 284/342] update to 2.7.0 svn path=/nixpkgs/trunk/; revision=21798 --- .../networking/instant-messengers/pidgin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 3bf2522fd64..4cba9732f11 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -21,10 +21,10 @@ } : stdenv.mkDerivation { - name = "pidgin-2.6.6"; + name = "pidgin-2.7.0"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.6.6.tar.bz2; - sha256 = "1n9aggkzvqk9w8pfy90h1l98yrzb9xf8ak2f4jxzwv94779ykfvf"; + url = mirror://sourceforge/pidgin/pidgin-2.7.0.tar.bz2; + sha256 = "0gbq6n36h9a53rp1x41fakrbncxc27y84pn3a0lcz3nvfnpcnnfw"; }; inherit nss ncurses; From 687376f426856bb63b6c402bf82c0a3a8582a89e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 16 May 2010 16:48:38 +0000 Subject: [PATCH 285/342] * Updated Nix. svn path=/nixpkgs/trunk/; revision=21801 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 7b99a5e480c..6e0f38f69c2 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.16pre21748"; + name = "nix-0.16pre21778"; src = fetchurl { - url = http://hydra.nixos.org/build/405917/download/4/nix-0.16pre21741.tar.bz2; - sha256 = "048a9d0658906a5f344f27a0ba39c0a4d926666cef9f4e93a35f73607dd0e947"; + url = "http://hydra.nixos.org/build/408983/download/4/${name}.tar.bz2"; + sha256 = "54e154776efe05973aaf75b33f6e00987cd147d1cb7a2a132f4386d4b51c6bdc"; }; buildNativeInputs = [ perl ]; From 1b1e5e7d691ec5280c59e4191c0d68899e9b5323 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 16 May 2010 18:59:50 +0000 Subject: [PATCH 286/342] * xpdf updated to 3.02pl4. svn path=/nixpkgs/trunk/; revision=21803 --- pkgs/applications/misc/xpdf/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index b7b644f018a..8e2abada55d 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -8,7 +8,7 @@ assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; stdenv.mkDerivation { - name = "xpdf-3.02pl3"; + name = "xpdf-3.02pl4"; src = fetchurl { url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz; @@ -32,6 +32,10 @@ stdenv.mkDerivation { url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch; sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r"; }) + (fetchurl { + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch; + sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h"; + }) ./xpdf-3.02-protection.patch ]; From e367687e2982637ebc755c114c9ed90fdca1a613 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 16 May 2010 20:25:57 +0000 Subject: [PATCH 287/342] * mdadm: Enable incremental activation of swraid arrays from udev. svn path=/nixpkgs/trunk/; revision=21805 --- pkgs/os-specific/linux/mdadm/default.nix | 15 +++++++++++---- pkgs/os-specific/linux/mdadm/udev.patch | 20 ++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/mdadm/udev.patch diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 9de10be0553..0a80e7c8dd0 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,19 +1,25 @@ -{stdenv, fetchurl, groff}: +{ stdenv, fetchurl, groff }: stdenv.mkDerivation rec { name = "mdadm-3.1.2"; + src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz"; }; - buildNativeInputs = [groff]; + # Enable incremental activation of swraid arrays from udev. + patches = [ ./udev.patch ]; - patchPhase = "sed -e 's@/lib/udev@\${out}/lib/udev@' -i Makefile"; + buildNativeInputs = [ groff ]; + preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -i Makefile"; + + # Force mdadm to use /var/run/mdadm.map for its map file (or + # /dev/.mdadm/map as a fallback). preBuild = '' - makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man) + makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man VAR_RUN=/var/run/mdadm ALT_RUN=/dev/.mdadm) if [[ -n "$crossConfig" ]]; then makeFlagsArray+=(CROSS_COMPILE=$crossConfig-) fi @@ -21,5 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "Programs for managing RAID arrays under Linux"; + homepage = http://neil.brown.name/blog/mdadm; }; } diff --git a/pkgs/os-specific/linux/mdadm/udev.patch b/pkgs/os-specific/linux/mdadm/udev.patch new file mode 100644 index 00000000000..5eb35f0c584 --- /dev/null +++ b/pkgs/os-specific/linux/mdadm/udev.patch @@ -0,0 +1,20 @@ +diff --exclude '*~' -rc mdadm-3.1.2-orig/udev-md-raid.rules mdadm-3.1.2/udev-md-raid.rules +*** mdadm-3.1.2-orig/udev-md-raid.rules 2010-02-22 21:14:58.000000000 +0100 +--- mdadm-3.1.2/udev-md-raid.rules 2010-05-16 20:45:22.000000000 +0200 +*************** +*** 5,11 **** + ACTION=="change", GOTO="md_no_incr" + + # import data from a raid member and activate it +! #ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" + # import data from a raid set + LABEL="md_no_incr" + KERNEL!="md*", GOTO="md_end" +--- 5,11 ---- + ACTION=="change", GOTO="md_no_incr" + + # import data from a raid member and activate it +! ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" + # import data from a raid set + LABEL="md_no_incr" + KERNEL!="md*", GOTO="md_end" From 03d8babdf59c32d38b8c756b8659b23d4b5e23d2 Mon Sep 17 00:00:00 2001 From: Alexander Tsamutali Date: Sun, 16 May 2010 20:32:21 +0000 Subject: [PATCH 288/342] applications/editors/emacs-modes/jabber: New nixbuild. svn path=/nixpkgs/trunk/; revision=21806 --- .../editors/emacs-modes/jabber/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/jabber/default.nix diff --git a/pkgs/applications/editors/emacs-modes/jabber/default.nix b/pkgs/applications/editors/emacs-modes/jabber/default.nix new file mode 100644 index 00000000000..82028722f54 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/jabber/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, emacs }: +stdenv.mkDerivation rec { + pname = "emacs-jabber"; + version = "0.8.0"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "75e3b7853de4783b8ab8270dcbe6a1e4f576224f77f7463116532e11c6498c26"; + }; + buildInputs = [ emacs ]; + meta = { + description = "A Jabber client for Emacs"; + longDescription = '' + jabber.el is a Jabber client for Emacs. It may seem strange to have a + chat client in an editor, but consider that chatting is, after all, just + a special case of text editing. + ''; + homepage = http://emacs-jabber.sourceforge.net/; + license = [ "GPLv2+" ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f9873d6b27..90ed27ca5a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7499,6 +7499,10 @@ let inherit fetchurl stdenv emacs cedet jdee texinfo; }; + jabber = import ../applications/editors/emacs-modes/jabber { + inherit stdenv fetchurl emacs; + }; + emacsSessionManagement = import ../applications/editors/emacs-modes/session-management-for-emacs { inherit fetchurl stdenv emacs; }; From 70302d2d18a2d9d5e4e23f9499a311a6683fa057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 16 May 2010 22:14:02 +0000 Subject: [PATCH 289/342] Adding inputs to privoxy, so it gets more features (zlib, documentation, pcre) svn path=/nixpkgs/trunk/; revision=21809 --- pkgs/tools/networking/privoxy/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 894e11f607b..8af67aed1d4 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, autoconf, automake}: +{stdenv, fetchurl, autoconf, automake, zlib, pcre, w3m}: stdenv.mkDerivation { name = "privoxy-3.0.12"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "16ngim1p4pb4zk8h7js4zjw280fxqxamasfngixikp2ivmzxl469"; }; - buildInputs = [automake autoconf ]; + buildInputs = [automake autoconf zlib pcre w3m]; patches = [./disable-user-error.patch]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90ed27ca5a8..e9ea00f2dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1674,7 +1674,7 @@ let }; privoxy = import ../tools/networking/privoxy { - inherit fetchurl stdenv autoconf automake ; + inherit fetchurl stdenv autoconf automake zlib pcre w3m; }; tcpdump = import ../tools/networking/tcpdump { From fc0279c07e9236ab01ae4095b0878b0146aee36f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 16 May 2010 22:38:00 +0000 Subject: [PATCH 290/342] svn path=/nixpkgs/trunk/; revision=21811 --- pkgs/tools/package-management/nix/sqlite.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index 17cea9bd6f7..5ea3a934bab 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "nix-0.15pre21760"; + name = "nix-0.16pre21802"; src = fetchurl { - url = "http://hydra.nixos.org/build/406130/download/4/${name}.tar.bz2"; - sha256 = "b382540807400a9aeacdcd9c1618ead1cb6b61e922f64d1e7c29f63c0b678b02"; + url = "http://hydra.nixos.org/build/410078/download/4/${name}.tar.bz2"; + sha256 = "dec142f401fd0aab771eebcddf8354edc57d9a05f63f07f0e74dd7c499df8cf8"; }; buildInputs = [ perl curl openssl ]; From 0dc24d9f049ad3baf652047c624acc7811308bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 17 May 2010 06:47:52 +0000 Subject: [PATCH 291/342] Disabling tests on two perl packages, whose tests related to network failed on chroot builds. That should allow hydra to build git. (Thanks to David Brown) svn path=/nixpkgs/trunk/; revision=21812 --- pkgs/top-level/perl-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e4a95bfa67c..aa465e542c6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1879,6 +1879,8 @@ rec { url = mirror://cpan/authors/id/G/GB/GBARR/libnet-1.22.tar.gz; sha256 = "113c36qilbvd69yhkm2i2ba20ajff7cdpgvlqx96j9bb1hfmhb1p"; }; + # Test perform network access + doCheck = false; }; NetSMTPSSL = buildPerlPackage { @@ -1898,6 +1900,8 @@ rec { }; buildInputs = [pkgs.openssl]; OPENSSL_PREFIX = pkgs.openssl; + # Test perform network access + doCheck = false; }; NetTwitterLite = buildPerlPackage { From 71f164ac1e5d4baa69fbd770da2e813e0f387ffb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 May 2010 09:21:42 +0000 Subject: [PATCH 292/342] Three Games and Perl Support for Irssi Here are four patches. Three of them add expressions for games. The fourth, irssi-perl.patch, adds perl as an input for irssi, so that one can run perl plugins in irssi. I didn't make the perl input optional, but maybe it should be to keep the irssi expression light. svn path=/nixpkgs/trunk/; revision=21813 --- .../networking/irc/irssi/default.nix | 4 +- pkgs/games/gnugo/default.nix | 24 ++++++++++++ pkgs/games/six/default.nix | 34 +++++++++++++++++ pkgs/games/six/gcc43-includes.patch | 38 +++++++++++++++++++ pkgs/games/super-tux/default.nix | 28 ++++++++++++++ pkgs/games/super-tux/g++4.patch | 13 +++++++ pkgs/top-level/all-packages.nix | 17 ++++++++- 7 files changed, 155 insertions(+), 3 deletions(-) create mode 100644 pkgs/games/gnugo/default.nix create mode 100644 pkgs/games/six/default.nix create mode 100644 pkgs/games/six/gcc43-includes.patch create mode 100644 pkgs/games/super-tux/default.nix create mode 100644 pkgs/games/super-tux/g++4.patch diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 7e3b27cec1f..963108aa07f 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, ncurses, glib, openssl}: +{stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl}: stdenv.mkDerivation rec { name = "irssi-0.8.15"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19m0aah9bhc70dnhh7kpydbsz5n35l0l9knxav1df0sic3xicbf1"; }; - buildInputs = [pkgconfig ncurses glib openssl]; + buildInputs = [pkgconfig ncurses glib openssl perl]; NIX_LDFLAGS = "-lncurses"; diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix new file mode 100644 index 00000000000..21c4195b28b --- /dev/null +++ b/pkgs/games/gnugo/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +let + + versionNumber = "3.8"; + +in + +stdenv.mkDerivation { + + name = "gnugo-${versionNumber}"; + + src = fetchurl { + url = "mirror://gnu/gnugo/gnugo-${versionNumber}.tar.gz"; + sha256 = "0wkahvqpzq6lzl5r49a4sd4p52frdmphnqsfdv7gdp24bykdfs6s"; + }; + + meta = { + description = "GNU Go - A computer go player"; + homepage = "http://http://www.gnu.org/software/gnugo/"; + license = "GPLv3"; + }; + +} diff --git a/pkgs/games/six/default.nix b/pkgs/games/six/default.nix new file mode 100644 index 00000000000..2f11eab3cea --- /dev/null +++ b/pkgs/games/six/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, arts, kdelibs, libX11, libXext, libXt, perl, qt3, zlib }: + +let + + versionNumber = "0.5.3"; + +in + +stdenv.mkDerivation { + + name = "six-${versionNumber}"; + + src = fetchurl { + url = "http://six.retes.hu/download/six-${versionNumber}.tar.gz"; + sha256 = "0hialm0kxr11rp5z452whjmxp2vaqqj668d0dfs32fd10ggi8wj4"; + }; + + meta = { + description = "Six - A Hex playing program for KDE"; + homepage = http://six.retes.hu/; + license = "GPLv2"; + }; + + buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ]; + + # Supress some warnings which are less useful to us when making packages. + NIX_CFLAGS_COMPILE = "-Wno-conversion -Wno-parentheses"; + + # Without "--x-libraries=", we get the error + # "impure path `/usr/lib' used in link". + configureFlags = "--x-libraries="; + + patches = [ ./gcc43-includes.patch ]; +} diff --git a/pkgs/games/six/gcc43-includes.patch b/pkgs/games/six/gcc43-includes.patch new file mode 100644 index 00000000000..83096bb0da2 --- /dev/null +++ b/pkgs/games/six/gcc43-includes.patch @@ -0,0 +1,38 @@ +This patch makes six compile with gcc 4.3 by including more header files. It +is based on the advice at . + +--- a/six/carrier.h ++++ b/six/carrier.h +@@ -2,6 +2,7 @@ + #ifndef CARRIER_H + #define CARRIER_H + ++#include + #include + #include + +diff --git a/six/hexgame.cpp b/six/hexgame.cpp +index 720e977..5d0dafe 100644 +--- a/six/hexgame.cpp ++++ b/six/hexgame.cpp +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + + #include + +diff --git a/six/main.cpp b/six/main.cpp +index 7fb5c21..b925a0c 100644 +--- a/six/main.cpp ++++ b/six/main.cpp +@@ -4,6 +4,8 @@ + #include "carrier.h" + #include "misc.h" + ++#include ++ + #include + #include + #include diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix new file mode 100644 index 00000000000..60e9cc537bf --- /dev/null +++ b/pkgs/games/super-tux/default.nix @@ -0,0 +1,28 @@ +{ fetchurl, stdenv, SDL, SDL_image, SDL_mixer, curl, gettext, libogg, libvorbis, mesa, openal }: + +let + + version = "0.1.3"; + +in + +stdenv.mkDerivation { + name = "supertux-${version}"; + + src = fetchurl { + url = "http://download.berlios.de/supertux/supertux-${version}.tar.bz2"; + sha256 = "15xdq99jy4hayr96jpqcp15rbr9cs5iamjirafajcrkpa61mi4h0"; + }; + + buildInputs = [ SDL SDL_image SDL_mixer curl gettext libogg libvorbis mesa openal ]; + + patches = [ ./g++4.patch ]; + + meta = { + description = "SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original Super Mario games covered under the GPL."; + + homepage = http://supertux.lethargik.org/index.html; + + license = "GPLv2"; + }; +} diff --git a/pkgs/games/super-tux/g++4.patch b/pkgs/games/super-tux/g++4.patch new file mode 100644 index 00000000000..a7378c80a29 --- /dev/null +++ b/pkgs/games/super-tux/g++4.patch @@ -0,0 +1,13 @@ +diff --git a/src/menu.h b/src/menu.h +index 3c67c45..7c7ab8e 100644 +--- a/src/menu.h ++++ b/src/menu.h +@@ -207,7 +207,7 @@ public: + + bool isToggled(int id); + +- void Menu::get_controlfield_key_into_input(MenuItem *item); ++ void get_controlfield_key_into_input(MenuItem *item); + + void draw (); + void draw_item(int index, int menu_width, int menu_height); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9ea00f2dc2..abd3a907118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7963,7 +7963,7 @@ let }; irssi = import ../applications/networking/irc/irssi { - inherit stdenv fetchurl pkgconfig ncurses openssl glib; + inherit stdenv fetchurl pkgconfig ncurses openssl glib perl; }; jackmeter = import ../applications/audio/jackmeter { @@ -8944,6 +8944,10 @@ let flex = flex2535; }; + gnugo = import ../games/gnugo { + inherit stdenv fetchurl; + }; + gparted = import ../tools/misc/gparted { inherit fetchurl stdenv parted intltool gettext libuuid pkgconfig libxml2; inherit (gtkLibs) gtk glib gtkmm; @@ -9015,6 +9019,13 @@ let inherit (xlibs) libX11; }; + six = import ../games/six { + inherit stdenv fetchurl; + inherit perl zlib qt3; + inherit (kde3) arts kdelibs; + inherit (xlibs) libX11 libXt libXext; + }; + # You still can override by passing more arguments. spaceOrbit = composedArgsAndFun (import ../games/orbit/1.01.nix) { inherit fetchurl stdenv builderDefs mesa freeglut; @@ -9022,6 +9033,10 @@ let inherit (xlibs) libXt libX11 libXmu libXi libXext; }; + superTux = import ../games/super-tux { + inherit fetchurl stdenv SDL SDL_image SDL_mixer curl gettext libogg libvorbis mesa openal; + }; + superTuxKart = import ../games/super-tux-kart { inherit fetchurl stdenv plib SDL openal freealut mesa libvorbis libogg gettext; From 38c35ba49bcc9d0fc8df7190a0feb6a10459cdeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 17 May 2010 09:31:43 +0000 Subject: [PATCH 293/342] GNU Inetutils 1.8. svn path=/nixpkgs/trunk/; revision=21814 --- pkgs/tools/networking/inetutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 2b164dcc223..6734465dbba 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "inetutils-1.7"; + name = "inetutils-1.8"; src = fetchurl { url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "09v9nycqpc3j7bsi5aj4hm8gxw1xgxr4lz14brnzv0i80qqxjb7p"; + sha256 = "1iqihfv54nzjmclivys2dpcyfhavgynj8pp6r44a97jbw2p0nl68"; }; buildInputs = [ ncurses /* for `talk' */ ]; From aebfa8548fcf7c132abdfc58e2efbef247c04b0f Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Mon, 17 May 2010 13:35:38 +0000 Subject: [PATCH 294/342] Revert "update wmii. libixp vanished" The new wmii has some wired behaviour: - When you move windows the curser location changes. Until the window manager has changed that location movement of mouse is ignored. - window do not always popup in the col which was focused. - wmiimenu broke old wmii does not build with newer libixp Until I know how to fix those issues I'll revert my update This reverts -r 21683 svn path=/nixpkgs/trunk/; revision=21816 --- pkgs/applications/window-managers/wmii/default.nix | 10 ++++------ pkgs/development/libraries/libixp_for_wmii/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 5 ++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index b417639db9d..3df24cf3360 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -1,14 +1,12 @@ args: with args; stdenv.mkDerivation { - name = "wmii-3.9b1"; + name = "wmii-20071116"; src = fetchurl { - url = http://dl.suckless.org/wmii/wmii+ixp-3.9b1.tbz; - name = "wmii+ixp-3.9b1.tar.bz2"; # srcUnpack does not know about tbz - sha256 = "0i04mf5cl4m6mn5kcy913mmrnd2ir0ardmskswchnr6fxpbcyvml"; + url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; + sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216"; }; - buildInputs = [ libX11 libixp xextproto libXt libXext libXft - freetype libXrandr libXinerama pkgconfig]; + buildInputs = [ libX11 libixp xextproto libXt libXext ]; inherit libixp; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index fe953e263e3..a322c087d89 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -7,15 +7,15 @@ stdenv.mkDerivation { sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk + config.mk make mkdir -p \$out/include cp -r include/*.h \$out/include cp -r lib \$out "; src = fetchurl { - url = http://dl.suckless.org/libs/libixp-0.5.tar.gz; - sha256 = "0jqyw8xzih7x7apdp2s9w8agjry890kf55zj2habsg78cyxz1x35"; + url = http://dl.suckless.org/libs/libixp-0.4.tar.gz; + sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd3a907118..7f0e394de6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8660,9 +8660,8 @@ let wmiiSnap = import ../applications/window-managers/wmii { libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk - freetype pkgconfig; - inherit (xlibs) libX11 xextproto libXt libXext libXft libXrandr libXinerama; + inherit fetchurl /* fetchhg */ stdenv gawk; + inherit (xlibs) libX11 xextproto libXt libXext; includeUnpack = getConfig ["stdenv" "includeUnpack"] false; }; From 93f0bf658e5fec7726e38c43a5218f5a5033c74b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 17 May 2010 15:52:56 +0000 Subject: [PATCH 295/342] irssi: enable perl support svn path=/nixpkgs/trunk/; revision=21819 --- pkgs/applications/networking/irc/irssi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 963108aa07f..86d800e0cfe 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lncurses"; - configureFlags = "--with-proxy --with-ncurses --enable-ssl"; + configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes"; meta = { homepage = http://irssi.org; From cbc19490b9adf90ebe4c962982e52d45fe05bcd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 May 2010 16:16:39 +0000 Subject: [PATCH 296/342] Add Xfce Terminal emulator. Adds the terminal emulator, and the libraries that it depends upon. svn path=/nixpkgs/trunk/; revision=21820 --- .../xfce-4/applications/terminal/default.nix | 24 ++++++++++++++++ pkgs/desktops/xfce-4/core/libexo/default.nix | 23 +++++++++++++++ .../xfce-4/core/libxfce4util/default.nix | 20 +++++++++++++ pkgs/desktops/xfce-4/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 5 files changed, 98 insertions(+) create mode 100644 pkgs/desktops/xfce-4/applications/terminal/default.nix create mode 100644 pkgs/desktops/xfce-4/core/libexo/default.nix create mode 100644 pkgs/desktops/xfce-4/core/libxfce4util/default.nix create mode 100644 pkgs/desktops/xfce-4/default.nix diff --git a/pkgs/desktops/xfce-4/applications/terminal/default.nix b/pkgs/desktops/xfce-4/applications/terminal/default.nix new file mode 100644 index 00000000000..8a05d999fc1 --- /dev/null +++ b/pkgs/desktops/xfce-4/applications/terminal/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl +, pkgconfig, ncurses +, intltool, vte +, libexo, libxfce4util +, gtk +}: + +stdenv.mkDerivation { + name = "xfce-terminal-0.4.4"; + src = fetchurl { + url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.4.tar.bz2; + sha256 = "1cmkrzgi2j5dgb1jigdqigf7fa84hh9l2bclgxzn17168cwpd1lw"; + }; + + buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ]; + + CPPFLAGS = "-I${libexo}/include/exo-0.3 -I{libxfce4util}/include/xfce4"; + + meta = { + homepage = http://www.xfce.org/projects/terminal; + description = "A modern terminal emulator primarily for the Xfce desktop environment"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce-4/core/libexo/default.nix b/pkgs/desktops/xfce-4/core/libexo/default.nix new file mode 100644 index 00000000000..837bf5b8ad0 --- /dev/null +++ b/pkgs/desktops/xfce-4/core/libexo/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl +, pkgconfig +, intltool +, URI +, glib, gtk +, libxfce4util +}: + +stdenv.mkDerivation { + name = "libexo-0.3.106"; + src = fetchurl { + url = http://archive.xfce.org/src/xfce/exo/0.3/exo-0.3.106.tar.bz2; + sha256 = "1n823ipqdz47kxq6fwry3zza3j9ap7gikwm4s8169297xcjqd6qb"; + }; + + buildInputs = [ pkgconfig intltool URI glib gtk libxfce4util ]; + + meta = { + homepage = http://www.xfce.org/projects/exo; + description = "Application library for the Xfce desktop environment"; + license = "GPLv2+"; + }; +} diff --git a/pkgs/desktops/xfce-4/core/libxfce4util/default.nix b/pkgs/desktops/xfce-4/core/libxfce4util/default.nix new file mode 100644 index 00000000000..f47cb44c23d --- /dev/null +++ b/pkgs/desktops/xfce-4/core/libxfce4util/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl +, pkgconfig +, glib +}: + +stdenv.mkDerivation { + name = "libxfce4util-4.6.1"; + src = fetchurl { + url = http://www.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2; + sha256 = "0sy1222s0cq8zy2ankrp1747b6fg5jjahxrddih4gxc97iyxrv6f"; + }; + + buildInputs = [ pkgconfig glib ]; + + meta = { + homepage = http://www.xfce.org/; + description = "Basic utility non-GUI functions for Xfce"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/xfce-4/default.nix b/pkgs/desktops/xfce-4/default.nix new file mode 100644 index 00000000000..76aa608677c --- /dev/null +++ b/pkgs/desktops/xfce-4/default.nix @@ -0,0 +1,28 @@ +pkgs: +rec { + inherit (pkgs.gtkLibs) gtk; + + #### CORE + + libexo = import ./core/libexo { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.gnome) intltool; + inherit (pkgs.perlPackages) URI; + inherit (pkgs.gtkLibs) glib gtk; + inherit libxfce4util; + }; + + libxfce4util = import ./core/libxfce4util { + inherit (pkgs) stdenv fetchurl pkgconfig; + inherit (pkgs.gtkLibs) glib; + }; + + #### APPLICATIONS + terminal = import ./applications/terminal { + inherit (pkgs) stdenv fetchurl pkgconfig ncurses; + inherit (pkgs.gnome) intltool vte; + inherit (pkgs.gtkLibs) gtk; + inherit libexo libxfce4util; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f0e394de6d..a502df544b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9193,6 +9193,9 @@ let stdenv = stdenv2; }); + xfce = xfce4; + xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs); + ### SCIENCE xplanet = import ../applications/science/xplanet { From c29e6c97f1b7a278e15e7868d712065eead4232d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 May 2010 16:16:48 +0000 Subject: [PATCH 297/342] Only set font in wrapper if we have X. Unison's wrapper was generating errors by calling xset even if DISPLAY was not set. This was especially noticeable when connecting to a remote server to sync with. Fix this by only setting the font path if DISPLAY is set to something. svn path=/nixpkgs/trunk/; revision=21821 --- pkgs/applications/networking/sync/unison/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index ff4ab601251..7738ce43f99 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { postInstall = '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --run "${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\"" + --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" done ''; From fc1344e4c957bda8cd1751ede971dd678e415155 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Mon, 17 May 2010 20:22:04 +0000 Subject: [PATCH 298/342] update to 0.6 svn path=/nixpkgs/trunk/; revision=21822 --- pkgs/tools/archivers/unshield/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index 95a66ed7e2d..bc7906e2243 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib}: stdenv.mkDerivation { - name = "unshield-0.5.1"; + name = "unshield-0.6"; src = fetchurl { - url = mirror://sourceforge/synce/unshield-0.5.1.tar.gz; - sha256 = "0zc6kllw54m925zyh33jwjhk9c7rwcrkyydvhdsixr72fdqacjx3"; + url = mirror://sourceforge/synce/Unshield/0.6/unshield-0.6.tar.gz; + sha256 = "07q48zwvjz9f8barql4b894fzz897agscvj13i6gkpy862aya41b"; }; configureFlags = "--with-zlib=${zlib}"; } From bc720e106114d1363828d66162924faf7ee84da8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 18 May 2010 06:35:43 +0000 Subject: [PATCH 299/342] Update ikiwiki - previous tarball is unaccessible svn path=/nixpkgs/trunk/; revision=21823 --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 6e4617eb9f7..7df11653b04 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -8,14 +8,14 @@ let name = "ikiwiki"; - version = "3.20100427"; + version = "3.20100515"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "b00567628657c52ed5a5388e47af370b0f2cdfa82d3eaf1b0020f0e07d218b8f"; + sha256 = "143f245196d98ab037a097402420208da14506d6a65793d042daef5dd765ddd7"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate From 29c68e446883a4d60045183b2f0aec769e0eddbd Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 18 May 2010 08:22:35 +0000 Subject: [PATCH 300/342] fix check of tarball svn path=/nixpkgs/trunk/; revision=21826 --- 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 5f5938d25ca..2e2489bd5c8 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -43,7 +43,7 @@ releaseTools.makeSourceTarball { checkPhase = '' # Run the regression tests in `lib'. res="$(nix-instantiate --eval-only --strict pkgs/lib/tests.nix)" - if test "$res" != "List([])"; then + if test "$res" != "[]"; then echo "regression tests for lib failed, got: $res" exit 1 fi From 6ab35280512be3ba300045fa6313e56f2a7273ba Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 18 May 2010 08:39:31 +0000 Subject: [PATCH 301/342] typo svn path=/nixpkgs/trunk/; revision=21827 --- 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 2e2489bd5c8..93a833c994f 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -43,7 +43,7 @@ releaseTools.makeSourceTarball { checkPhase = '' # Run the regression tests in `lib'. res="$(nix-instantiate --eval-only --strict pkgs/lib/tests.nix)" - if test "$res" != "[]"; then + if test "$res" != "[ ]"; then echo "regression tests for lib failed, got: $res" exit 1 fi From 5f9542583fea328d770e93e9750622608b0f37fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 May 2010 08:48:43 +0000 Subject: [PATCH 302/342] * MPlayer updated (from David Brown). svn path=/nixpkgs/trunk/; revision=21829 --- pkgs/applications/video/MPlayer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix index c93959f93d0..7ce8f0ed789 100644 --- a/pkgs/applications/video/MPlayer/default.nix +++ b/pkgs/applications/video/MPlayer/default.nix @@ -45,11 +45,11 @@ let in stdenv.mkDerivation { - name = "MPlayer-1.0-pre-rc4-20100213"; + name = "MPlayer-1.0-pre-rc4-20100506"; src = fetchurl { - url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100213.tbz2; - sha256 = "1c5w49vqavs9pnc5av89v502wfa5g7hfn65ffhpx25ddi1irzh2r"; + url = mirror://gentoo/distfiles/mplayer-1.0_rc4_p20100506.tar.bz2; + sha256 = "0rhs0mv216iir8cz13xdq0rs88lc48ciiyn0wqzxjrnjb17yajy6"; }; buildInputs = From 0563e08996dc50611cc3fcaf0ab6cad60ced2e46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 May 2010 12:07:48 +0000 Subject: [PATCH 303/342] pkgs/development/libraries/pango/1.26.x.nix: enable hydra builds on all platforms, not just Linux svn path=/nixpkgs/trunk/; revision=21835 --- pkgs/development/libraries/pango/1.26.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pango/1.26.x.nix b/pkgs/development/libraries/pango/1.26.x.nix index 423f4c8c702..fb24cb544b0 100644 --- a/pkgs/development/libraries/pango/1.26.x.nix +++ b/pkgs/development/libraries/pango/1.26.x.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; }; } From a07cdd3b23332a2a23c929fbfe9599ac191be0f1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 18 May 2010 12:36:23 +0000 Subject: [PATCH 304/342] * added patchelf pre-release 0.6 until it gets stable * updated chrome to latest version svn path=/nixpkgs/trunk/; revision=21836 --- .../networking/browsers/chromium/default.nix | 15 +++++++++------ pkgs/development/tools/misc/patchelf/0.6.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 7 ++++++- 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/tools/misc/patchelf/0.6.nix diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index ab112337daf..addeb0dcf11 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -24,23 +24,26 @@ , libjpeg , bzip2 , libpng +, dbus +, dbus_glib +, patchelf }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ; stdenv.mkDerivation rec { name = "chrome-${version}"; - version = "35449"; + version = "47504"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux-64/${version}/chrome-linux.zip"; - sha256 = "0fdm1hs67vcr68r290ami3zlyypcvd88rm059622qyadqz49yvcj"; + sha256 = "06cwfr02acv9b0sbc14irqx099p4mgyjl9w58g1vja6r7jbb234c"; } else if stdenv.system == "i686-linux" then fetchurl { url = "http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/${version}/chrome-linux.zip"; - sha256 = "1indm0s87yz9zsg4archsywvp4yd0ff83azkjbwszj0snggk16pg"; + sha256 = "1g9m2d5x415gybjd6kvnhbj2sbfcaszv3dzvdwncsrcviic6w634"; } else null; @@ -50,7 +53,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath - [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver] ; + [ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt expat zlib libjpeg bzip2 libpng libXScrnSaver dbus dbus_glib] ; installPhase = '' ensureDir $out/bin @@ -59,8 +62,8 @@ stdenv.mkDerivation rec { cp -R * $out/chrome ln -s $out/chrome/chrome $out/bin/chrome - - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/chrome/chrome + ln -s ${nss}/lib/libsmime3.so $out/lib/libsmime3.so.1d ln -s ${nss}/lib/libnssutil3.so $out/lib/libnssutil3.so.1d diff --git a/pkgs/development/tools/misc/patchelf/0.6.nix b/pkgs/development/tools/misc/patchelf/0.6.nix new file mode 100644 index 00000000000..ab531bb4c91 --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/0.6.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "patchelf-0.6pre20950"; + + src = fetchurl { + url = "http://hydra.nixos.org/build/379622/download/3/patchelf-0.6pre20950.tar.gz"; + sha256 = "d308c26f304e5102846a747296f9b89a8237fa8cc3685316901db1f72e66f43c"; + }; + + meta = { + homepage = http://nixos.org/patchelf.html; + license = "GPL"; + description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a502df544b7..8d557aea45d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3292,6 +3292,10 @@ let inherit fetchurl stdenv; }); + patchelf06 = import ../development/tools/misc/patchelf/0.6.nix { + inherit fetchurl stdenv; + }; + pmccabe = import ../development/tools/misc/pmccabe { inherit fetchurl stdenv; }; @@ -7257,10 +7261,11 @@ let }; chrome = import ../applications/networking/browsers/chromium { - inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng; + inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip expat zlib bzip2 libpng dbus dbus_glib; inherit (xlibs) libX11 libXext libXrender libXt libXScrnSaver; inherit (gtkLibs) gtk glib pango atk; inherit (gnome) GConf; + patchelf = patchelf06; libjpeg = libjpeg62; }; From 5f36663eccae65c1694591223e5eedeaa72101ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 May 2010 13:35:06 +0000 Subject: [PATCH 305/342] pkgs/top-level/perl-packages.nix: updated Digest-SHA1 to version 2.12 svn path=/nixpkgs/trunk/; revision=21837 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index aa465e542c6..421684be43b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -997,10 +997,10 @@ rec { }; DigestSHA1 = buildPerlPackage { - name = "Digest-SHA1-2.11"; + name = "Digest-SHA1-2.12"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.11.tar.gz; - md5 = "2449bfe21d6589c96eebf94dae24df6b"; + url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.12.tar.gz; + sha256 = "19gmbb3yb9pr0y02c6rf99zh14a7a67l4frl7cs0lzpxb41484xa"; }; }; From 1295493b1807a3804c8418f58241b6cc23767156 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 May 2010 13:40:19 +0000 Subject: [PATCH 306/342] pkgs/applications/science/logic/coq: install coqide libraries Patch courtesy of Russell O'Connor. svn path=/nixpkgs/trunk/; revision=21838 --- pkgs/applications/science/logic/coq/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 19827022072..acf88848f05 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -1,6 +1,5 @@ # TODO: # - coqide compilation should be optional or (better) separate; -# - coqide libraries are not installed; {stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}: @@ -52,6 +51,10 @@ stdenv.mkDerivation { "\"-I\"; \"${lablgtk}/lib/ocaml/lablgtk2\"; \"-I\"; \"${lablgtk}/lib/ocaml/stublibs\"" ''; + postInstall = '' + cp ide/*.cmi ide/ide.*a $out/lib/coq/ide/ + ''; + meta = { description = "Coq proof assistant"; longDescription = '' From 1fc724cc5cf1a13978de18685e30323c0d4165f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 May 2010 14:41:18 +0000 Subject: [PATCH 307/342] pkgs/applications/version-management/git-and-tools/git: build git on all platforms, not just Linux svn path=/nixpkgs/trunk/; revision=21839 --- .../version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8b675307caa..9f7149d6663 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -132,6 +132,6 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.all; }; } From cfd6e0f21be8c95f89b64e826cd60b152fc42043 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 May 2010 14:58:45 +0000 Subject: [PATCH 308/342] * The desktop item should be named "Firefox", not "firefox". svn path=/nixpkgs/trunk/; revision=21840 --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f9778146d15..24e1e827363 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,4 +1,8 @@ -{stdenv, browser, browserName ? "firefox", nameSuffix ? "", makeDesktopItem, makeWrapper, plugins}: +{ stdenv, browser, makeDesktopItem, makeWrapper, plugins +, browserName ? "firefox" +, desktopName ? "Firefox" +, nameSuffix ? "" +}: stdenv.mkDerivation { name = browser.name + "-with-plugins"; @@ -8,7 +12,7 @@ stdenv.mkDerivation { exec = browserName; icon = "${browser}/lib/${browser.name}/icons/mozicon128.png"; comment = ""; - desktopName = browserName; + desktopName = desktopName; genericName = "Web Browser"; categories = "Application;Network;"; }; From c270663fec4fc43bc56a3b106944d7f3ca32df8d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 18 May 2010 16:40:17 +0000 Subject: [PATCH 309/342] Move polkit-1 libexec files into libexec/polkit-1/ svn path=/nixpkgs/trunk/; revision=21842 --- pkgs/development/libraries/polkit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 81d35a65550..0e4b6cab650 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -6,7 +6,7 @@ let foolVars = { LOCALSTATE = "/var"; SYSCONF = "/etc"; - LIBEXEC = "${system}/libexec"; + LIBEXEC = "${system}/libexec/polkit-1"; LIB = "${system}/lib"; DATA = "${system}/share"; }; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext gobjectIntrospection ]; + preConfigure='' + configureFlags="--libexecdir=$out/libexec/polkit-1" + ''; + # Ugly hack to overwrite hardcoded directories # TODO: investigate a proper patch which will be accepted upstream CFLAGS = stdenv.lib.concatStringsSep " " From 8523c93081837a7f24b32783d854625e1bd39534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 18 May 2010 16:40:40 +0000 Subject: [PATCH 310/342] Fixing the build of consolekit (it wants libgcc_s) svn path=/nixpkgs/trunk/; revision=21843 --- pkgs/development/libraries/consolekit/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix index 06b48b37580..d6ea4a9e79b 100644 --- a/pkgs/development/libraries/consolekit/default.nix +++ b/pkgs/development/libraries/consolekit/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ]; + # For console-kit to get the rpath to libgcc_s, needed for pthread_cancel to work + NIX_LDFLAGS = "-lgcc_s"; + configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc"; installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy From 202e36f856174efef2cae2e2e021ce794cee33b7 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 18 May 2010 19:10:28 +0000 Subject: [PATCH 311/342] Update VirtualBox + guest additions to version 3.1.8 svn path=/nixpkgs/trunk/; revision=21846 --- pkgs/applications/virtualization/virtualbox/default.nix | 6 +++--- .../virtualization/virtualbox/guest-additions/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 39ed68ce9f7..d1b4838491d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation { - name = "virtualbox-3.1.6-${kernel.version}"; + name = "virtualbox-3.1.8-${kernel.version}"; src = fetchurl { - url = http://download.virtualbox.org/virtualbox/3.1.6/VirtualBox-3.1.6-OSE.tar.bz2; - sha256 = "05m0gsihvg0fs73a9bcivvlqkwrxvzfnyn2l59nixvy8g7w4h0c4"; + url = http://download.virtualbox.org/virtualbox/3.1.8/VirtualBox-3.1.8-OSE.tar.bz2; + sha256 = "118y12k9kv8nfhgnzn3z4d8v75jz6nvy7y1il84cj09lnkkqlz5p"; }; buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 0c0ccc442de..1618e36d930 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -2,10 +2,10 @@ , libX11, libXt, libXext, libXmu, libXcomposite, libXfixes}: stdenv.mkDerivation { - name = "VirtualBox-GuestAdditions-3.1.6"; + name = "VirtualBox-GuestAdditions-3.1.8"; src = fetchurl { - url = http://download.virtualbox.org/virtualbox/3.1.6/VBoxGuestAdditions_3.1.6.iso; - sha256 = "07vylsjs960yqgz2cn57sdhrhs0i3mkb286vnl7p86i7dfl0r08s"; + url = http://download.virtualbox.org/virtualbox/3.1.8/VBoxGuestAdditions_3.1.8.iso; + sha256 = "11fn49zxmd7nxmqn9pcakmzj6j9f8kfb38czpl8fhbnl2k4ggj5q"; }; KERN_DIR = "${kernel}/lib/modules/*/build"; buildInputs = [ patchelf cdrkit ]; From 6361b3a682c7fcfd2620eb24976d889a786387ad Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Tue, 18 May 2010 19:36:55 +0000 Subject: [PATCH 312/342] adding ati-drivers There is still much to be done, see http://thread.gmane.org/gmane.linux.distributions.nixos/4145 svn path=/nixpkgs/trunk/; revision=21848 --- pkgs/os-specific/linux/ati-drivers/builder.sh | 175 ++++++++++++++++++ .../os-specific/linux/ati-drivers/default.nix | 61 ++++++ pkgs/top-level/all-packages.nix | 6 + 3 files changed, 242 insertions(+) create mode 100644 pkgs/os-specific/linux/ati-drivers/builder.sh create mode 100644 pkgs/os-specific/linux/ati-drivers/default.nix diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh new file mode 100644 index 00000000000..f830e1e066f --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -0,0 +1,175 @@ +# What is LIBGL_DRIVERS_PATH used for? +# TODO gentoo removes some tools because there are xorg sources (?) + +source $stdenv/setup + +die(){ echo $@; exit 1; } + + +# custom unpack: +cp $src archive +sh archive --extract . + + +kernelVersion=$(cd ${kernel}/lib/modules && ls) +kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/build) + + +# note: maybe the .config file should be used to determine this ? +# current kbuild infrastructure allows using CONFIG_* defines +# but ati sources don't use them yet.. +# copy paste from make.sh +setSMP(){ + + linuxincludes=$kernelBuild/include + + # copied and stripped. source: make.sh: + + # 3 + # linux/autoconf.h may contain this: #define CONFIG_SMP 1 + + src_file=$linuxincludes/linux/autoconf.h + [ -e $src_file ] || die "$src_file not found" + + if [ `cat $src_file | grep "#undef" | grep "CONFIG_SMP" -c` = 0 ]; then + SMP=`cat $src_file | grep CONFIG_SMP | cut -d' ' -f3` + echo "file $src_file says: SMP=$SMP" + fi + + if [ "$SMP" = 0 ]; then + echo "assuming default: SMP=$SMP" + fi + + # act on final result + if [ ! "$SMP" = 0 ]; then + smp="-SMP" + def_smp=-D__SMP__ + fi + +} + +setModVersions(){ + ! grep CONFIG_MODVERSIONS=y $kernel/config || + def_modversions="-DMODVERSIONS" + # make.sh contains much more code to determine this whether its enabled +} + + +# make.sh contains some code figuring out whether to use these or not.. +PAGE_ATTR_FIX=0 +setSMP +setModVersions +CC=gcc +MODULE=fglrx +case "$system" in + x86_64-linux) + arch=x86_64 + lib_arch=lib64 + ;; + i686-linux) + arch=x86 + lib_arch=lib + ;; + *) exit 1;; +esac +LIBIP_PREFIX=$TMP/arch/$arch/lib/modules/fglrx/build_mod +[ -d $LIBIP_PREFIX ] +GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" + +{ # build .ko module + cd ./common/lib/modules/fglrx/build_mod/2.6.x + echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd + echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd + + make CC=${CC} \ + LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" | sed -e 's|^\([^/]\)|../\1|') \ + MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX $def_smp $def_modversions" \ + KVER=$kernelVersion \ + KDIR=$kernelBuild \ + PAGE_ATTR_FIX=$PAGE_ATTR_FIX \ + -j4 + + cd $TMP +} + +{ # install + + ensureDir $out/lib/xorg + + cp -r common/usr/include $out + cp -r common/usr/sbin $out + cp -r common/usr/share $out + cp -r common/usr/X11R6 $out + + cp -r arch/$arch/lib $out/lib + + # what are those files used for? + cp -r common/etc $out + + DIR_DEPENDING_ON_XORG_VERSION=x750_64a + cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg + + t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc + ensureDir $t + + cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t + + # should this be installed at all? + # its used by the example fglrx_gamma only + # don't use $out/lib/modules/dri because this will cause the kernel module + # aggregator code to see both: kernel version and the dri direcotry. It'll + # fail saying different kernel versions + cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri $out/lib + cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib + cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so.* $out/lib + cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib + + # cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib + ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1 + ln -s libGL.so.1.2 $out/lib/libGL.so.1 + ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1 + +} + +{ # build samples + ensureDir $out/bin + + mkdir -p samples + cd samples + tar xfz ../common/usr/src/ati/fglrx_sample_source.tgz + + + ( # build and install fgl_glxgears + cd fgl_glxgears; + gcc -DGL_ARB_texture_multisample=1 -g \ + -I$mesa/include \ + -I$out/include \ + -L$mesa/lib -lGL -lGLU -lX11 -lm \ + -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c + ) + + true || ( # build and install + + # doesn't build undefined reference to `FGLRX_X11SetGamma' + # wich should be contained in -lfglrx_gamma + + cd programs/fglrx_gamma + gcc -fPIC -I${libXxf86vm}/include \ + -I${xf86vidmodeproto}/include \ + -I$out/X11R6/include \ + -L$out/lib \ + -Wall -lm -lfglrx_gamma -lX11 -lXext -o fglrx_xgamma fglrx_xgamma.c + ) + + { # copy binaries and wrap them: + BIN=$TMP/arch/$arch/usr/X11R6/bin + cp $BIN/* $out/bin + for prog in $BIN/*; do + patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) + wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$LD_LIBRARY_PATH + done + } + + rm -fr $out/lib/modules/fglrx # don't think those .a files are needed. They cause failure of the mod + +} diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix new file mode 100644 index 00000000000..0a3a90ae653 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchurl , kernel, xlibs, which, imake +, mesa # for fgl_glxgears +, libXxf86vm, xf86vidmodeproto # for fglrx_gamma +, xorg, makeWrapper, glibc, patchelf +}: + +# If you want to use a different Xorg version probably +# DIR_DEPENDING_ON_XORG_VERSION in builder.sh has to be adopted (?) +# make sure libglx.so of ati is used. xorg.xorgserver does provide it as well +# which is a problem because it doesn't contain the xorgserver patch supporting +# the XORG_DRI_DRIVER_PATH env var. +# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a +# workaround (TODO) + +assert xorg.xorgserver.name == "xorg-server-1.7.5"; +assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it. + +# The gentoo ebuild contains much more magic.. + +let lib = stdenv.lib; + inherit (lib) concatStringsSep; +in +# http://wiki.cchtml.com/index.php/Main_Page + +stdenv.mkDerivation { + name = "ati-drivers"; + + builder = ./builder.sh; + + inherit libXxf86vm xf86vidmodeproto; + + src = + assert stdenv.system == "x86_64-linux"; + fetchurl { + url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-4-x86.x86_64.run; + sha256 = "1rlqbfv729lray1c72ga4528kj7v4a5nmdznbgx7izwaxip2a45z"; + }; + + buildInputs = [xlibs.libXext xlibs.libX11 + xlibs.libXrandr which imake makeWrapper + patchelf + ]; + inherit kernel glibc /* glibc only used for setting interpreter */; + + LD_LIBRARY_PATH = concatStringsSep ":" + [ "${xorg.libXrandr}/lib" + "${xorg.libXrender}/lib" + "${xorg.libXext}/lib" + "${xorg.libX11}/lib" + ]; + + inherit mesa; # only required to build examples + + meta = { + description = "ati drivers"; + homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; + license = "unfree"; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d557aea45d..e202ecf28cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6291,6 +6291,12 @@ let inherit kernel; + ati_drivers_x11 = import ../os-specific/linux/ati-drivers { + inherit stdenv fetchurl kernel xlibs which mesa xorg makeWrapper + patchelf glibc; + inherit (xorg) imake libXxf86vm xf86vidmodeproto; + }; + aufs = import ../os-specific/linux/aufs { inherit fetchurl stdenv kernel; }; From ad1684ae13136daf4aa54a6b970b062b1e30fede Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 18 May 2010 20:13:39 +0000 Subject: [PATCH 313/342] Replace codegen script which was failing with EACCESS. Test Gajim build worked fine svn path=/nixpkgs/trunk/; revision=21849 --- pkgs/development/python-modules/pygtk/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 76b50372ca2..3dc37ebe2f0 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -14,4 +14,9 @@ stdenv.mkDerivation { ; propagatedBuildInputs = [pygobject pycairo]; + + postInstall = '' + rm $out/bin/pygtk-codegen-2.0 + ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 + ''; } From 84f61fadd1e488b951350da015e26a5e1db4c384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 18 May 2010 20:57:00 +0000 Subject: [PATCH 314/342] OpenOffice.org update attempt to 3.2.0 - maybe it will work I'll wait for the hydra report. svn path=/nixpkgs/trunk/; revision=21850 --- .../office/openoffice/default.nix | 19 ++++++++++---- pkgs/applications/office/openoffice/oo.patch | 26 +++++++++---------- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index 2916a48efbf..f1682f21975 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -6,7 +6,7 @@ , libXinerama, openssl, gperf, cppunit, GConf, ORBit2 }: -let version = "3.1.1"; in +let version = "3.2.0"; in stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; @@ -17,16 +17,20 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2"; - sha256 = "95440f09f8dce616178b86b26af8e543c869d01579207aa68e8474019b59caca"; + sha256 = "0jl14rxmvhz86jlhhwqlbr9nfi9p271aknqxada9775qfm6bjjml"; }; - patches = [ ./oo.patch ./OOo-3.1.1-HEADERFIX-1.patch ./root-required.patch ]; + patches = [ ./oo.patch ./root-required.patch ]; src_system = fetchurl { url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_system.tar.bz2"; - sha256 = "bb4a440ca91a40cd2b5692abbc19e8fbd3d311525edb266dc5cd9ebc324f2b4a"; + sha256 = "0nihw4iyh9qc188dkyfjr3zvp6ym6i1spm16j0cyh5rgxcrn6ycp"; }; + preConfigure = '' + PATH=$PATH:${icu}/sbin + ''; + configureFlags = " --with-package-format=native --disable-epm @@ -41,6 +45,7 @@ stdenv.mkDerivation rec { --with-system-libs --with-system-python --with-system-boost + --with-system-db --with-jdk-home=${jdk} --with-ant-home=${ant} --without-afms @@ -56,7 +61,6 @@ stdenv.mkDerivation rec { --without-system-xerces --without-system-xml-apis --without-system-xt - --without-system-db --without-system-jars --without-system-hunspell --without-system-altlinuxhyph @@ -64,6 +68,11 @@ stdenv.mkDerivation rec { --without-system-graphite "; + # Double make - I don't know why a single make reports error, and two, do not. + buildPhase = '' + make || make + ''; + LD_LIBRARY_PATH = "${libXext}/lib:${libX11}/lib:${libXtst}/lib:${libXi}/lib:${libjpeg}/lib"; buildInputs = [ diff --git a/pkgs/applications/office/openoffice/oo.patch b/pkgs/applications/office/openoffice/oo.patch index 1b8234e6d61..e759fcdc2d4 100644 --- a/pkgs/applications/office/openoffice/oo.patch +++ b/pkgs/applications/office/openoffice/oo.patch @@ -1,5 +1,5 @@ diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk -index 602b9b1..6be8427 100644 +index 74c64bf..fbf8d21 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -57,7 +57,7 @@ ADDITIONAL_FILES= \ @@ -8,46 +8,46 @@ index 602b9b1..6be8427 100644 #relative to CONFIGURE_DIR -CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" +CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" --prefix=$(TMPDIR) - CONFIGURE_FLAGS= + CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL)) BUILD_ACTION=make diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk -index 0e64d50..547d66b 100644 +index 0d92de9..aae3b4f 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk -@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB) - +@@ -130,7 +130,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure --CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml -+CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) + # do not enable grddl parser (#i93768#) +-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml ++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk -index 850ee9c..3293a79 100644 +index fba6460..fc70419 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk -@@ -104,7 +104,7 @@ XSLTLIB:=$(XSLTLIB) +@@ -126,7 +126,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(GNUMAKE) + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk -index 5719272..75c31b7 100644 +index 710d7d6..dd60f0d 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk -@@ -108,7 +108,7 @@ XSLTLIB:=$(XSLTLIB) +@@ -132,7 +132,7 @@ XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH" -CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml +CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml --prefix=$(TMPDIR) - BUILD_ACTION=$(GNUMAKE) + BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/hunspell/hunspell-1.2.8.patch b/hunspell/hunspell-1.2.8.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e202ecf28cd..45a708fade2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8211,7 +8211,7 @@ let }; openoffice = import ../applications/office/openoffice { - inherit fetchurl stdenv pam python tcsh libxslt perl zlib libjpeg + inherit fetchurl pam python tcsh libxslt perl zlib libjpeg expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron curl libsndfile flex zip unzip libmspack getopt file cairo which icu jdk ant cups openssl bison boost gperf cppunit; @@ -8220,6 +8220,7 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; neon = neon026; + stdenv = stdenv2; }; opera = import ../applications/networking/browsers/opera { From ae476d641aa7b600d26bfb21a06a9256a819e74c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 18 May 2010 21:08:19 +0000 Subject: [PATCH 315/342] DMTX now needs libjasper.. svn path=/nixpkgs/trunk/; revision=21851 --- pkgs/tools/graphics/dmtx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix index 651cdbd8797..bc222fa59cc 100644 --- a/pkgs/tools/graphics/dmtx/default.nix +++ b/pkgs/tools/graphics/dmtx/default.nix @@ -7,7 +7,7 @@ let buildInputs = with args; [ libpng libtiff libjpeg librsvg imagemagick pkgconfig zlib libX11 bzip2 libtool freetype fontconfig - ghostscript + ghostscript jasper ]; in rec { From e2736a08886b794adff900466694ee74ec5991f1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 18 May 2010 21:15:13 +0000 Subject: [PATCH 316/342] DMTX now needs libjasper.. pass that lib to dmtx svn path=/nixpkgs/trunk/; revision=21852 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45a708fade2..fba451b5a26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7416,7 +7416,7 @@ let dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { inherit libpng libtiff libjpeg imagemagick librsvg pkgconfig bzip2 zlib libtool freetype fontconfig - ghostscript; + ghostscript jasper; inherit (xlibs) libX11; }; From b4536c217f288587eb40118ed115172b48e3d79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 19 May 2010 07:31:07 +0000 Subject: [PATCH 317/342] Fixing openoffice urls for 3.2.0 svn path=/nixpkgs/trunk/; revision=21853 --- pkgs/applications/office/openoffice/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/openoffice/default.nix b/pkgs/applications/office/openoffice/default.nix index f1682f21975..5c1e34a4425 100644 --- a/pkgs/applications/office/openoffice/default.nix +++ b/pkgs/applications/office/openoffice/default.nix @@ -11,9 +11,8 @@ stdenv.mkDerivation rec { name = "openoffice.org-${version}"; builder = ./builder.sh; - #downloadRoot = "http://download.services.openoffice.org/files/stable"; - downloadRoot = "http://www-openoffice.com/source/"; - versionDirs = false; + downloadRoot = "http://download.services.openoffice.org/files/stable"; + versionDirs = true; src = fetchurl { url = "${downloadRoot}/${if versionDirs then version + "/" else ""}OOo_${version}_src_core.tar.bz2"; From fa9b6ef08dcbd7e64afdcd1c73f0227433b1c511 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 07:50:45 +0000 Subject: [PATCH 318/342] Fix ledger to compile with recent gcc. Also makes ledger overridable. svn path=/nixpkgs/trunk/; revision=21854 --- pkgs/applications/office/ledger/const.patch | 41 +++++++++++++++++++++ pkgs/applications/office/ledger/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/office/ledger/const.patch diff --git a/pkgs/applications/office/ledger/const.patch b/pkgs/applications/office/ledger/const.patch new file mode 100644 index 00000000000..8565fbfd0d4 --- /dev/null +++ b/pkgs/applications/office/ledger/const.patch @@ -0,0 +1,41 @@ +diff --git a/gnucash.cc b/gnucash.cc +index 7d31526..c4edd77 100644 +--- a/gnucash.cc ++++ b/gnucash.cc +@@ -201,7 +201,7 @@ static amount_t convert_number(const std::string& number, + { + const char * num = number.c_str(); + +- if (char * p = std::strchr(num, '/')) { ++ if (const char * p = std::strchr(num, '/')) { + std::string numer_str(num, p - num); + std::string denom_str(p + 1); + +diff --git a/option.cc b/option.cc +index 10c23a7..8f2fead 100644 +--- a/option.cc ++++ b/option.cc +@@ -892,7 +892,7 @@ OPT_BEGIN(market, "V") { + namespace { + void parse_price_setting(const char * optarg) + { +- char * equals = std::strchr(optarg, '='); ++ const char * equals = std::strchr(optarg, '='); + if (! equals) + return; + +diff --git a/textual.cc b/textual.cc +index 2033106..d897368 100644 +--- a/textual.cc ++++ b/textual.cc +@@ -298,8 +298,8 @@ transaction_t * parse_transaction(char * line, account_t * account, + DEBUG_PRINT("ledger.textual.parse", "line " << linenum << ": " << + "Parsed a note '" << xact->note << "'"); + +- if (char * b = std::strchr(xact->note.c_str(), '[')) +- if (char * e = std::strchr(xact->note.c_str(), ']')) { ++ if (const char * b = std::strchr(xact->note.c_str(), '[')) ++ if (const char * e = std::strchr(xact->note.c_str(), ']')) { + char buf[256]; + std::strncpy(buf, b + 1, e - b - 1); + buf[e - b - 1] = '\0'; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index c6c2fd4d1b1..14121e6281f 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation { buildInputs = [ emacs gmp pcre ]; + patches = [ ./const.patch ]; + # Something goes wrong with pathelf... # this is a small workaround: adds a small shell script for # setting LD_LIBRARY_PATH diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fba451b5a26..aa0db3e20f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8042,7 +8042,7 @@ let inherit fetchurl stdenv; }; - ledger = import ../applications/office/ledger { + ledger = makeOverridable (import ../applications/office/ledger) { inherit stdenv fetchurl emacs gmp pcre; }; From 26e718ba2399ec017d193a346651a11d3e133ba4 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Wed, 19 May 2010 10:01:07 +0000 Subject: [PATCH 319/342] move assertions so that buildign the NixOS manual doesn't fail svn path=/nixpkgs/trunk/; revision=21855 --- pkgs/os-specific/linux/ati-drivers/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 0a3a90ae653..9c936544034 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -12,9 +12,6 @@ # See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a # workaround (TODO) -assert xorg.xorgserver.name == "xorg-server-1.7.5"; -assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it. - # The gentoo ebuild contains much more magic.. let lib = stdenv.lib; @@ -58,4 +55,12 @@ stdenv.mkDerivation { maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; + + # moved assertions here because the name is evaluated when the NixOS manual is generated + # Don't make that fail - fail lazily when a users tries to build this derivation only + dummy = + assert xorg.xorgserver.name == "xorg-server-1.7.5"; + assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it. + null; + } From ad48452ee184a17c6bf15aef5b282427d555013b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 May 2010 10:35:44 +0000 Subject: [PATCH 320/342] * NVIDIA drivers updated to 195.36.24. svn path=/nixpkgs/trunk/; revision=21856 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index b3aa4104fc7..68263c128af 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -2,7 +2,7 @@ let - versionNumber = "195.36.15"; + versionNumber = "195.36.24"; in @@ -15,12 +15,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "0wjcijmkkkpiw72fr2zm0v0x8dz5gf4mdgr329kldi52lb5lf85d"; + sha256 = "0h96356jmmk283ijq30zimp3wxldsaddrk03gy3jifj1v29iklcg"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; - sha256 = "17m0ia220rr0xvnpws251rk1l4gswkdgyhxcyrz0arr5dsr8dzb4"; + sha256 = "1car62fgzy4gvgmqjywbdpascrasqwv3knlyw6zzr7r84qabzc1a"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; From 953469729f2ce080d8151c00ca840c742cead2c9 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 19 May 2010 11:10:15 +0000 Subject: [PATCH 321/342] Removed the VBoxRandR tool which does not exists anymore svn path=/nixpkgs/trunk/; revision=21857 --- .../virtualization/virtualbox/guest-additions/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 1618e36d930..6e099ef5df7 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation { ensureDir $out/bin install -m 755 bin/VBoxClient $out/bin install -m 755 bin/VBoxControl $out/bin - install -m 755 bin/VBoxRandR $out/bin install -m 755 bin/VBoxClient-all $out/bin # Install OpenGL libraries From 6d7f97bd0b1628ed76a40c038ae70a9d91bd2ca1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:31 +0000 Subject: [PATCH 322/342] pkgs/applications/editors/emacs-23: Darwin builds require libXaw to avoid link-time errors svn path=/nixpkgs/trunk/; revision=21858 --- pkgs/applications/editors/emacs-23/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index a68cd5935c5..a0ff68a76bf 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -16,7 +16,7 @@ assert dbusSupport -> dbus != null; assert xaw3dSupport -> Xaw3d != null; assert gtkGUI -> pkgconfig != null && gtk != null; assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug -assert stdenv.system == "i686-darwin" -> xawSupport; # fails to link otherwise +assert stdenv.isDarwin -> xawSupport; # fails to link otherwise stdenv.mkDerivation rec { name = "emacs-23.2"; From 0db2caa183104fe4102a2c01915b75bca45d48c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:35 +0000 Subject: [PATCH 323/342] pkgs/desktops/gnome-2.28/platform/gnome-vfs: don't require hal unless the host OS is Linux svn path=/nixpkgs/trunk/; revision=21859 --- pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix index 4772e2ded9e..1e35ac9430b 100644 --- a/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/gnome-vfs/default.nix @@ -3,16 +3,17 @@ stdenv.mkDerivation { name = "gnome-vfs-2.24.1"; - + src = fetchurl { url = mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.1.tar.bz2; sha256 = "1dmyr8nj77717r8dhwkixpar2yp8ld3r683gp222n59v61718ndw"; }; - + buildInputs = - [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia + [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia intltool gnome_mime_data - ]; + ] + ++ (if stdenv.isLinux then [hal] else []); propagatedBuildInputs = [ GConf glib ]; } From af899f1956129102dc66586852499055f19dcac2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:38 +0000 Subject: [PATCH 324/342] pkgs/desktops/gnome-2.28/platform/libIDL: fixed build failure on Darwin The build needs gettext, or it will fail to link libintl. svn path=/nixpkgs/trunk/; revision=21860 --- pkgs/desktops/gnome-2.28/default.nix | 1 + pkgs/desktops/gnome-2.28/platform/libIDL/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index a382ee4fbaf..22f92602150 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -29,6 +29,7 @@ rec { libIDL = import ./platform/libIDL { inherit (pkgs) stdenv fetchurl flex bison pkgconfig; inherit (pkgs.gtkLibs) glib; + gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null; }; ORBit2 = import ./platform/ORBit2 { diff --git a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix b/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix index 29897623abf..f48b0821f12 100644 --- a/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/libIDL/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, flex, bison, pkgconfig, glib}: +{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext ? null}: stdenv.mkDerivation { name = "libIDL-0.8.13"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = mirror://gnome/sources/libIDL/0.8/libIDL-0.8.13.tar.bz2; sha256 = "0w9b4q5sllwncz498sj5lmc3ajzc8x74dy0jy27m2yg9v887xk5w"; }; - buildInputs = [ flex bison pkgconfig glib ]; + buildInputs = [ flex bison pkgconfig glib gettext ]; } From 807ed4dea3f10312ff03b94346e4560fe2441040 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:41 +0000 Subject: [PATCH 325/342] pkgs/desktops/gnome-2.28/default.nix: strip trailing white space svn path=/nixpkgs/trunk/; revision=21861 --- pkgs/desktops/gnome-2.28/default.nix | 70 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 22f92602150..e0c325d33d7 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -25,23 +25,23 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig alsaLib; inherit audiofile; }; - + libIDL = import ./platform/libIDL { inherit (pkgs) stdenv fetchurl flex bison pkgconfig; inherit (pkgs.gtkLibs) glib; gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null; }; - + ORBit2 = import ./platform/ORBit2 { inherit (pkgs) stdenv fetchurl pkgconfig; inherit (pkgs.gtkLibs) glib; inherit libIDL; }; - + libart_lgpl = import ./platform/libart_lgpl { inherit (pkgs) stdenv fetchurl; }; - + libglade = import ./platform/libglade { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext; inherit (pkgs.gtkLibs) gtk; @@ -69,11 +69,11 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; inherit (pkgs.gtkLibs) gtk; }; - + intltool = import ./platform/intltool { inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext; }; - + GConf = import ./platform/GConf { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 policykit; inherit (pkgs.gtkLibs) glib; @@ -92,47 +92,47 @@ rec { inherit (pkgs) stdenv fetchgit pkgconfig autoconf automake libtool; }; - + gnome_mime_data = import ./platform/gnome-mime-data { inherit (pkgs) stdenv fetchurl; inherit intltool; }; - + gnome_vfs = import ./platform/gnome-vfs { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; inherit (pkgs.gtkLibs) glib; inherit intltool GConf gnome_mime_data; }; - + gnome_vfs_monikers = import ./platform/gnome-vfs-monikers { inherit (pkgs) stdenv fetchurl pkgconfig; inherit (pkgs.gtkLibs) glib; inherit intltool gnome_vfs libbonobo ORBit2; }; - + libgnome = import ./platform/libgnome { inherit (pkgs) stdenv fetchurl pkgconfig popt zlib; inherit (pkgs.gtkLibs) glib; inherit intltool esound libbonobo GConf gnome_vfs ORBit2; }; - + libgnomeui = import ./platform/libgnomeui { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs; inherit intltool libgnome libgnomecanvas libbonoboui GConf; inherit gnome_vfs gnome_keyring libglade glib pango; }; - + libbonobo = import ./platform/libbonobo { inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt; inherit (pkgs.gtkLibs) glib; inherit intltool ORBit2; }; - + libbonoboui = import ./platform/libbonoboui { inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2; inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk; }; - + at_spi = import ./platform/at-spi { inherit (pkgs) stdenv fetchurl python pkgconfig popt; inherit (pkgs.xlibs) libX11 libICE libXtst libXi; @@ -147,7 +147,7 @@ rec { }; # What name should we use?? - gtkdoc = gtk_doc; + gtkdoc = gtk_doc; gtkhtml = import ./platform/gtkhtml { inherit (pkgs.gtkLibs) gtk; @@ -155,18 +155,18 @@ rec { inherit GConf gnome_icon_theme; }; - + # Freedesktop library startup_notification = import ./platform/startup-notification { inherit (pkgs) stdenv fetchurl pkgconfig xlibs; }; - + # Required for nautilus libunique = import ./platform/libunique { inherit (pkgs) stdenv fetchurl pkgconfig gettext; inherit (pkgs.gtkLibs) gtk; }; - + gtkglext = import ./platform/gtkglext { inherit (pkgs) stdenv fetchurl mesa pkgconfig; inherit (pkgs.gtkLibs) gtk pango; @@ -179,7 +179,7 @@ rec { inherit (pkgs.gtkLibs) glib gtk; inherit intltool GConf; }; - + libsoup = import ./desktop/libsoup { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl; inherit (pkgs.gtkLibs) glib; @@ -192,56 +192,56 @@ rec { inherit (pkgs.gtkLibs) gtk; inherit intltool; }; - + # Not part of GNOME desktop, but provides CSS support for librsvg libcroco = import ./desktop/libcroco { inherit (pkgs) stdenv fetchurl pkgconfig libxml2; inherit (pkgs.gtkLibs) glib; }; - + librsvg = import ./desktop/librsvg { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2; inherit (pkgs.gtkLibs) glib gtk; inherit libcroco; }; - + libgweather = import ./desktop/libgweather { inherit (pkgs) stdenv fetchurl pkgconfig libxml2; inherit (pkgs.gtkLibs) gtk; inherit intltool GConf libsoup; }; - + gvfs = import ./desktop/gvfs { inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool; inherit (pkgs.gtkLibs) glib; inherit intltool GConf gnome_keyring libsoup; }; - + libgnomekbd = import ./desktop/libgnomekbd { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; inherit (pkgs.gtkLibs) glib gtk; inherit intltool GConf libglade; }; - + # Removed from recent GNOME releases, but still required scrollkeeper = import ./desktop/scrollkeeper { inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42; }; - + gnome_doc_utils = import ./desktop/gnome-doc-utils { inherit (pkgs) stdenv fetchurl python pkgconfig libxslt makeWrapper; inherit intltool scrollkeeper; libxml2 = pkgs.libxml2Python; }; - + zenity = import ./desktop/zenity { inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt; inherit (pkgs.gtkLibs) glib gtk pango atk; inherit gnome_doc_utils intltool libglade; inherit (pkgs.xlibs) libX11; }; - + metacity = import ./desktop/metacity { inherit (pkgs) stdenv fetchurl pkgconfig libcanberra; inherit (pkgs.gtkLibs) glib gtk; @@ -254,7 +254,7 @@ rec { inherit (pkgs.gtkLibs) glib; inherit intltool; }; - + gnome_desktop = import ./desktop/gnome-desktop { inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which; libxml2 = pkgs.libxml2Python; @@ -262,7 +262,7 @@ rec { inherit (pkgs.gtkLibs) gtk; inherit intltool GConf gnome_doc_utils; }; - + gnome_panel = import ./desktop/gnome-panel { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt; libxml2 = pkgs.libxml2Python; @@ -271,20 +271,20 @@ rec { inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop; inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl; }; - + gnome_session = import ./desktop/gnome-session { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus; inherit (pkgs.gtkLibs) gtk pango atk; inherit (pkgs.xlibs) libXau libXtst inputproto; inherit intltool libglade startup_notification GConf; }; - + gnome_settings_daemon = import ./desktop/gnome-settings-daemon { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; inherit (pkgs.gtkLibs) gtk; inherit intltool GConf gnome_desktop libglade libgnomekbd; }; - + gnome_control_center = import ./desktop/gnome-control-center { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal libtool bzip2; inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils; @@ -301,7 +301,7 @@ rec { inherit (pkgs.gtkLibs) atk glib gtk pango; libxml2 = pkgs.libxml2Python; }; - + nautilus = import ./desktop/nautilus { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info; inherit (pkgs.gtkLibs) gtk; @@ -316,7 +316,7 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig ncurses python; inherit intltool glib gtk; }; - + #### BINDINGS libglademm = import ./bindings/libglademm { From 9c812655cec2248d45c9da8c4df5991270990587 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:45 +0000 Subject: [PATCH 326/342] pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU Privacy Guard Changed 'gnupg' and 'gnupg2' expressions to allow for argument overriding instead of relying on getPkgConfig. svn path=/nixpkgs/trunk/; revision=21862 --- pkgs/top-level/all-packages.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa0db3e20f7..dc1fcd6bb84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -807,17 +807,14 @@ let inherit fetchurl stdenv ed; }); - gnupg = import ../tools/security/gnupg { + gnupg = makeOverridable (import ../tools/security/gnupg) { inherit fetchurl stdenv readline bzip2; - ideaSupport = getPkgConfig "gnupg" "idea" false; # enable for IDEA crypto support + ideaSupport = false; }; - gnupg2 = import ../tools/security/gnupg2 { - inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib; - openldap = if getPkgConfig "gnupg" "ldap" true then openldap else null; - bzip2 = if getPkgConfig "gnupg" "bzip2" true then bzip2 else null; - libusb = if getPkgConfig "gnupg" "usb" true then libusb else null; - curl = if getPkgConfig "gnupg" "curl" true then curl else null; + gnupg2 = makeOverridable (import ../tools/security/gnupg2) { + inherit fetchurl stdenv readline libgpgerror libgcrypt libassuan pth libksba zlib + openldap bzip2 libusb curl; }; gnuplot = import ../tools/graphics/gnuplot { From d9c1f1b1183fb0c9785484f0554f562d0030e386 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:48 +0000 Subject: [PATCH 327/342] pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize ipmitool Changed 'ipmitool' expression to allow for argument overriding instead of relying on getPkgConfig. svn path=/nixpkgs/trunk/; revision=21863 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc1fcd6bb84..d6589c12f15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -953,9 +953,9 @@ let inherit fetchurl stdenv; }; - ipmitool = import ../tools/system/ipmitool { + ipmitool = makeOverridable (import ../tools/system/ipmitool) { inherit fetchurl stdenv openssl; - static = !stdenv.isDarwin && getPkgConfig "ipmitool" "static" false; + static = false; }; jdiskreport = import ../tools/misc/jdiskreport { From aa600ed8f78e2fad8f9504b0fa9a5ea72b019448 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:51 +0000 Subject: [PATCH 328/342] pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize GNU plot Changed 'gnuplot' expression to allow for argument overriding instead of relying on getPkgConfig. While I was at it, I also simplified the actual build expression a bit. svn path=/nixpkgs/trunk/; revision=21864 --- pkgs/tools/graphics/gnuplot/default.nix | 16 +++++----------- pkgs/top-level/all-packages.nix | 6 ++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index c10777f66ab..003169415d3 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -10,16 +10,9 @@ , pango ? null , cairo ? null , pkgconfig ? null -, x11Support ? false , readline }: -assert x11Support -> ((libX11 != null) && - (libXt != null) && (libXpm != null) && - (libXaw != null)); - -assert (wxGTK != null) -> x11Support; - stdenv.mkDerivation { name = "gnuplot-4.4.0"; src = fetchurl { @@ -27,9 +20,10 @@ stdenv.mkDerivation { sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0"; }; - configureFlags = if x11Support then ["--with-x"] else ["--without-x"]; + configureFlags = if (libX11 != null) then ["--with-x"] else ["--without-x"]; - buildInputs = [zlib gd texinfo readline emacs lua texLive] ++ - (if x11Support then [libX11 libXt libXpm libXaw] else []) ++ - (if wxGTK != null then [wxGTK pango cairo pkgconfig] else []); + buildInputs = [ + zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw + wxGTK pango cairo pkgconfig + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6589c12f15..1835c4afb9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -817,11 +817,9 @@ let openldap bzip2 libusb curl; }; - gnuplot = import ../tools/graphics/gnuplot { - inherit fetchurl stdenv zlib gd texinfo readline emacs; + gnuplot = makeOverridable (import ../tools/graphics/gnuplot) { + inherit fetchurl stdenv zlib gd texinfo readline emacs wxGTK; inherit (xlibs) libX11 libXt libXaw libXpm; - x11Support = getPkgConfig "gnuplot" "x11" false; - wxGTK = if getPkgConfig "gnuplot" "wxGtk" false then wxGTK else null; inherit (gtkLibs) pango; inherit cairo pkgconfig; }; From 7f0dc973f4a51f072a1e69c029883afbef4dff2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:54 +0000 Subject: [PATCH 329/342] pkgs/top-level/all-packages.nix: prefer makeOverridable over getConfig to customize libc version Previously, the getConfig variable 'brokenRedHatKernel' was used to switch back to glibc 2.5, which fixes various run-time problems on Red Hat Linux. Now, the same can be achieved by configuring { packageOverrides = pkgs: { glibc = pkgs.useFromStdenv "glibc" pkgs.glibc25; }; } in $NIXPKGS_CONFIG. Similarly, the argument 'installLocales' can be overridden by setting: { packageOverrides = pkgs: { glibc = pkgs.useFromStdenv "glibc" (pkgs.glibc25.override { installLocales = true; }); }; } svn path=/nixpkgs/trunk/; revision=21865 --- pkgs/top-level/all-packages.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1835c4afb9f..30a3026df31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3866,17 +3866,12 @@ let inherit (xlibs) libX11 libXext xextproto; }; - glibc = - let haveRedHatKernel = system == "i686-linux" || system == "x86_64-linux"; - haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false; - in - useFromStdenv "glibc" (if haveBrokenRedHatKernel then glibc25 else - glibc211); + glibc = useFromStdenv "glibc" glibc211; - glibc25 = import ../development/libraries/glibc-2.5 { + glibc25 = makeOverridable (import ../development/libraries/glibc-2.5) { inherit fetchurl stdenv; kernelHeaders = linuxHeaders; - installLocales = getPkgConfig "glibc" "locales" false; + installLocales = false; }; glibc27 = import ../development/libraries/glibc-2.7 { From 2508c9576386b18586e6c444732cbf071c65f98a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:57 +0000 Subject: [PATCH 330/342] pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize distcc Changed 'distcc' expression to allow for argument overriding instead of relying on getPkgConfig. svn path=/nixpkgs/trunk/; revision=21866 --- pkgs/top-level/all-packages.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30a3026df31..295e23559fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3095,13 +3095,10 @@ let inherit (xlibs) libX11 libXt; }; - distcc = import ../development/tools/misc/distcc { - inherit fetchurl stdenv popt; - python = if getPkgConfig "distcc" "python" true then python else null; - avahi = if getPkgConfig "distcc" "avahi" false then avahi else null; - pkgconfig = if getPkgConfig "distcc" "gtk" false then pkgconfig else null; - gtk = if getPkgConfig "distcc" "gtk" false then gtkLibs.gtk else null; - static = getPkgConfig "distcc" "static" false; + distcc = makeOverridable (import ../development/tools/misc/distcc) { + inherit fetchurl stdenv popt python avahi pkgconfig; + inherit (gtkLibs) gtk; + static = false; }; docutils = builderDefsPackage (import ../development/tools/documentation/docutils) { From 3104ba89de3f8de577e633e12546e965317350f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:00 +0000 Subject: [PATCH 331/342] pkgs/top-level/all-packages.nix: prefer makeOverridable over getPkgConfig to customize pdsh Changed 'pdsh' expression to allow for argument overriding instead of relying on getPkgConfig. svn path=/nixpkgs/trunk/; revision=21867 --- pkgs/top-level/all-packages.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 295e23559fc..d9606cadaaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1361,12 +1361,10 @@ let inherit fetchurl stdenv ncurses postgresql; }; - pdsh = import ../tools/networking/pdsh { - inherit fetchurl stdenv perl; - readline = if getPkgConfig "pdsh" "readline" true then readline else null; - rsh = getPkgConfig "pdsh" "rsh" true; - ssh = if getPkgConfig "pdsh" "ssh" true then openssh else null; - pam = if getPkgConfig "pdsh" "pam" true then pam else null; + pdsh = makeOverridable (import ../tools/networking/pdsh) { + inherit fetchurl stdenv perl readline pam; + rsh = true; # enable internal rsh implementation + ssh = openssh; }; pfstools = import ../tools/graphics/pfstools { From 3353ed9c88785a9ca1e81b655b9ecf90d03f925e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:06 +0000 Subject: [PATCH 332/342] pkgs/top-level/all-packages.nix, pkgs/tools/networking/openssh: prefer makeOverridable over getPkgConfig to customize openssh Changed 'openssh' expression to allow for argument overriding instead of relying on getPkgConfig. While I was at it, I also simplified the build expression a bit. svn path=/nixpkgs/trunk/; revision=21868 --- pkgs/tools/networking/openssh/default.nix | 13 ++++--------- pkgs/top-level/all-packages.nix | 7 +++---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 67ece3c907f..3b35bc6ab2c 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,11 +1,8 @@ -{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig -, pamSupport ? false, pam ? null +{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam , etcDir ? null , hpnSupport ? false }: -assert pamSupport -> pam != null; - let hpnSrc = fetchurl { @@ -28,16 +25,14 @@ stdenv.mkDerivation rec { gunzip -c ${hpnSrc} | patch -p1 ''; patches = [ ./locale_archive.patch ]; - - buildInputs = - [ zlib openssl perl libedit pkgconfig ] - ++ stdenv.lib.optional pamSupport pam; + + buildInputs = [ zlib openssl perl libedit pkgconfig pam ]; configureFlags = '' --with-mantype=man --with-libedit=yes - ${if pamSupport then "--with-pam" else "--without-pam"} + ${if pam != null then "--with-pam" else "--without-pam"} ${if etcDir != null then "--sysconfdir=${etcDir}" else ""} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9606cadaaa..5df2685fbf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1285,11 +1285,10 @@ let inherit stdenv makeWrapper ed libopensc_dnie; }; - openssh = import ../tools/networking/openssh { + openssh = makeOverridable (import ../tools/networking/openssh) { inherit fetchurl stdenv zlib openssl pam perl libedit pkgconfig; - pamSupport = getPkgConfig "openssh" "pam" true; - hpnSupport = getPkgConfig "openssh" "hpn" false; - etcDir = getPkgConfig "openssh" "etcDir" "/etc/ssh"; + hpnSupport = false; + etcDir = "/etc/ssh"; }; opensp = import ../tools/text/sgml/opensp { From d6201c6aacbb36c35c76b733c5f3cf1663078236 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:09 +0000 Subject: [PATCH 333/342] pkgs/os-specific/linux/hal/default.nix: prefer explicit function arguments over implicit with style svn path=/nixpkgs/trunk/; revision=21869 --- pkgs/os-specific/linux/hal/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index b6fdfac367c..74b6f261847 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -1,4 +1,9 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, python, pciutils, expat +, libusb, dbus, dbus_glib, glib, libuuid, perl +, perlXMLParser, gettext, zlib, gperf, consolekit, policykit +, libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils +, eject +}: assert stdenv ? glibc; From f90d6ec47d3bf5dc9b060350b095067513339b36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:12 +0000 Subject: [PATCH 334/342] pkgs/os-specific/linux/hal/default.nix: deal with 'udev' being null svn path=/nixpkgs/trunk/; revision=21870 --- pkgs/os-specific/linux/hal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index 74b6f261847..6d870ebf453 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { do substituteInPlace $i \ --replace /usr/sbin/dmidecode ${dmidecode}/sbin/dmidecode \ - --replace /sbin/udevadm ${udev}/sbin/udevadm \ + ${if udev != null then "--replace /sbin/udevadm ${udev}/sbin/udevadm" else ""} \ --replace /bin/mount ${utillinuxng}/bin/mount \ --replace /bin/umount ${utillinuxng}/bin/umount \ --replace /usr/bin/pm-is-supported ${pmutils}/bin/pm-is-supported \ From dd5add68e1ff15d4491f806e860789ce8ef8b4c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:15 +0000 Subject: [PATCH 335/342] pkgs/os-specific/linux/hal/default.nix: strip trailing white space svn path=/nixpkgs/trunk/; revision=21871 --- pkgs/os-specific/linux/hal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index 6d870ebf453..521992dae17 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; sha256 = "1by8z7vy1c1m3iyh57rlqx6rah5gj6kx3ba30s9305bnffij5kzb"; }; - + buildInputs = [ pkgconfig python pciutils expat libusb dbus.libs dbus_glib glib libuuid perl perlXMLParser gettext zlib gperf @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") [ libsmbios ]; # !!! Hm, maybe the pci/usb.ids location should be in /etc, so that - # we don't have to rebuild HAL when we update the PCI/USB IDs. + # we don't have to rebuild HAL when we update the PCI/USB IDs. configureFlags = '' --with-pci-ids=${pciutils}/share --with-usb-ids=${usbutils}/share From 5e4bf972126b5fe569c662921ef1d8dd47e25e7e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:17 +0000 Subject: [PATCH 336/342] pkgs/applications/version-management/git-and-tools: disable sendEmailSupport on Darwin in gitFull The required perl libraries don't build on Darwin. svn path=/nixpkgs/trunk/; revision=21872 --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index f99de479a18..a899c8e5c56 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -29,7 +29,7 @@ rec { gitFull = git.override { svnSupport = true; guiSupport = true; - sendEmailSupport = true; + sendEmailSupport = stdenv.isDarwin == false; }; gitGit = import ./git/git-git.nix { From 8d1637de337155be3755ffc3b46deb2e514b3cf9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:26:21 +0000 Subject: [PATCH 337/342] pkgs/top-level/all-packages.nix, pkgs/applications/editors/emacs-23: prefer makeOverridable over getPkgConfig to customize GNU Emacs Changed 'emacs23' expression to allow for argument overriding instead of relying on getPkgConfig. While I was at it, I also simplified the actual build expression a bit. svn path=/nixpkgs/trunk/; revision=21873 --- .../applications/editors/emacs-23/default.nix | 40 +++++-------------- pkgs/top-level/all-packages.nix | 22 +++++----- 2 files changed, 22 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/editors/emacs-23/default.nix b/pkgs/applications/editors/emacs-23/default.nix index a0ff68a76bf..4bdb4f132c2 100644 --- a/pkgs/applications/editors/emacs-23/default.nix +++ b/pkgs/applications/editors/emacs-23/default.nix @@ -1,22 +1,11 @@ -{ xawSupport ? true -, xpmSupport ? true -, dbusSupport ? true -, xaw3dSupport ? false -, gtkGUI ? false -, xftSupport ? false -, stdenv, fetchurl, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null -, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null -, libpng, libjpeg, libungif, libtiff, librsvg, texinfo -, gconf ? null +{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d +, pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif +, libtiff, librsvg, texinfo, gconf }: -assert xawSupport -> libXaw != null; -assert xpmSupport -> libXpm != null; -assert dbusSupport -> dbus != null; -assert xaw3dSupport -> Xaw3d != null; -assert gtkGUI -> pkgconfig != null && gtk != null; -assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug -assert stdenv.isDarwin -> xawSupport; # fails to link otherwise +assert (gtk != null) -> (pkgconfig != null); +assert (libXft != null) -> libpng != null; # probably a bug +assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { name = "emacs-23.2"; @@ -29,19 +18,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ncurses x11 texinfo - (if xawSupport then libXaw else null) - (if xpmSupport then libXpm else null) - (if dbusSupport then dbus else null) - (if xaw3dSupport then Xaw3d else null) - libpng libjpeg libungif libtiff librsvg - ] - ++ (if gtkGUI then [pkgconfig gtk] else []) - ++ (if xftSupport then [libXft] else []) - ++ stdenv.lib.optional (gconf != null) gconf; + ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif + libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf + ]; configureFlags = - stdenv.lib.optionals gtkGUI [ "--with-x-toolkit=gtk" "--with-xft" ]; + stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ]; doCheck = true; @@ -68,7 +50,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/emacs/; license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5df2685fbf7..c199824c789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7451,17 +7451,17 @@ let gtkGUI = getPkgConfig "emacs" "gtkSupport" true; }; - emacs23 = import ../applications/editors/emacs-23 { - inherit fetchurl stdenv ncurses pkgconfig x11 Xaw3d - libpng libjpeg libungif libtiff librsvg texinfo dbus; - inherit (xlibs) libXaw libXpm libXft; - inherit (gtkLibs) gtk; - gconf = gnome.GConf; # optional GConf support. - xawSupport = stdenv.isDarwin || getPkgConfig "emacs" "xawSupport" false; - xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; - gtkGUI = getPkgConfig "emacs" "gtkSupport" true; - xftSupport = getPkgConfig "emacs" "xftSupport" true; - dbusSupport = getPkgConfig "emacs" "dbusSupport" true; + emacs23 = makeOverridable (import ../applications/editors/emacs-23) { + inherit fetchurl stdenv ncurses pkgconfig x11 libpng libjpeg + libungif libtiff texinfo dbus; + inherit (xlibs) libXpm libXft; + # use override to select the appropriate gui toolkit + libXaw = if stdenv.isDarwin then xlibs.libXaw else null; + Xaw3d = null; + gtk = if stdenv.isDarwin then gtkLibs.gtk else null; + # TODO: these packages don't build on Darwin. + gconf = if stdenv.isDarwin then null else gnome.GConf; + librsvg = if stdenv.isDarwin then null else librsvg; }; emacsSnapshot = lowPrio (import ../applications/editors/emacs-snapshot { From a310fc9ed03e31402386efd91f14be43a8b5f695 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 May 2010 12:28:54 +0000 Subject: [PATCH 338/342] * Latest kernels. svn path=/nixpkgs/trunk/; revision=21874 --- pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-2.6.33.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index 3a4ae7feacf..e12c1bd720b 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -206,11 +206,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.12"; + version = "2.6.32.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1qzlj2i2nn0qbzpfm0l7j26y44xkcbya91jirjvly2saknnxkpw2"; + sha256 = "12byfnxg22jbv2glzklfjlrva7vvihg3d6vnffnn8zwjrw48x39s"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix index ca57f49b030..cc8bf91883c 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.33.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.33.nix @@ -197,11 +197,11 @@ in import ./generic.nix ( rec { - version = "2.6.33.3"; + version = "2.6.33.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "117pw6xcvf76zwh6xch0v5akykwjp73lnkqlryy3wgv86vcsvwvm"; + sha256 = "129qkbsazh9609mda3qlwv3fwjv503nypj4lnjws01vbarpfb2bg"; }; config = configWithPlatform stdenv.platform; From 1c862f34f8a66548d62239d16bc66617fe55dd18 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 May 2010 13:55:59 +0000 Subject: [PATCH 339/342] * Remove empty KDE 4.3 directories. (Where do these come from?) svn path=/nixpkgs/trunk/; revision=21875 From f8a818bf2054726f245f7d1c07785e22cf93a357 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 May 2010 13:57:20 +0000 Subject: [PATCH 340/342] * Remove a redundant version of ktorrent (it's already in kde/extra-gear). svn path=/nixpkgs/trunk/; revision=21876 --- .../tools/networking/p2p/ktorrent/default.nix | 28 ------------------- pkgs/top-level/all-packages.nix | 6 +--- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 pkgs/tools/networking/p2p/ktorrent/default.nix diff --git a/pkgs/tools/networking/p2p/ktorrent/default.nix b/pkgs/tools/networking/p2p/ktorrent/default.nix deleted file mode 100644 index db9e23197af..00000000000 --- a/pkgs/tools/networking/p2p/ktorrent/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, kde, xlibs, zlib -, libpng, libjpeg, perl, gmp, cmake, gettext, boost -}: - -stdenv.mkDerivation { - name = "ktorrent-3.3.3"; - - src = fetchurl { - url = http://ktorrent.org/downloads/3.3.3/ktorrent-3.3.3.tar.bz2; - sha256 = "1f2hr8q8j1fxd3wa74vavq7b0spdsjfcl3jbyfi9xhk9mxxlm216"; - }; - - buildInputs = [ - pkgconfig xlibs.xlibs zlib libpng libjpeg perl gmp cmake gettext boost - ]; - - propagatedBuildInputs = [ - kde.qt4 kde.automoc4 kde.kdelibs kde.phonon kde.qca2 kde.kdepimlibs - ]; - - cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ]; - includeAllQtDirs=true; - - meta = { - homepage = http://ktorrent.org/; - description = "A BitTorrent client for KDE"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c199824c789..bc20f4af381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -997,11 +997,7 @@ let inherit fetchurl stdenv libpcap ncurses expat pcre; }; - ktorrent = import ../tools/networking/p2p/ktorrent { - inherit fetchurl stdenv pkgconfig boost - xlibs zlib libpng libjpeg perl gmp cmake gettext; - kde = kde44; - }; + ktorrent = kde4.ktorrent; less = import ../tools/misc/less { inherit fetchurl stdenv ncurses; From 90b3af3bd726c0f66235f77e747c0d73bc71a885 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 May 2010 14:42:52 +0000 Subject: [PATCH 341/342] * Bittorrent updated to 5.2.2 (5.3 seems too hard to build). svn path=/nixpkgs/trunk/; revision=21877 --- pkgs/tools/networking/p2p/bittorrent/builder.sh | 1 - pkgs/tools/networking/p2p/bittorrent/default.nix | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh index c074c1919ac..3f30aa5c851 100644 --- a/pkgs/tools/networking/p2p/bittorrent/builder.sh +++ b/pkgs/tools/networking/p2p/bittorrent/builder.sh @@ -9,7 +9,6 @@ export HOME=$TMP buildPhase() { - #substituteInPlace BitTorrent/GUI_wx/__init__.py --replace "'2.6'" "'2.8'" python setup.py build } diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix index 980f51d3746..1d4f43445bf 100644 --- a/pkgs/tools/networking/p2p/bittorrent/default.nix +++ b/pkgs/tools/networking/p2p/bittorrent/default.nix @@ -6,16 +6,16 @@ assert gui -> wxPython != null; stdenv.mkDerivation { - name = "bittorrent-5.2.0"; + name = "bittorrent-5.2.2"; builder = ./builder.sh; src = fetchurl { - url = http://download.bittorrent.com/dl/BitTorrent-5.2.0.tar.gz; - sha256 = "0lg54x5y2k1cb7vpj7hanlnvzqa2k3v24qq0g6fsycjk4n8dky02"; + url = http://download.bittorrent.com/dl/archive/BitTorrent-5.2.2.tar.gz; + sha256 = "05k803hbwsyn51j4aibzdsnqxz24kw4rvr60v2c0wji8gcvy3kx9"; }; - buildInputs = [python pycrypto twisted makeWrapper] + buildInputs = [ python pycrypto twisted makeWrapper ] ++ stdenv.lib.optional gui wxPython; meta = { From e283f861746bdaba44e4f58478ba2a5b1e3257e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 19 May 2010 15:13:46 +0000 Subject: [PATCH 342/342] Making nixUnstable ready to cross build. That requires bzip2 to cross build properly, and this is done only in stdenv-updates. svn path=/nixpkgs/trunk/; revision=21878 --- pkgs/tools/package-management/nix/unstable.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 6e0f38f69c2..adcac62070e 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -22,6 +22,17 @@ stdenv.mkDerivation rec { CFLAGS=-O3 CXXFLAGS=-O3 ''; + crossAttrs = { + configureFlags = + '' + --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-bzip2=${bzip2.hostDrv} + --disable-init-state + CFLAGS=-O3 CXXFLAGS=-O3 + ''; + doCheck = false; + }; + doCheck = true; meta = {