From 3b02e6f70d8d24200cc2ca5647dc222703deec89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 19 Feb 2012 13:15:50 +0000 Subject: [PATCH 01/92] Updating super tux kart to 0.7.3. I also add the library irrlicht, the specific version needed for super tux kart. svn path=/nixpkgs/trunk/; revision=32399 --- .../libraries/irrlicht/default.nix | 39 +++++++++++++++++++ pkgs/games/super-tux-kart/default.nix | 12 ++++-- pkgs/top-level/all-packages.nix | 2 + 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/irrlicht/default.nix diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix new file mode 100644 index 00000000000..ccc088816c6 --- /dev/null +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -0,0 +1,39 @@ +{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }: + + +stdenv.mkDerivation rec { + # Version 3843 is required for supertuxkart + name = "irrlicht-1.8-svn-3843"; + + src = fetchsvn { + url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk; + rev = 3843; + sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl"; + }; + + preConfigure = '' + cd source/Irrlicht + ''; + + buildPhase = '' + make sharedlib NDEBUG=1 + ''; + + preInstall = '' + sed -i s,/usr/local/lib,$out/lib, Makefile + mkdir -p $out/lib + ''; + + postInstall = '' + ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8 + ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so + ''; + + buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; + + meta = { + homepage = http://irrlicht.sourceforge.net/; + license = "zlib"; + description = "Open source high performance realtime 3D engine written in C++"; + }; +} diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 72244112153..0c92ffbcdbb 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,18 +1,22 @@ { fetchurl, stdenv, plib, SDL, openal, freealut, mesa -, libvorbis, libogg, gettext }: +, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig +, fribidi }: stdenv.mkDerivation rec { - name = "supertuxkart-0.6.2a"; + name = "supertuxkart-0.7.3"; src = fetchurl { url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2"; - sha256 = "0bdn12kg85bgcgj9shfc40k56228hysiixfaxkycgb688nhldngr"; + sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7"; }; buildInputs = [ - plib SDL openal freealut mesa libvorbis libogg gettext + plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843 + libXxf86vm curl pkgconfig fribidi ]; + configureFlags = [ "--with-irrlicht=${irrlicht3843}" ]; + postInstall = '' mv $out/games $out/bin ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0830758837f..078f62707b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3824,6 +3824,8 @@ let intltool = gnome.intltool; + irrlicht3843 = callPackage ../development/libraries/irrlicht { }; + isocodes = callPackage ../development/libraries/iso-codes { }; itk = callPackage ../development/libraries/itk { }; From cecff49b34eff66b34f1b20841f65d6930487aab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Feb 2012 17:03:35 +0000 Subject: [PATCH 02/92] Moved the cabal build driver function from development/libraries/haskell/cabal to build-support/cabal. This change also resolves the "cabal" vs. "Cabal" ambiguity on file systems that don't distinguish case. svn path=/nixpkgs/trunk/; revision=32401 --- .../haskell/cabal/cabal.nix => build-support/cabal/default.nix} | 0 pkgs/top-level/haskell-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/haskell/cabal/cabal.nix => build-support/cabal/default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/build-support/cabal/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/cabal/cabal.nix rename to pkgs/build-support/cabal/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 803e42a1b94..53d495eb4c5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -121,7 +121,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); # This is the Cabal builder, the function we use to build most Haskell # packages. It isn't the Cabal library, which is spelled "Cabal". - cabal = callPackage ../development/libraries/haskell/cabal/cabal.nix { + cabal = callPackage ../build-support/cabal { enableLibraryProfiling = enableLibraryProfiling; }; From ea82288eecf3c85efc4ee17676120266409fa84d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Feb 2012 17:54:37 +0000 Subject: [PATCH 03/92] * Remove the unused graphviz/2.24.nix file. Also remove the unused attribute graphviz_2_24 (which was actually referring to Graphviz 2.0). svn path=/nixpkgs/trunk/; revision=32406 --- pkgs/tools/graphics/graphviz/2.24.nix | 32 --------------------------- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/tools/graphics/graphviz/2.24.nix diff --git a/pkgs/tools/graphics/graphviz/2.24.nix b/pkgs/tools/graphics/graphviz/2.24.nix deleted file mode 100644 index af04ab54dbe..00000000000 --- a/pkgs/tools/graphics/graphviz/2.24.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw -, yacc, libtool, fontconfig, pango, gd -}: - -assert libpng != null && libjpeg != null && expat != null; - -stdenv.mkDerivation rec { - name = "graphviz-2.24.0"; - - src = fetchurl { - url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "01182be7851ef6d292a916b19ac25a33bce5dccbd4661bf3101abbd3dfb1ae00"; - }; - - buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; - - configureFlags = - [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" - "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" - "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" - "--with-codegens" - ] - ++ stdenv.lib.optional (x11 == null) "--without-x"; - - meta = { - description = "A program for visualising graphs"; - homepage = http://www.graphviz.org/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 078f62707b3..029232a39fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -784,11 +784,6 @@ let inherit (gtkLibs) pango; }; - /* Last version to export to dia */ - graphviz_2_24 = callPackage ../tools/graphics/graphviz/2.0.nix { - inherit (gtkLibs) pango; - }; - /* Readded by Michael Raskin. There are programs in the wild * that do want 2.0 but not 2.22. Please give a day's notice for * objections before removal. From 6492a0383d5d1dae8c64688dd20f88ca86ead179 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Feb 2012 21:36:34 +0000 Subject: [PATCH 04/92] nginx: moved from sbin to bin, because it's useful for normal users too Committed on behalf of Mathijs Kwik. svn path=/nixpkgs/trunk/; revision=32407 --- pkgs/servers/http/nginx/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 6cdc57d11b5..4a1c0be649f 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2" ''; + postInstall = '' + mv $out/sbin $out/bin + ''; + meta = { description = "nginx - 'engine x' - reverse proxy and lightweight webserver"; maintainers = [ From c96d4bd72e5905f2ee8adffffca324e94e439388 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Feb 2012 21:36:54 +0000 Subject: [PATCH 05/92] and yet it moves: gravity/physics game Demo and commercial version are supported. This nix expression shows some of the techniques used to package closed-source binaries. Committed on behalf of Mathijs Kwik. svn path=/nixpkgs/trunk/; revision=32408 --- pkgs/games/andyetitmoves/default.nix | 75 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 77 insertions(+) create mode 100644 pkgs/games/andyetitmoves/default.nix diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix new file mode 100644 index 00000000000..0b54e828609 --- /dev/null +++ b/pkgs/games/andyetitmoves/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, libvorbis, libogg, libtheora, SDL, libXft, SDL_image, zlib, libX11, libpng, openal, requireFile, commercialVersion ? false }: + +let plainName = "andyetitmoves"; + version = "1.2.2"; +in + +stdenv.mkDerivation rec { + name = "${plainName}-${version}"; + + src = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" + then + let postfix = if stdenv.system == "i686-linux" then "i386" else "x86_64"; + commercialName = "${plainName}-${version}_${postfix}.tar.gz"; + demoUrl = "http://www.andyetitmoves.net/demo/${plainName}Demo-${version}_${postfix}.tar.gz"; + in + if commercialVersion + then requireFile { + message = '' + We cannot download the commercial version automatically, as you require a license. + Once you bought a license, you need to add your downloaded version to the nix store. + You can do this by using "nix-prefetch-url file:///\$PWD/${commercialName}" in the + directory where yousaved it. + ''; + name = commercialName; + sha256 = if stdenv.system == "i686-linux" + then "15wvzmmidvykwjrbnq70h5jrvnjx1hcrm0357qj85q4aqbzavh01" + else "1v8z16qa9ka8sf7qq45knsxj87s6sipvv3a7xq11pb5xk08fb2ql"; + } + else fetchurl { + url = demoUrl; + sha256 = if stdenv.system == "i686-linux" + then "0f14vrrbq05hsbdajrb5y9za65fpng1lc8f0adb4aaz27x7sh525" + else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4"; + } + else + abort "And Yet It Moves nix package only supports linux and intel cpu's."; + + phases = "unpackPhase installPhase"; + + installPhase = '' + ensureDir $out/{opt/andyetitmoves,bin} + cp -r * $out/opt/andyetitmoves/ + + fullPath=${stdenv.gcc.gcc}/lib64 + for i in $buildNativeInputs; do + fullPath=$fullPath''${fullPath:+:}$i/lib + done + + binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"} + + patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName + cat > $out/bin/$binName << EOF + #!/bin/sh + cd $out/opt/andyetitmoves + exec ./lib/$binName + EOF + chmod +x $out/bin/$binName + ''; + + buildInputs = [libvorbis libogg libtheora SDL libXft SDL_image zlib libX11 libpng openal]; + + meta = { + description = "Physics/Gravity Platform game"; + + longDescription = '' + And Yet It Moves is an award-winning physics-based platform game in which players rotate the game world at will to solve challenging puzzles. Tilting the world turns walls into floors, slides into platforms, and stacks of rocks into dangerous hazards. + ''; + + homepage = http://www.andyetitmoves.net/; + + license = "unfree"; + + maintainers = with stdenv.lib.maintainers; [bluescreen303]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 029232a39fc..97dae6ac2a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7852,6 +7852,8 @@ let alienarena = callPackage ../games/alienarena { }; + andyetitmoves = callPackage ../games/andyetitmoves {}; + asc = callPackage ../games/asc { lua = lua5; libsigcxx = libsigcxx12; From 4629d596ac82fcb2aa9deb209bb7adc1eed5a0d7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Feb 2012 23:32:43 +0000 Subject: [PATCH 06/92] all-packages.nix: define the 'andyetitmoves' attribute only on Linux platforms svn path=/nixpkgs/trunk/; revision=32410 --- 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 97dae6ac2a2..da7b88385b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7852,7 +7852,7 @@ let alienarena = callPackage ../games/alienarena { }; - andyetitmoves = callPackage ../games/andyetitmoves {}; + andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null; asc = callPackage ../games/asc { lua = lua5; From ebe141d306f28f110c0602d751470307221f0aa8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Feb 2012 01:14:57 +0000 Subject: [PATCH 07/92] * Updated dhcpcd to 5.5.4. svn path=/nixpkgs/trunk/; revision=32412 --- pkgs/tools/networking/dhcpcd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 34cd1d8ed26..e71bd9f2a86 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcpcd-5.0.6"; + name = "dhcpcd-5.5.4"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "0q8yz1kg9x031lnsvws010wawg0z85xv34575x1iavh3lrd90705"; + sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6"; }; makeFlags = "PREFIX=\${out}"; From 4c5aaf3736baf1f24dfa27d1e3ddea26647a3a17 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 20 Feb 2012 05:27:57 +0000 Subject: [PATCH 08/92] qtscriptgenerator: qt-4.8 patch svn path=/nixpkgs/trunk/; revision=32414 --- .../libraries/qtscriptgenerator/default.nix | 2 +- .../libraries/qtscriptgenerator/qt-4.8.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 913f4acdc7d..64e535bf272 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ qt4 ]; - patches = [./qtscriptgenerator.gcc-4.4.patch]; + patches = [ ./qtscriptgenerator.gcc-4.4.patch ./qt-4.8.patch ]; # Why isn't the author providing proper Makefile or a CMakeLists.txt ? buildPhase = '' diff --git a/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch new file mode 100644 index 00000000000..0b02b009725 --- /dev/null +++ b/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch @@ -0,0 +1,23 @@ +Origin: http://pkgs.fedoraproject.org/gitweb/?p=qtscriptgenerator.git;a=blob_plain;f=qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch;h=f397b5ab13bcfc268e6d7b7ba4c6bc66ae38b5c0;hb=HEAD +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml.no_QFileOpenEvent 2011-12-22 11:34:52.615149619 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui-common.xml 2011-12-22 11:35:31.808659632 -0600 +@@ -2233,7 +2233,6 @@ + + + +- + + + +diff -up qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml +--- qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml.no_QFileOpenEvent 2009-02-20 05:42:24.000000000 -0600 ++++ qtscriptgenerator-src-0.1.0/generator/typesystem_gui.xml 2011-12-22 11:33:43.058019203 -0600 +@@ -2555,7 +2555,6 @@ + + + +- + + + From af126735b23f0b55fb936503b629944e31af89ef Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 20 Feb 2012 05:28:03 +0000 Subject: [PATCH 09/92] amarok-2.5.0 svn path=/nixpkgs/trunk/; revision=32415 --- pkgs/applications/audio/amarok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 0b238312629..ad553c9db34 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "amarok"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "0242psqci1b6wfhrrds14h4c4qin9s83cxk1259d9hqcsgn4ir3c"; + sha256 = "0jc8fsrhshgfv441b2dgqk0wz3ms5bzjqchcj5ydxphg57dr3l8y"; }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; From 23856c2a40c5ccf94903be91ca5709e518d58fc7 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 20 Feb 2012 05:28:06 +0000 Subject: [PATCH 10/92] tbe needs which svn path=/nixpkgs/trunk/; revision=32416 --- pkgs/games/the-butterfly-effect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index bd1885f9bd9..caea5b4bb4f 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , qt4, box2d + , qt4, box2d, which ,fetchsvn , ...}: builderDefsPackage From 6e9ecace5033b7ce8faf325a806d7f069eaa2fd2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 10:44:49 +0000 Subject: [PATCH 11/92] haskell-SDL: updated to version 0.6.3 svn path=/nixpkgs/trunk/; revision=32418 --- pkgs/development/libraries/haskell/SDL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index 8adf60f938c..da1e8df9715 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "SDL"; - version = "0.6.2"; - sha256 = "1fqj3sw709q28rmjzcffa3k1mcp7r9cvdrrqmcppaz5yv63ychly"; + version = "0.6.3"; + sha256 = "0m3ick3rw8623ja42yfj4pa57naa6yb20ym8lv252gwb18ghp4sp"; extraLibraries = [ SDL ]; meta = { description = "Binding to libSDL"; From 037eafa2cfbb7b5ae73003ed8b8912917bc014e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 10:44:53 +0000 Subject: [PATCH 12/92] haskell-fclabels: updated to version 1.1.1.0 svn path=/nixpkgs/trunk/; revision=32419 --- pkgs/development/libraries/haskell/fclabels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index f93da3ee549..c310637cacd 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.0.2"; - sha256 = "19p3ghjmc6jrgzifm5vrsd3cp5xmccw811zczcmsk1xjr4ady95r"; + version = "1.1.1.0"; + sha256 = "1xkgqib7ya3l6m9bz5ly6x9k0n71jiydk8ss38rvn9j5gryv3las"; buildDepends = [ mtl transformers ]; meta = { description = "First class accessor labels"; From 2fc61e10104d04265e22d7c36b25c68a770b443c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 10:44:57 +0000 Subject: [PATCH 13/92] haskell-smallcheck: updated to version 0.6.1 svn path=/nixpkgs/trunk/; revision=32420 --- pkgs/development/libraries/haskell/smallcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index d8a9bf24f55..2193b818868 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "smallcheck"; - version = "0.6"; - sha256 = "19b2dyjbryx2a5bq70pn2mbzlcvjjwhii78fwwx6q57r13zljb9v"; + version = "0.6.1"; + sha256 = "1p2bsc08lcyzmqdjc5qsr60dr03kvc8xw7kk4lbi9cnn9s9w90vb"; buildDepends = [ dlist ]; meta = { homepage = "https://github.com/feuerbach/smallcheck"; From d2ef3f937c939cad3636d28128a7a94d52b68d76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 10:45:00 +0000 Subject: [PATCH 14/92] haskell-happstack-server: updated to version 6.6.3 svn path=/nixpkgs/trunk/; revision=32421 --- .../haskell/happstack/happstack-server.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index ec3f63d1eaa..77cf2cf00e5 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,18 +1,19 @@ -{ cabal, blazeHtml, extensibleExceptions, filepath, happstackData -, happstackUtil, hslogger, html, MaybeT, mtl, network, parsec -, sendfile, syb, text, time, utf8String, xhtml, zlib +{ cabal, base64Bytestring, blazeHtml, extensibleExceptions +, filepath, hslogger, html, monadControl, mtl, network, parsec +, sendfile, syb, text, time, transformers, transformersBase +, utf8String, xhtml, zlib }: cabal.mkDerivation (self: { pname = "happstack-server"; - version = "6.2.5"; - sha256 = "196s8i3v55i10nkapkvzyw048flshw8mlm604548f0qjciynfjmg"; + version = "6.6.3"; + sha256 = "0l1cv1syx1j8xvy5sjl6cj7l4zyizkmv6z8g038n8fwgsw130hm9"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml extensibleExceptions filepath happstackData happstackUtil - hslogger html MaybeT mtl network parsec sendfile syb text time - utf8String xhtml zlib + base64Bytestring blazeHtml extensibleExceptions filepath hslogger + html monadControl mtl network parsec sendfile syb text time + transformers transformersBase utf8String xhtml zlib ]; meta = { homepage = "http://happstack.com"; From 9cc0657c867137b7e04f2dbf6f7bf0f02d1054d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 10:45:02 +0000 Subject: [PATCH 15/92] haskell-hlint: updated to version 1.8.24 svn path=/nixpkgs/trunk/; revision=32422 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 76e102ff69c..0e5b1ae7aa0 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.23"; - sha256 = "0cbjnzs9ddk4z7kxh935x1kvr566afcvk98z3174f3xp5sbz79wr"; + version = "1.8.24"; + sha256 = "1crxhpgy49xg3j225cyfxflnc8zgck2xa8hb04chd0yh9n03h6kx"; isLibrary = true; isExecutable = true; buildDepends = [ From 1488d45699a6bb0a90093d43e572e7db0c319f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Feb 2012 13:05:21 +0000 Subject: [PATCH 16/92] Updating vdrift to 2011-10-22. There are newer source code files, but that's the newsest src+data tarball I could find. We should write an expression that can use the latest src with the latest data apart. svn path=/nixpkgs/trunk/; revision=32423 --- pkgs/games/vdrift/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 586bfc3e511..0f9da888382 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, mesa, SDL, scons, freeglut, SDL_image, glew, libvorbis, - asio, boost, SDL_gfx }: + asio, boost, SDL_gfx, pkgconfig, bullet, curl, libarchive }: stdenv.mkDerivation rec { - name = "vdrift-2010-06-30"; + name = "vdrift-2011-10-22"; src = fetchurl { url = "mirror://sourceforge/vdrift/${name}.tar.bz2"; - sha256 = "1zbh62363gx4ayyx4wcsp5di4f16qqfg2ajwkgw71kss6j7lk71j"; + sha256 = "0vg1v1590jbln6k236kxn2sfgclvc6g34kykhh4nq9q3l1xgy38s"; }; buildInputs = [ scons mesa SDL freeglut SDL_image glew libvorbis asio boost - SDL_gfx ]; + SDL_gfx pkgconfig bullet curl libarchive ]; buildPhase = '' sed -i -e s,/usr/local,$out, SConstruct From ccea8d08e98f3fdb0b948c4880e0eafab80341a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Feb 2012 13:37:33 +0000 Subject: [PATCH 17/92] * Zabbix updated to 1.8.10. svn path=/nixpkgs/trunk/; revision=32425 --- 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 41e617d80b6..0e695c6c107 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.7"; + version = "1.8.10"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1727y9yphff7ad9n843yls7rp9lh86m83jmrj6xr0ah45f02ja9d"; + sha256 = "0jx5i1ps1zr908g8gh1zisajiblg40x8cchmgbpdviz85hzx4rfr"; }; preConfigure = From 9c33ae3f2b4cbd2f731d7035ab35f724af7ed627 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Feb 2012 14:26:01 +0000 Subject: [PATCH 18/92] * Fix ugly wpa_supplicant expression. svn path=/nixpkgs/trunk/; revision=32427 --- .../linux/wpa_supplicant/default.nix | 84 +++++-------------- .../linux/wpa_supplicant/gui-qt4.nix | 15 ---- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 42 ++++++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 66 insertions(+), 77 deletions(-) delete mode 100644 pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix create mode 100644 pkgs/os-specific/linux/wpa_supplicant/gui.nix diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 6ffc2c5a059..b99f36c950a 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,17 +1,15 @@ -{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}: +{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl1 }: -let +stdenv.mkDerivation rec { version = "0.7.3"; + + name = "wpa_supplicant-${version}"; + src = fetchurl { url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz"; sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh"; }; -in - -(stdenv.mkDerivation rec { - name = "wpa_supplicant-${version}"; - inherit src; - + preBuild = '' cd wpa_supplicant cp -v defconfig .config @@ -23,24 +21,25 @@ in substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [openssl dbus_libs libnl1]; + buildInputs = [ openssl dbus_libs libnl1 ]; buildNativeInputs = [ pkgconfig ]; - # Upstream patch required for NetworkManager-0.9 - patches = [ (fetchurl { - url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; - name = "wpa_supplicant-nm-0.9.patch"; - sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8"; - }) - # wpa_supplicant crashes when controlled through dbus (wicd/nm) - # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625 - (fetchurl { - url = "https://bugzilla.redhat.com/attachment.cgi?id=491018"; - name = "dbus-assertion-fix.patch"; - sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a"; - }) - ]; + patches = + [ # Upstream patch required for NetworkManager-0.9 + (fetchurl { + url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; + name = "wpa_supplicant-nm-0.9.patch"; + sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8"; + }) + # wpa_supplicant crashes when controlled through dbus (wicd/nm) + # see: https://bugzilla.redhat.com/show_bug.cgi?id=678625 + (fetchurl { + url = "https://bugzilla.redhat.com/attachment.cgi?id=491018"; + name = "dbus-assertion-fix.patch"; + sha256 = "6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a"; + }) + ]; postInstall = '' ensureDir $out/share/man/man5 $out/share/man/man8 @@ -50,7 +49,7 @@ in cp -v dbus/*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/* cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d - ''; + ''; # */ meta = { homepage = http://hostap.epitest.fi/wpa_supplicant/; @@ -58,41 +57,4 @@ in maintainers = with stdenv.lib.maintainers; [marcweber urkud]; platforms = stdenv.lib.platforms.linux; }; -}) // { -gui = stdenv.mkDerivation { - name = "wpa_gui-${version}"; - - inherit src; - - buildInputs = [ qt4 ]; - - buildNativeInputs = [ inkscape ]; - - prePatch = "cd wpa_supplicant/wpa_gui-qt4"; - - configurePhase = '' - lrelease wpa_gui.pro - qmake''; - -# We do not install .xpm icons. First of all, I don't know where they should -# be install. Second, this allows us to drop imagemagick build-time dependency. - postBuild = '' - sed -e '/ICONS.*xpm/d' -i icons/Makefile - make -C icons - ''; - - installPhase = '' - mkdir -pv $out/bin - cp -v wpa_gui $out/bin - mkdir -pv $out/share/applications - cp -v wpa_gui.desktop $out/share/applications - mkdir -pv $out/share/icons - cp -av icons/hicolor $out/share/icons - ''; - - meta = { - description = "Qt4 wpa_supplicant client"; - inherit (qt4.meta) platforms; - }; -}; } diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix deleted file mode 100644 index 7b587cdd623..00000000000 --- a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, qt4, imagemagick, inkscape}: - -stdenv.mkDerivation rec { - pkgname = "wpa_supplicant"; - version = "0.6.9"; - name = "${pkgname}-gui-qt4-${version}"; - - src = fetchurl { - url = "http://hostap.epitest.fi/releases/${pkgname}-${version}.tar.gz"; - sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf"; - }; - - buildInputs = [qt4 imagemagick inkscape]; - builder = ./builder-gui-qt4.sh; -} diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix new file mode 100644 index 00000000000..12ec08361a6 --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, qt4, inkscape, wpa_supplicant }: + +stdenv.mkDerivation { + name = "wpa_gui-${wpa_supplicant.version}"; + + inherit (wpa_supplicant) src; + + buildInputs = [ qt4 ]; + + buildNativeInputs = [ inkscape ]; + + prePatch = "cd wpa_supplicant/wpa_gui-qt4"; + + configurePhase = + '' + lrelease wpa_gui.pro + qmake + ''; + + # We do not install .xpm icons. First of all, I don't know where they should + # be install. Second, this allows us to drop imagemagick build-time dependency. + postBuild = + '' + sed -e '/ICONS.*xpm/d' -i icons/Makefile + make -C icons + ''; + + installPhase = + '' + mkdir -pv $out/bin + cp -v wpa_gui $out/bin + mkdir -pv $out/share/applications + cp -v wpa_gui.desktop $out/share/applications + mkdir -pv $out/share/icons + cp -av icons/hicolor $out/share/icons + ''; + + meta = { + description = "Qt-based GUI for wpa_supplicant"; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da7b88385b6..b343872ca6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6270,7 +6270,7 @@ let wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; - wpa_supplicant_gui = pkgs.wpa_supplicant.gui; + wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { }; xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { }; From fd41f11208e9e986446c502b2d49ee101e0f3fc2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Feb 2012 15:12:34 +0000 Subject: [PATCH 19/92] * dhcpcd: get the entry/exit hooks from /etc. svn path=/nixpkgs/trunk/; revision=32429 --- pkgs/tools/networking/dhcpcd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index e71bd9f2a86..f23d0f41e11 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -8,11 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6"; }; + configureFlags = "--sysconfdir=/etc"; + makeFlags = "PREFIX=\${out}"; # Hack to make installation succeed. dhcpcd will still use /var/db # at runtime. - installFlags = "DBDIR=\${TMPDIR}/db"; + installFlags = "DBDIR=\${TMPDIR}/db SYSCONFDIR=$(out)/etc"; meta = { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; From 9a6cf14ef11b3ff114d6f8411119e7c6ab35df0f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Feb 2012 17:25:35 +0000 Subject: [PATCH 20/92] Fix tarball svn path=/nixpkgs/trunk/; revision=32432 --- pkgs/games/andyetitmoves/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 0b54e828609..6234d3702f7 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { else "0mg41ya0b27blq3b5498kwl4rj46dj21rcd7qd0rw1kyvr7sx4v4"; } else - abort "And Yet It Moves nix package only supports linux and intel cpu's."; + throw "And Yet It Moves nix package only supports linux and intel cpu's."; phases = "unpackPhase installPhase"; From 7f75de06325e00ba28dc93abbf3697bde9354d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Feb 2012 18:00:09 +0000 Subject: [PATCH 21/92] soqt, meshlab and paraview fail to build with qt 4.8. I set them for qt 4.7. svn path=/nixpkgs/trunk/; revision=32433 --- pkgs/top-level/all-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b343872ca6c..46ed9f5f598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4628,7 +4628,9 @@ let soprano = callPackage ../development/libraries/soprano { }; - soqt = callPackage ../development/libraries/soqt { }; + soqt = callPackage ../development/libraries/soqt { + qt4 = qt47; + }; speechd = callPackage ../development/libraries/speechd { }; @@ -7192,7 +7194,7 @@ let merkaartor = callPackage ../applications/misc/merkaartor { }; meshlab = callPackage ../applications/graphics/meshlab { - qt = qt4; + qt = qt47; }; midori = builderDefsPackage (import ../applications/networking/browsers/midori) { @@ -7350,6 +7352,7 @@ let }; paraview = callPackage ../applications/graphics/paraview { + qt4 = qt47; }; pdftk = callPackage ../tools/typesetting/pdftk { }; From 3a414e0292b834aec9be37d91a70a721f67463ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Feb 2012 18:20:12 +0000 Subject: [PATCH 22/92] Adding python-xlib svn path=/nixpkgs/trunk/; revision=32434 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77b10c10a07..302a1e28487 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2059,6 +2059,28 @@ let pythonPackages = python.modules // rec { wxGTK = pkgs.wxGTK28; }; + xlib = buildPythonPackage (rec { + name = "xlib-0.15rc1"; + + src = fetchurl { + url = "mirror://sourceforge/python-xlib/python-${name}.tar.bz2"; + sha256 = "0mvzz605pxzj7lfp2w6z4qglmr4rjza9xrb7sl8yn12cklzfky0m"; + }; + + # Tests require `pyutil' so disable them to avoid circular references. + doCheck = false; + + propagatedBuildInputs = [ pkgs.xlibs.libX11 ]; + + meta = { + description = "Fully functional X client library for Python programs"; + + homepage = http://python-xlib.sourceforge.net/; + + license = "GPLv2+"; + }; + }); + zbase32 = buildPythonPackage (rec { name = "zbase32-1.1.2"; From 95cbf4ed555669bea9f0ea37678665db452c2cd8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 18:52:52 +0000 Subject: [PATCH 23/92] Modified the Python 2.7 expression so that the interpreter has unconditional OpenSSL support. Having OpenSSL available at the time the core interpreter is built enables all kinds of important crypto features (i.e. additional hashlib algorithms, etc.) that otherwise won't be available. svn path=/nixpkgs/trunk/; revision=32435 --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- pkgs/development/interpreters/python/2.7/default.nix | 7 +------ pkgs/tools/networking/offlineimap/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 6 ++---- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 976963e684b..6118bee4390 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip -, guiSupport ? false, tk ? null, ssl, curses }: +, guiSupport ? false, tk ? null, curses }: let name = "mercurial-2.0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; inherit python; # pass it so that the same version can be used in hg2git - pythonPackages = [ ssl curses ]; + pythonPackages = [ curses ]; buildInputs = [ python makeWrapper docutils unzip ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \ $WRAP_TK done diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 1c8ae0cf171..635d50dc5b3 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -38,7 +38,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 ] + [ bzip2 openssl ] ++ optional zlibSupport zlib ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; @@ -172,11 +172,6 @@ let deps = [ sqlite ]; }; - ssl = buildInternalPythonModule { - moduleName = "ssl"; - deps = [ openssl ]; - }; - tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 8f0dd8e9a6c..007c8f7c6e0 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPythonPackage, ssl }: +{ fetchurl, buildPythonPackage }: buildPythonPackage { name = "offlineimap-6.2.0.2"; @@ -8,8 +8,6 @@ buildPythonPackage { sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c"; }; - propagatedBuildInputs = [ ssl ]; - doCheck = false; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46ed9f5f598..310061a4049 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1110,9 +1110,7 @@ let odt2txt = callPackage ../tools/text/odt2txt { }; - offlineimap = callPackage ../tools/networking/offlineimap { - ssl = pythonPackages.ssl; - }; + offlineimap = callPackage ../tools/networking/offlineimap { }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -7185,7 +7183,7 @@ let }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) ssl curses; + inherit (pythonPackages) curses; guiSupport = false; # use mercurialFull to get hgk GUI }; From 45fed14272a77311b7ee7ab89d52629bfa084765 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 20 Feb 2012 18:59:43 +0000 Subject: [PATCH 24/92] * Revert r32435. We'll be doing a stdenv merge in a few days, so let's put it in there rather than having the Nth near-complete rebuild of the trunk in a few days. svn path=/nixpkgs/trunk/; revision=32436 --- .../version-management/git-and-tools/svn2git/default.nix | 6 +++--- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- pkgs/development/interpreters/python/2.7/default.nix | 7 ++++++- pkgs/tools/networking/offlineimap/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 6 ++++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 534a00a357b..6f5d36f6aa7 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, ruby, makeWrapper, git }: stdenv.mkDerivation rec { - name = "svn2git-2.2.0"; + name = "svn2git-2.1.0-20111206"; src = fetchgit { url = https://github.com/nirvdrum/svn2git; - rev = "db0769835e9d1d3ff324091a3bb7756200a09932"; - sha256 = "6d2f2acb9900e2aa8e608d3239b42f890f2334b622adb5ea33b2b4815a52efa2"; + rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848"; + sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca"; }; buildInputs = [ ruby makeWrapper ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 6118bee4390..976963e684b 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip -, guiSupport ? false, tk ? null, curses }: +, guiSupport ? false, tk ? null, ssl, curses }: let name = "mercurial-2.0.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; inherit python; # pass it so that the same version can be used in hg2git - pythonPackages = [ curses ]; + pythonPackages = [ ssl curses ]; buildInputs = [ python makeWrapper docutils unzip ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --prefix PYTHONPATH : "$(toPythonPath "$out ${curses}")" \ + --prefix PYTHONPATH : "$(toPythonPath "$out ${ssl} ${curses}")" \ $WRAP_TK done diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 635d50dc5b3..1c8ae0cf171 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -38,7 +38,7 @@ let buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] + [ bzip2 ] ++ optional zlibSupport zlib ++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ]; @@ -172,6 +172,11 @@ let deps = [ sqlite ]; }; + ssl = buildInternalPythonModule { + moduleName = "ssl"; + deps = [ openssl ]; + }; + tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 007c8f7c6e0..8f0dd8e9a6c 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, buildPythonPackage }: +{ fetchurl, buildPythonPackage, ssl }: buildPythonPackage { name = "offlineimap-6.2.0.2"; @@ -8,6 +8,8 @@ buildPythonPackage { sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c"; }; + propagatedBuildInputs = [ ssl ]; + doCheck = false; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 310061a4049..46ed9f5f598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1110,7 +1110,9 @@ let odt2txt = callPackage ../tools/text/odt2txt { }; - offlineimap = callPackage ../tools/networking/offlineimap { }; + offlineimap = callPackage ../tools/networking/offlineimap { + ssl = pythonPackages.ssl; + }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -7183,7 +7185,7 @@ let }; mercurial = callPackage ../applications/version-management/mercurial { - inherit (pythonPackages) curses; + inherit (pythonPackages) ssl curses; guiSupport = false; # use mercurialFull to get hgk GUI }; From 1dd8249087d7068c92b31ffcd007340b57ee442f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 19:03:12 +0000 Subject: [PATCH 25/92] haskell-hxt: updated to version 9.2.1 svn path=/nixpkgs/trunk/; revision=32437 --- pkgs/development/libraries/haskell/hxt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 3b7a197c49e..cc1827ac342 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hxt"; - version = "9.2.0"; - sha256 = "182yl4ksh4hg332b0lnk4s9cfqxsnnan7p5vqas5lbxvibmg68zc"; + version = "9.2.1"; + sha256 = "0172icb36wx4fb6q3xq7pcs85d2hnn4bznq3wjwhval10mayri8y"; buildDepends = [ binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema hxtUnicode mtl network parsec From 19b43c8f425f5981e8aee71adda0bde287c944ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2012 19:03:15 +0000 Subject: [PATCH 26/92] haskell-yesod-core: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=32438 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 7699e4d291b..da26265739e 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.10.1"; - sha256 = "011bxz0wjd349jhwxh0cs1lhqpjgwq57ia8wzxf21bcwy8c08nj0"; + version = "0.10.2"; + sha256 = "0ghfnpav5d0kzzl3vs4932kf0dgys3ad0658xcyf6i5k0izvkzfp"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes liftedBase From f2cece41e34bfe243cd2d83cf0326b3e3e46552f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Feb 2012 21:35:05 +0000 Subject: [PATCH 27/92] Adding Skype4Py. svn path=/nixpkgs/trunk/; revision=32442 --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 302a1e28487..96928ba41a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1822,6 +1822,35 @@ let pythonPackages = python.modules // rec { }; }); + skype4py = buildPythonPackage (rec { + name = "Skype4Py-1.0.32.0"; + + src = fetchurl { + url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz; + sha256 = "0cmkrv450wa8v50bng5dflpwkl5c1p9pzysjkb2956w5kvwh6f5b"; + }; + + unpackPhase = '' + tar xf $src + find . -type d -exec chmod +rx {} \; + sourceRoot=`pwd`/`ls -d S*` + ''; + + doCheck = false; + + propagatedBuildInputs = [ pkgs.xlibs.libX11 ]; + + meta = { + description = "High-level, platform independent Skype API wrapper for Python"; + + # The advertisement says https://developer.skype.com/wiki/Skype4Py + # but that url does not work. This following web page points to the + # download link and has some information about the package. + homepage = http://pypi.python.org/pypi/Skype4Py/1.0.32.0; + + license = "BSD"; + }; + }); sphinx = buildPythonPackage (rec { name = "Sphinx-1.0.7"; From b4f548ff413bf48ca2215f2f533232e1e72bf678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Feb 2012 21:49:05 +0000 Subject: [PATCH 28/92] Fixing Skype4Py (build inputs) svn path=/nixpkgs/trunk/; revision=32443 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96928ba41a5..7f442e55698 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1838,7 +1838,7 @@ let pythonPackages = python.modules // rec { doCheck = false; - propagatedBuildInputs = [ pkgs.xlibs.libX11 ]; + propagatedBuildInputs = [ pkgs.xlibs.libX11 pkgs.pythonDBus pkgs.pygobject ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; From 869543fa05eb42f0d8da3fb8e8958263489fa823 Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 21 Feb 2012 09:01:56 +0000 Subject: [PATCH 29/92] Updated the hash of texlive's 'moderncv.zip'. Apparently the file gets updated once in a while. It does not have a version number either. Not very nice. svn path=/nixpkgs/trunk/; revision=32444 --- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 9e3f68f36b1..b8e27bd93d3 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -3,7 +3,7 @@ rec { name = "moderncv-2012.01.16"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip"; - sha256 = "1sfpj76p0z128rvxw0svh7dfrvf3zhmi3v7bkzfkll4byij34ni0"; + sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644"; }; buildInputs = [texLive unzip]; From 9843a6f1006a75d7fc83a16663da6610ec6fdbaf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 10:07:08 +0000 Subject: [PATCH 30/92] yesod-core: disable haddock phase in this version of the package to avoid build failures because of syntax errors in the documentation The bug has been reported upstream. svn path=/nixpkgs/trunk/; revision=32446 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index da26265739e..1dac677e945 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { shakespeareI18n shakespeareJs text time transformers transformersBase vector wai waiExtra waiLogger yesodRoutes ]; + noHaddock = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; From 80118756811fd61b4f9ac61987fbd9b137a75495 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 10:07:10 +0000 Subject: [PATCH 31/92] haskell-conduit: updated to version 0.2.2 svn path=/nixpkgs/trunk/; revision=32447 --- pkgs/development/libraries/haskell/conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index d1a26389c7a..e2963b2ad20 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "0.2.1"; - sha256 = "1350n6nylvn62pdnm1cpm75yli9x3adf9m9jjz04z0gmzd3mvhd9"; + version = "0.2.2"; + sha256 = "1iwmf0zdrrxh8q3xja742j17nanj6va5zj9bs9a5m78whf8cc80j"; buildDepends = [ liftedBase monadControl text transformers transformersBase ]; From eac41535743652a4bb55468d2f1337fc4c80aa57 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 10:07:12 +0000 Subject: [PATCH 32/92] haskell-yesod-form: updated to version 0.4.2 svn path=/nixpkgs/trunk/; revision=32448 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 3b1d6e9170d..981f5500f49 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "0.4.1"; - sha256 = "0l55n7zml3sf8f2qmmii5cq53awajc4vfr5msrm8kvi3ivzjld0s"; + version = "0.4.2"; + sha256 = "0vl938ngf8lbpylra9wmywgcdffi9prhbz45d6cl1hra9hlsavj6"; buildDepends = [ blazeBuilder blazeHtml dataDefault emailValidate hamlet network persistent shakespeareCss shakespeareJs text time transformers wai From f8703e3b25bd6938a6b68e4bc662b5add10549a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 10:09:34 +0000 Subject: [PATCH 33/92] haskell-packages.nix: updated version of HUnit used by GHC 7.4.1 svn path=/nixpkgs/trunk/; revision=32449 --- pkgs/top-level/haskell-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 53d495eb4c5..85f76d42787 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -139,7 +139,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); GLUT = self.GLUT_2_3_0_0; # 7.4.1 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.4.1 ok html = self.html_1_0_1_2; # 7.4.1 ok - HUnit = self.HUnit_1_2_2_3; # 7.4.1 ok + HUnit = self.HUnit_1_2_4_2; # 7.4.1 ok network = self.network_2_3_0_11; # 7.4.1 ok OpenGL = self.OpenGL_2_5_0_0; # 7.4.1 ok parallel = self.parallel_3_2_0_2; # 7.4.1 ok @@ -907,7 +907,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); HUnit_1_2_2_1 = callPackage ../development/libraries/haskell/HUnit/1.2.2.1.nix {}; HUnit_1_2_2_3 = callPackage ../development/libraries/haskell/HUnit/1.2.2.3.nix {}; HUnit_1_2_4_2 = callPackage ../development/libraries/haskell/HUnit/1.2.4.2.nix {}; - HUnit = self.HUnit_1_2_0_3; + HUnit = self.HUnit_1_2_4_2; hxt = callPackage ../development/libraries/haskell/hxt {}; From 4e76d21c848d19eb3f7074e87689ed120bd5c9fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 10:58:15 +0000 Subject: [PATCH 34/92] nbd: updated to version 3.0 svn path=/nixpkgs/trunk/; revision=32450 --- ...or-HAVE_FALLOC_PH-in-both-occurrence.patch | 25 ------------------- pkgs/tools/networking/nbd/default.nix | 6 ++--- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch diff --git a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch b/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch deleted file mode 100644 index e4bb0db3abf..00000000000 --- a/pkgs/tools/networking/nbd/0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 42d3c4e7e95ea0e0dda9b502b2de2c4ed9ed9467 Mon Sep 17 00:00:00 2001 -From: "T.M. Abraham" -Date: Fri, 6 Jan 2012 21:58:55 -0500 -Subject: [PATCH] properly check for HAVE_FALLOC_PH in both occurrences - ---- - nbd-server.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/nbd-server.c b/nbd-server.c -index 0ecf0e8..2cd066d 100644 ---- a/nbd-server.c -+++ b/nbd-server.c -@@ -1461,7 +1461,7 @@ int expflush(CLIENT *client) { - * file to resparsify stuff that isn't needed anymore (see NBD_CMD_TRIM) - */ - int exptrim(struct nbd_request* req, CLIENT* client) { --#ifdef HAVE_FALLOC_PH -+#if HAVE_FALLOC_PH - FILE_INFO prev = g_array_index(client->export, FILE_INFO, 0); - FILE_INFO cur = prev; - int i = 1; --- -1.7.8 - diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index ea2fbe5bc57..cf3f41f7acc 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-2.9.25"; + name = "nbd-3.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "179548406aa2bcb0c6bff3aa0484dbb04136ec055aa385c84fefbe3c9ea96ba4"; + sha256 = "f7210edfa858f5ae69bdbf76f5467ac9dcaa97074d945e55e2a683e7aa228b93"; }; - patches = [ ./0001-properly-check-for-HAVE_FALLOC_PH-in-both-occurrence.patch ]; - buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; From a81366984eddd197fc41cbc5ec881ade59273c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 11:34:57 +0000 Subject: [PATCH 35/92] Updating octave to 3.6.0 svn path=/nixpkgs/trunk/; revision=32451 --- .../interpreters/octave/default.nix | 22 ++++++++++++------- .../development/libraries/clapack/default.nix | 11 +++++++--- pkgs/top-level/all-packages.nix | 7 +++--- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index f873f4e7475..1bb8cbe247b 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,13 +1,19 @@ {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, -libX11, graphicsmagick}: +libX11, graphicsmagick, pcre, blas, clapack, texLive }: -stdenv.mkDerivation { - name = "octave-3.2.4"; +stdenv.mkDerivation rec { + name = "octave-3.6.0"; src = fetchurl { - url = ftp://ftp.octave.org/pub/octave/octave-3.2.4.tar.bz2; - sha256 = "0iyivx7qz7cvwz7qczqrl4ysqivlhn5ax92z9md0m77dqw2isis8"; + url = "mirror://gnu/octave/${name}.tar.bz2"; + sha256 = "1mwj5pbbdzfbmcqyk0vx6si7mh8yhayppwnb1i63v871gxy775z5"; }; - buildInputs = [gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick ]; - configureFlags = "--enable-readline --enable-dl"; + + buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 + graphicsmagick pcre blas clapack texLive ]; + + NIX_LDFLAGS = "-lf2c"; # For clapack + + enableParallelBuilding = true; + + configureFlags = "--enable-readline --enable-dl --disable-docs"; } diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix index a40044ee3a3..6b10d31e111 100644 --- a/pkgs/development/libraries/clapack/default.nix +++ b/pkgs/development/libraries/clapack/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake}: +{stdenv, fetchurl, cmake, withPIC ? false }: stdenv.mkDerivation rec { name = "clapack-3.2.1"; @@ -16,8 +16,13 @@ stdenv.mkDerivation rec { cp ../INCLUDE/* $out/include ''; - doCheck = true; - checkPhase = "ctest"; + cmakeFlags = if withPIC then "-DCMAKE_C_FLAGS=-fPIC" else ""; + + # We disable the test phase, because some tests fail. + # Forums say it's normal for some to fail: + # http://icl.cs.utk.edu/lapack-forum/viewtopic.php?f=2&t=167 + # doCheck = true; + # checkPhase = "ctest"; meta = { homepage = http://www.netlib.org/clapack/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46ed9f5f598..8c2a7736a7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2665,10 +2665,9 @@ let maude = callPackage ../development/interpreters/maude { }; octave = callPackage ../development/interpreters/octave { - # Needed because later gm versions require an initialization the actual octave is not - # doing. - # http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-February/015295.html - graphicsmagick = graphicsmagick137; + clapack = clapack.override { + withPIC = true; + }; }; # mercurial (hg) bleeding edge version From 743c7e35391eafacf0a3ce2012101ea16fbc7727 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 21 Feb 2012 12:57:23 +0000 Subject: [PATCH 36/92] Let hydra build paraview with qt-4.7 and qt-4.8 svn path=/nixpkgs/trunk/; revision=32452 --- pkgs/applications/graphics/paraview/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 0c00553f271..ba67a755de4 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -3,7 +3,7 @@ , mpich2 , python , libxml2 -, mesa +, mesa, libXt }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ]; + buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ]; meta = { homepage = "http://www.paraview.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c2a7736a7d..8936f6fd700 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7354,6 +7354,8 @@ let qt4 = qt47; }; + paraviewQt48 = paraview.override { qt4 = qt48; }; + pdftk = callPackage ../tools/typesetting/pdftk { }; pidgin = callPackage ../applications/networking/instant-messengers/pidgin { From 6c796fa5393a6143fe0205192b753532377a3513 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 13:39:29 +0000 Subject: [PATCH 37/92] haskell-yesod-core: updated to version 0.10.2.1 svn path=/nixpkgs/trunk/; revision=32453 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 1dac677e945..208f4e82b0e 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "0.10.2"; - sha256 = "0ghfnpav5d0kzzl3vs4932kf0dgys3ad0658xcyf6i5k0izvkzfp"; + version = "0.10.2.1"; + sha256 = "00cw31k6fkffryiqji33x56hqxivwg2c3rgaqmplph9zjpndvgb2"; buildDepends = [ aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession conduit cookie failure fastLogger hamlet httpTypes liftedBase From 8229dc4357f58cf8dc334d9394c22769480e5ced Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 21 Feb 2012 13:52:32 +0000 Subject: [PATCH 38/92] Trying to fix soqt for qt-4.8 svn path=/nixpkgs/trunk/; revision=32454 --- pkgs/development/libraries/soqt/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index f5a7724c506..60b148f870e 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, coin3d, qt4 }: +{ fetchurl, stdenv, coin3d, qt4, pkgconfig }: stdenv.mkDerivation rec { name = "soqt-${version}"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ coin3d qt4 ]; + buildNativeInputs = [ pkgconfig ]; + meta = { homepage = http://www.coin3d.org/; license = "GPLv2+"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8936f6fd700..2d14d943567 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4631,6 +4631,8 @@ let qt4 = qt47; }; + soqtQt48 = soqt.override { qt4 = qt48; }; + speechd = callPackage ../development/libraries/speechd { }; speech_tools = callPackage ../development/libraries/speech-tools {}; From a2838873883425d5a83c68b5b06b52412a21248f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 21 Feb 2012 14:45:53 +0000 Subject: [PATCH 39/92] Xfig: Fix URL; add `meta.platforms'. svn path=/nixpkgs/trunk/; revision=32457 --- pkgs/applications/graphics/xfig/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 80c28461992..e4ab5798918 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xfig-${version}"; src = fetchurl { - url = "http://sourceforge/mcj/xfig.${version}.full.tar.gz"; + url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz"; sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw"; }; @@ -40,5 +40,6 @@ stdenv.mkDerivation { meta = { description = "An interactive drawing tool for X11"; homepage = http://xfig.org; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } From 2847a37fa96885d76758c5ef8e807a7403fd1ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 14:49:36 +0000 Subject: [PATCH 40/92] Updating atlas to 3.9.67, the latest development version svn path=/nixpkgs/trunk/; revision=32458 --- pkgs/development/libraries/science/math/atlas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index e2d9083eda4..1c5e0d9068e 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gfortran }: stdenv.mkDerivation { - name = "atlas-3.9.11"; + name = "atlas-3.9.67"; src = fetchurl { - url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2; - sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677"; + url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2; + sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; }; # configure outside of the source directory From da2159548a3973ea92dca2f28ef73ce4ec773061 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 15:07:39 +0000 Subject: [PATCH 41/92] nbd: avoid use of "install -D", which doesn't seem to work on FreeBSD svn path=/nixpkgs/trunk/; revision=32459 --- pkgs/tools/networking/nbd/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index cf3f41f7acc..929db017152 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; - postInstall = ''install -D -m 444 README "$out/share/doc/nbd/README"''; + postInstall = '' + mkdir -p "$out/share/doc/${name}" + cp README "$out/share/doc/${name}/README" + ''; # The test suite doesn't succeed on Hydra. doCheck = false; From 47e9932cd283c877c7e56e7a0af32ac247bbb6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 15:45:22 +0000 Subject: [PATCH 42/92] I attempted to get octave 3.4.3 working with atlas, but it also builds and crashes at plot(1), as 3.6.0 also did. I don't know what's wrong there. Program received signal SIGSEGV, Segmentation fault. 0x00007ffff694e3ad in dtrtri_ Exact as 3.6.0. I'll revert to the old octave version that worked without any blas or lapack implementation. --This line, and those below, will be ignored-e- M pkgs/development/interpreters/octave/default.nix svn path=/nixpkgs/trunk/; revision=32460 --- pkgs/development/interpreters/octave/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 1bb8cbe247b..84374e1e3d5 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,19 +1,21 @@ {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, -libX11, graphicsmagick, pcre, blas, clapack, texLive }: +libX11, graphicsmagick, pcre, atlas, clapack, texLive }: stdenv.mkDerivation rec { - name = "octave-3.6.0"; + name = "octave-3.4.3"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "1mwj5pbbdzfbmcqyk0vx6si7mh8yhayppwnb1i63v871gxy775z5"; + sha256 = "0j61kpfbv8l8rw3r9cwcmskvvav3q2f6plqdq3lnb153jg61klcl"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre blas clapack texLive ]; - - NIX_LDFLAGS = "-lf2c"; # For clapack + graphicsmagick pcre clapack atlas texLive ]; enableParallelBuilding = true; - configureFlags = "--enable-readline --enable-dl --disable-docs"; + preConfigure = '' + configureFlagsArray=('--with-blas=-L${atlas}/lib -lf77blas -latlas' + '--with-lapack=-L${clapack}/lib -llapack -lf2c') + ''; + configureFlags = [ "--enable-readline" "--enable-dl" ]; } From bbc7b115729d79070a09ec192d9970877c62bfc5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 21 Feb 2012 16:41:30 +0000 Subject: [PATCH 43/92] haskell-dimensional: updated to version 0.10.2 svn path=/nixpkgs/trunk/; revision=32461 --- pkgs/development/libraries/haskell/dimensional/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 35b5a8d2440..d36f351fcf6 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.10.1.2"; - sha256 = "0hdiwyzr4zzwz5h8m7nrcdf85n00byjchr6ghbasnsg3vg9p17wn"; + version = "0.10.2"; + sha256 = "14idyacd38a2kc97hp773j8iiim2lxh9czr8gp12m66w4n603znn"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; From fa990884eccc36db960379e23c87f8491948b3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 18:19:00 +0000 Subject: [PATCH 44/92] Adding TaskCoach. svn path=/nixpkgs/trunk/; revision=32462 --- pkgs/top-level/python-packages.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f442e55698..6ed0c5ec8d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1917,6 +1917,32 @@ let pythonPackages = python.modules // rec { }; }; + taskcoach = buildPythonPackage rec { + name = "TaskCoach-1.3.7"; + + src = fetchurl { + url = "mirror://sourceforge/taskcoach/${name}.tar.gz"; + sha256 = "069hyxc8ypn51a8imfkfqdalp1l4pv09swj2v3bi4hjscq9af6i8"; + }; + + propagatedBuildInputs = [ wxPython ]; + + # I don't know why I need to add these libraries. Shouldn't they + # be part of wxPython? + postInstall = '' + libspaths=${pkgs.xlibs.libSM}/lib:${pkgs.xlibs.libXScrnSaver}/lib + wrapProgram $out/bin/taskcoach.py \ + --prefix LD_LIBRARY_PATH : $libspaths + ''; + + doCheck = false; + + meta = { + homepage = http://taskcoach.org/; + description = "A very small text templating language"; + license = "GPLv3+"; + }; + }; tempita = buildPythonPackage rec { version = "0.4"; From 8cb96ff7b221c309f8f69db839fb851b06af1207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 18:22:38 +0000 Subject: [PATCH 45/92] Fixing the description of TaskCoach. I committed too fast. svn path=/nixpkgs/trunk/; revision=32463 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ed0c5ec8d7..35de47cc5e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1939,7 +1939,7 @@ let pythonPackages = python.modules // rec { meta = { homepage = http://taskcoach.org/; - description = "A very small text templating language"; + description = "Todo manager to keep track of personal tasks and todo lists"; license = "GPLv3+"; }; }; From 5e2de19cc1ad78d942c82c2a8ee389482015a4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 21:43:44 +0000 Subject: [PATCH 46/92] Fixing octave, so plot(1) works. Linking octave with clapack did not work. I updated lapack, and additionally I build it with atlas, instead of blas. That should give better performance. I don't know if atlas builds everywhere though. On the other hand, maybe some programs linking with liblapack will fail. We'll have to check the hydra reports. I plan to remove clapack; liblapack provides a C interface too. svn path=/nixpkgs/trunk/; revision=32464 --- .../interpreters/octave/default.nix | 8 +-- .../science/math/liblapack/blas-link.patch | 24 ------- .../science/math/liblapack/default.nix | 69 ++++--------------- pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 16 insertions(+), 91 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/liblapack/blas-link.patch diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 84374e1e3d5..439b687dace 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, -libX11, graphicsmagick, pcre, atlas, clapack, texLive }: +libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig }: stdenv.mkDerivation rec { name = "octave-3.4.3"; @@ -9,13 +9,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre clapack atlas texLive ]; + graphicsmagick pcre liblapack texLive pkgconfig ]; enableParallelBuilding = true; - preConfigure = '' - configureFlagsArray=('--with-blas=-L${atlas}/lib -lf77blas -latlas' - '--with-lapack=-L${clapack}/lib -llapack -lf2c') - ''; configureFlags = [ "--enable-readline" "--enable-dl" ]; } diff --git a/pkgs/development/libraries/science/math/liblapack/blas-link.patch b/pkgs/development/libraries/science/math/liblapack/blas-link.patch deleted file mode 100644 index e1ff853a291..00000000000 --- a/pkgs/development/libraries/science/math/liblapack/blas-link.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur lapack-3.2.old/SRC/Makefile lapack-3.2/SRC/Makefile ---- lapack-3.2.old/SRC/Makefile 2009-02-04 11:33:35.006839507 +0100 -+++ lapack-3.2/SRC/Makefile 2009-02-04 11:33:51.987551506 +0100 -@@ -367,7 +367,7 @@ - $(ALLAUX) - - ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) -- $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) -+ $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) ${BLASLIB} - $(RANLIB) $@ - - single: $(SLASRC) $(ALLAUX) $(SCLAUX) -diff -Naur lapack-3.2.old/TESTING/MATGEN/Makefile lapack-3.2/TESTING/MATGEN/Makefile ---- lapack-3.2.old/TESTING/MATGEN/Makefile 2009-02-04 11:35:10.426806473 +0100 -+++ lapack-3.2/TESTING/MATGEN/Makefile 2009-02-04 11:34:42.850565181 +0100 -@@ -60,7 +60,7 @@ - - ../../$(TMGLIB): $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN) \ - $(ZMATGEN) $(DZATGEN) -- $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) -+ $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) ${BLASLIB} - $(RANLIB) $@ - - single: $(SMATGEN) $(SCATGEN) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index a731360be56..acede395c84 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,66 +1,23 @@ -{ stdenv, fetchurl, gfortran, blas }: +{ stdenv, fetchurl, gfortran, atlas, cmake }: stdenv.mkDerivation { - name = "liblapack-3.2.1"; + name = "liblapack-3.4.0"; src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-3.2.1.tgz"; - sha256 = "5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d"; + url = "http://www.netlib.org/lapack/lapack-3.4.0.tgz"; + sha256 = "1sf30v1ps5icg67dvw5sbx5yhypx13am470gqg2f7l04f3wrw4x7"; }; - buildInputs = [gfortran blas]; - patches = [ ./blas-link.patch ]; + propagatedBuildInputs = [ atlas ]; + buildInputs = [ gfortran cmake ]; - configurePhase = '' - echo >make.inc "SHELL = ${stdenv.shell}" - echo >>make.inc "PLAT =" - echo >>make.inc "FORTRAN = gfortran" - echo >>make.inc "OPTS = -O2 -fPIC" - echo >>make.inc "DRVOPTS = \$(OPTS)" - echo >>make.inc "NOOPT = -O0 -fPIC" - echo >>make.inc "LOADER = gfortran" - echo >>make.inc "LOADOPTS =" - echo >>make.inc "TIMER = INT_ETIME" - echo >>make.inc "ARCH = gfortran" - echo >>make.inc "ARCHFLAGS = -shared -o" - echo >>make.inc "RANLIB = echo" - echo >>make.inc "BLASLIB = -lblas" - echo >>make.inc "LAPACKLIB = liblapack.so.3" - echo >>make.inc "TMGLIB = libtmglib.so.3" - echo >>make.inc "EIGSRCLIB = libeigsrc.so.3" - echo >>make.inc "LINSRCLIB = liblinsrc.so.3" - ''; + cmakeFlags = [ + "-DUSE_OPTIMIZED_BLAS=ON" + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlas}/lib/libf77blas.a" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlas}/lib/libatlas.a" + "-DCMAKE_Fortran_FLAGS=-fPIC" + ]; - buildPhase = '' - make clean - make lib - echo >make.inc "SHELL = ${stdenv.shell}" - echo >>make.inc "PLAT =" - echo >>make.inc "FORTRAN = gfortran" - echo >>make.inc "OPTS = -O2 -fPIC" - echo >>make.inc "DRVOPTS = \$(OPTS)" - echo >>make.inc "NOOPT = -O0 -fPIC" - echo >>make.inc "LOADER = gfortran" - echo >>make.inc "LOADOPTS = " - echo >>make.inc "TIMER = INT_ETIME" - echo >>make.inc "ARCH = ar rcs" - echo >>make.inc "RANLIB = ranlib" - echo >>make.inc "BLASLIB = " - echo >>make.inc "ARCHFLAGS =" - echo >>make.inc "LAPACKLIB = liblapack.a" - echo >>make.inc "TMGLIB = tmglib.a" - echo >>make.inc "EIGSRCLIB = eigsrc.a" - echo >>make.inc "LINSRCLIB = linsrc.a" - make clean - make lib - ''; - - installPhase = '' - ensureDir "$out/lib" - install -m755 *.a* "$out/lib" - install -m755 *.so* "$out/lib" - ln -sf liblapack.so.3 "$out/lib/liblapack.so" - ln -sf libtmglib.so.3 "$out/lib/libtmglib.so" - ''; + enableParallelBuilding = true; meta = { description = "Linear Algebra PACKage"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d14d943567..c6952e7f54b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2664,11 +2664,7 @@ let maude = callPackage ../development/interpreters/maude { }; - octave = callPackage ../development/interpreters/octave { - clapack = clapack.override { - withPIC = true; - }; - }; + octave = callPackage ../development/interpreters/octave { }; # mercurial (hg) bleeding edge version octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; From b5a904153b45012c22e65298d2cc1b61eca9ebe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 22:09:48 +0000 Subject: [PATCH 47/92] Building octave with mesa and fltk to have the new fltk graphics toolkit available. I also add more libs octave appreciates for some functions. I've not tested the graphics toolkit, but it builds. svn path=/nixpkgs/trunk/; revision=32465 --- pkgs/development/interpreters/octave/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 439b687dace..6bb3431668f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,6 @@ {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, -libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig }: +libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, +fftw, fftwSinglePrec, zlib, curl }: stdenv.mkDerivation rec { name = "octave-3.4.3"; @@ -9,7 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre liblapack texLive pkgconfig ]; + graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl + fftw fftwSinglePrec ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6952e7f54b..36cffb34b88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2664,7 +2664,9 @@ let maude = callPackage ../development/interpreters/maude { }; - octave = callPackage ../development/interpreters/octave { }; + octave = callPackage ../development/interpreters/octave { + fltk = fltk13; + }; # mercurial (hg) bleeding edge version octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; From fb12a6838f1fda1d6ace53d0d97a548a1e427ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 22:16:33 +0000 Subject: [PATCH 48/92] I remove clapack, and an unused reference I found. Now liblapack provides a c interface too. svn path=/nixpkgs/trunk/; revision=32466 --- .../applications/graphics/digikam/default.nix | 2 +- .../development/libraries/clapack/default.nix | 32 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/development/libraries/clapack/default.nix diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 4467ae338e4..1c152195d68 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff, liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost, -shared_desktop_ontologies, marble, clapack, mysql }: +shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { name = "digikam-2.5.0"; diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix deleted file mode 100644 index 6b10d31e111..00000000000 --- a/pkgs/development/libraries/clapack/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl, cmake, withPIC ? false }: - -stdenv.mkDerivation rec { - name = "clapack-3.2.1"; - - src = fetchurl { - url = http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz; - sha256 = "0nnap9q1mv14g57dl3vkvxrdr10k5w7zzyxs6rgxhia8q8mphgqb"; - }; - - buildNativeInputs = [ cmake ]; - - installPhase = '' - ensureDir $out/include $out/lib - cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib - cp ../INCLUDE/* $out/include - ''; - - cmakeFlags = if withPIC then "-DCMAKE_C_FLAGS=-fPIC" else ""; - - # We disable the test phase, because some tests fail. - # Forums say it's normal for some to fail: - # http://icl.cs.utk.edu/lapack-forum/viewtopic.php?f=2&t=167 - # doCheck = true; - # checkPhase = "ctest"; - - meta = { - homepage = http://www.netlib.org/clapack/; - description = "f2c'ed version of LAPACK"; - license = "BSD"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36cffb34b88..84a34a75118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3299,8 +3299,6 @@ let clanlib = callPackage ../development/libraries/clanlib { }; - clapack = callPackage ../development/libraries/clapack { }; - classads = callPackage ../development/libraries/classads { }; classpath = callPackage ../development/libraries/java/classpath { From bfe234644e639c782b06728544eb7f4515142f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 21 Feb 2012 23:02:36 +0000 Subject: [PATCH 49/92] Add make check to octave. Some tests fail, but the build works. We'll have the report this way. svn path=/nixpkgs/trunk/; revision=32467 --- pkgs/development/interpreters/octave/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 6bb3431668f..4209ad7e36d 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl fftw fftwSinglePrec ]; + doCheck = true; + enableParallelBuilding = true; configureFlags = [ "--enable-readline" "--enable-dl" ]; From 2ce218c434791412fc060537308aa6b51042a667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Feb 2012 11:25:17 +0000 Subject: [PATCH 50/92] Updating Wings3D to 1.4.1 svn path=/nixpkgs/trunk/; revision=32470 --- pkgs/applications/graphics/wings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index b40a7251283..de9bc1dd7d4 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, erlang, esdl }: stdenv.mkDerivation rec { - name = "wings-1.3.0.1"; + name = "wings-1.4.1"; src = fetchurl { url = "mirror://sourceforge/wings/${name}.tar.bz2"; - sha256 = "1zab1qxhgrncwqj1xg6z08m0kqbkdiqp4777p1bv2kczcf31isyp"; + sha256 = "16kqy92rapmbvkc58mc50cidp1pm8nlwlwx69riyadc9w4qs9bji"; }; ERL_LIBS = "${esdl}/lib/erlang/addons"; From e4c4ab35e5d219d2dfa6e36126db21ac99d39cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Feb 2012 11:37:10 +0000 Subject: [PATCH 51/92] I think I fixed atlas for i686. It wants '-b 32'. Why, I don't know. svn path=/nixpkgs/trunk/; revision=32471 --- pkgs/development/libraries/science/math/atlas/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 1c5e0d9068e..8450519ce48 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; # the manual says you should pass -fPIC as configure arg .. It works - configureFlags = "-Fa alg -fPIC"; + configureFlags = "-Fa alg -fPIC" + + (if stdenv.isi686 then " -b 32" else ""); buildInputs = [ gfortran ]; From 77a8ea6fbd474bca969371506ee663e1517a5905 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Wed, 22 Feb 2012 12:12:00 +0000 Subject: [PATCH 52/92] merge powertop kernel config into default kernel config svn path=/nixpkgs/trunk/; revision=32472 --- .../os-specific/linux/kernel/linux-2.6.39.nix | 16 +++- pkgs/os-specific/linux/kernel/linux-3.0.nix | 16 +++- pkgs/os-specific/linux/kernel/linux-3.1.nix | 16 +++- pkgs/os-specific/linux/kernel/linux-3.2.nix | 16 +++- pkgs/top-level/all-packages.nix | 76 ------------------- 5 files changed, 56 insertions(+), 84 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix index 44a82e0836d..64aa288c8c8 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.39.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.39.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index 557223e6260..95b3ef16699 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index f1f1aa7f8fc..2e48eb3e460 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index b77f6eb4788..458b8bbce3d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -5,8 +5,20 @@ args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? "" let configWithPlatform = kernelPlatform : '' - # Don't include any debug features. - DEBUG_KERNEL n + # powermanagement and debugging for powertop + DEBUG_KERNEL y + PM_ADVANCED_DEBUG y + PM_RUNTIME y + TIMER_STATS y + USB_SUSPEND y + BACKTRACE_SELF_TEST n + CPU_NOTIFIER_ERROR_INJECT n + DEBUG_DEVRES n + DEBUG_NX_TEST n + DEBUG_STACK_USAGE n + DEBUG_STACKOVERFLOW n + RCU_TORTURE_TEST n + SCHEDSTATS n # Support drivers that need external firmware. STANDALONE n diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84a34a75118..5d8bc51945b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5711,24 +5711,6 @@ let ]; }; - linux_2_6_39_powertop = linux_2_6_39.override { - extraConfig = '' - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - ''; - }; - linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5740,24 +5722,6 @@ let ]; }; - linux_3_0_powertop = linux_3_0.override { - extraConfig = '' - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - ''; - }; - linux_3_1 = makeOverridable (import ../os-specific/linux/kernel/linux-3.1.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5768,24 +5732,6 @@ let ]; }; - linux_3_1_powertop = linux_3_1.override { - extraConfig = '' - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - ''; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; kernelPatches = @@ -5796,24 +5742,6 @@ let ]; }; - linux_3_2_powertop = linux_3_2.override { - extraConfig = '' - DEBUG_KERNEL y - PM_ADVANCED_DEBUG y - PM_RUNTIME y - TIMER_STATS y - USB_SUSPEND y - BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT n - DEBUG_DEVRES n - DEBUG_NX_TEST n - DEBUG_STACK_USAGE n - DEBUG_STACKOVERFLOW n - RCU_TORTURE_TEST n - SCHEDSTATS n - ''; - }; - /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -5943,16 +5871,12 @@ let linuxPackages_2_6_38 = recurseIntoAttrs (linuxPackagesFor linux_2_6_38 pkgs.linuxPackages_2_6_38); linuxPackages_2_6_38_ati = recurseIntoAttrs (linuxPackagesFor linux_2_6_38_ati pkgs.linuxPackages_2_6_38); linuxPackages_2_6_39 = recurseIntoAttrs (linuxPackagesFor linux_2_6_39 pkgs.linuxPackages_2_6_39); - linuxPackages_2_6_39_powertop = recurseIntoAttrs (linuxPackagesFor linux_2_6_39_powertop pkgs.linuxPackages_2_6_39_powertop); linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 pkgs.linuxPackages_3_0); - linuxPackages_3_0_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_0_powertop pkgs.linuxPackages_3_0_powertop); linuxPackages_3_1 = recurseIntoAttrs (linuxPackagesFor linux_3_1 pkgs.linuxPackages_3_1); - linuxPackages_3_1_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_1_powertop pkgs.linuxPackages_3_1_powertop); linuxPackages_nanonote_jz_2_6_34 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_34 pkgs.linuxPackages_nanonote_jz_2_6_34); linuxPackages_nanonote_jz_2_6_35 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_35 pkgs.linuxPackages_nanonote_jz_2_6_35); linuxPackages_nanonote_jz_2_6_36 = recurseIntoAttrs (linuxPackagesFor linux_nanonote_jz_2_6_36 pkgs.linuxPackages_nanonote_jz_2_6_36); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 pkgs.linuxPackages_3_2); - linuxPackages_3_2_powertop = recurseIntoAttrs (linuxPackagesFor linux_3_2_powertop pkgs.linuxPackages_3_2_powertop); # The current default kernel / kernel modules. linux = linuxPackages.kernel; From c6f0449124cf025203af93bd5ddd081275752c82 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 22 Feb 2012 14:51:15 +0000 Subject: [PATCH 53/92] Let hydra build kdesvn and krusader. Also fix kdesvn build with qt-4.8. svn path=/nixpkgs/trunk/; revision=32473 --- pkgs/applications/misc/krusader/default.nix | 1 + .../version-management/kdesvn/default.nix | 17 ++++++++++------- .../kdesvn/virtual_inheritance.patch | 11 +++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 pkgs/applications/version-management/kdesvn/virtual_inheritance.patch diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 05e62ba3844..bd86501c30e 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -12,5 +12,6 @@ stdenv.mkDerivation rec { license = "GPL"; homepage = http://www.krusader.org; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 10a590e941b..7761c45850e 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4 -, kdelibs, automoc4, phonon, kde_baseapps }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "kdesvn-1.5.5"; + src = fetchurl { - url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2; + url = "${meta.homepage}/downloads/${name}.tar.bz2"; sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7"; }; @@ -12,15 +12,18 @@ stdenv.mkDerivation { sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake ''; - patches = [ ./docbook.patch ]; + patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ]; + buildInputs = [ apr aprutil subversion db4 kdelibs ]; + + buildNativeInputs = [ gettext ]; meta = { description = "KDE SVN front-end"; license = "GPL"; homepage = http://kdesvn.alwins-world.de; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ stdenv.lib.maintainers.sander ]; + inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch new file mode 100644 index 00000000000..faaf6afcd6b --- /dev/null +++ b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch @@ -0,0 +1,11 @@ +--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h ++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h +@@ -49,7 +49,7 @@ typedef svn::SharedPointer + */ +-class RevGraphView : virtual public QGraphicsView ++class RevGraphView : public QGraphicsView + { + Q_OBJECT + public: From d04350281fa3b8090c5675917c56a458d4222e1f Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 22 Feb 2012 15:02:21 +0000 Subject: [PATCH 54/92] Drop soqt and paraview/Qt-4.7 Hydra built these packages with qt-4.8. svn path=/nixpkgs/trunk/; revision=32474 --- pkgs/top-level/all-packages.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d8bc51945b..1ebe62f65b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4623,11 +4623,7 @@ let soprano = callPackage ../development/libraries/soprano { }; - soqt = callPackage ../development/libraries/soqt { - qt4 = qt47; - }; - - soqtQt48 = soqt.override { qt4 = qt48; }; + soqt = callPackage ../development/libraries/soqt { }; speechd = callPackage ../development/libraries/speechd { }; @@ -7272,11 +7268,7 @@ let inherit (gnome) libglademm; }; - paraview = callPackage ../applications/graphics/paraview { - qt4 = qt47; - }; - - paraviewQt48 = paraview.override { qt4 = qt48; }; + paraview = callPackage ../applications/graphics/paraview { }; pdftk = callPackage ../tools/typesetting/pdftk { }; From 476ece2de031ca0e07dca8284e7938b64390ad36 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Feb 2012 16:40:10 +0000 Subject: [PATCH 55/92] * Added PostgreSQL 9.1.2. Updated PostgreSQL to 8.3.17 and 8.4.10. svn path=/nixpkgs/trunk/; revision=32475 --- pkgs/servers/sql/postgresql/8.3.x.nix | 4 ++-- pkgs/servers/sql/postgresql/8.4.x.nix | 4 ++-- pkgs/servers/sql/postgresql/9.1.x.nix | 29 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/9.1.x.nix diff --git a/pkgs/servers/sql/postgresql/8.3.x.nix b/pkgs/servers/sql/postgresql/8.3.x.nix index b308e4e0d1e..ba0d57b3654 100644 --- a/pkgs/servers/sql/postgresql/8.3.x.nix +++ b/pkgs/servers/sql/postgresql/8.3.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.3.16"; in +let version = "8.3.17"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "0i17da3jz44y2xikp99qs0dac9j84hghr8rg5n7hr86ippi90180"; + sha256 = "0xq8yg8qwd4qvjk6764argaxl6fribyf1xnxmdsk4xfcmgmfw5gv"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/8.4.x.nix b/pkgs/servers/sql/postgresql/8.4.x.nix index c3a34b3d43b..20b9bca5144 100644 --- a/pkgs/servers/sql/postgresql/8.4.x.nix +++ b/pkgs/servers/sql/postgresql/8.4.x.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, zlib, ncurses, readline }: -let version = "8.4.9"; in +let version = "8.4.10"; in stdenv.mkDerivation rec { name = "postgresql-${version}"; src = fetchurl { url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; - sha256 = "12n3x2q444hfhy9nbl14yfhd58im86jmlb9b0ihqzbmq1j6wnn0x"; + sha256 = "1yvwn2qpn2dpgfi496r1zl8b8xy52lb2pprg076pvc37sklq77vl"; }; buildInputs = [ zlib ncurses readline ]; diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix new file mode 100644 index 00000000000..6bc98c2851c --- /dev/null +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, zlib, readline }: + +let version = "9.1.2"; in + +stdenv.mkDerivation rec { + name = "postgresql-${version}"; + + src = fetchurl { + url = "mirror://postgresql/source/v${version}/${name}.tar.bz2"; + sha256 = "0c6vwlfxppjvrikqfq6s87sxmxxvsx1qq03bwgk589sv9x8zym4d"; + }; + + buildInputs = [ zlib readline ]; + + enableParallelBuilding = true; + + LC_ALL = "C"; + + passthru = { + inherit readline; + psqlSchema = "9.0"; + }; + + meta = { + homepage = http://www.postgresql.org/; + description = "A powerful, open source object-relational database system"; + license = "bsd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ebe62f65b7..92e0f42ce4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5154,6 +5154,8 @@ let postgresql90 = callPackage ../servers/sql/postgresql/9.0.x.nix { }; + postgresql91 = callPackage ../servers/sql/postgresql/9.1.x.nix { }; + postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; pyIRCt = builderDefsPackage (import ../servers/xmpp/pyIRCt) { From 2ceb07c28f8f6ae2416a4362e22c727dff82d388 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Feb 2012 17:27:06 +0000 Subject: [PATCH 56/92] * PostgreSQL 9.1: install the manpages. svn path=/nixpkgs/trunk/; revision=32476 --- pkgs/servers/sql/postgresql/9.1.x.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/9.1.x.nix b/pkgs/servers/sql/postgresql/9.1.x.nix index 6bc98c2851c..161c3dc2ccf 100644 --- a/pkgs/servers/sql/postgresql/9.1.x.nix +++ b/pkgs/servers/sql/postgresql/9.1.x.nix @@ -16,9 +16,15 @@ stdenv.mkDerivation rec { LC_ALL = "C"; + postInstall = + '' + mkdir -p $out/share/man + cp -rvd doc/src/sgml/man1 $out/share/man + ''; + passthru = { inherit readline; - psqlSchema = "9.0"; + psqlSchema = "9.1"; }; meta = { From 4b8cceb57106bba5033d0cd5cb3f653e8b896d5a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:15 +0000 Subject: [PATCH 57/92] wicd: emit ip-up and ip-down as well svn path=/nixpkgs/trunk/; revision=32482 --- pkgs/tools/networking/wicd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 72d41519c7c..317dec365a1 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -90,11 +90,13 @@ stdenv.mkDerivation rec { echo '#!/bin/sh initctl emit -n wicd-preconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/preconnect/upstart-emit echo '#!/bin/sh -initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postconnect/upstart-emit +initctl emit -n wicd-postconnect ITYPE="$1" ESSID="$2" BSSID="$3" +initctl emit -n ip-up' > $out/etc/scripts/postconnect/upstart-emit echo '#!/bin/sh initctl emit -n wicd-predisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/predisconnect/upstart-emit echo '#!/bin/sh -initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3"' > $out/etc/scripts/postdisconnect/upstart-emit +initctl emit -n wicd-postdisconnect ITYPE="$1" ESSID="$2" BSSID="$3" +initctl emit -n ip-down' > $out/etc/scripts/postdisconnect/upstart-emit chmod a+x $out/etc/scripts/*/upstart-emit ''; From 9db68408140393ce0d3e7f922583ee7d7288d5c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:18 +0000 Subject: [PATCH 58/92] linux kernel 3.2 : added aufs patches svn path=/nixpkgs/trunk/; revision=32483 --- pkgs/os-specific/linux/kernel/patches.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9fb597be72c..59a8f794e17 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -322,6 +322,20 @@ rec { features.aufs3 = true; }; + aufs3_2 = rec { + name = "aufs3.2"; + version = "3.2"; + utilRev = "a953b0218667e06b722f4c41df29edacd8dc8e1f"; + utilHash = "28ac4c1a07b2c30fb61a6facc9cedcf67b14f303baedf1b121aeb6293ea49eb4"; + patch = makeAufs3StandalonePatch { + inherit version; + rev = "9c4bbeb58f0ecc235ea820ae320efa2c0006e033"; + sha256 = "5363a7f5fbadaef9457e743a5781f2525332c4bbb91693ca2596ab2d8f7860ea"; + }; + features.aufsBase = true; + features.aufs3 = true; + }; + # Increase the timeout on CIFS requests from 15 to 120 seconds to # make CIFS more resilient to high load on the CIFS server. cifs_timeout_2_6_15 = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92e0f42ce4f..530c178f39a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5735,7 +5735,7 @@ let kernelPatches = [ #kernelPatches.fbcondecor_2_6_38 kernelPatches.sec_perm_2_6_24 - #kernelPatches.aufs3_1 + kernelPatches.aufs3_2 #kernelPatches.mips_restart_2_6_36 ]; }; From 846a12f9541c66647fc1803f0bc814603fb5d085 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:22 +0000 Subject: [PATCH 59/92] fixed download urls after kernel-depending packages had their names changed svn path=/nixpkgs/trunk/; revision=32484 --- pkgs/os-specific/linux/bbswitch/default.nix | 7 +++---- pkgs/os-specific/linux/frandom/default.nix | 7 +++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 502d24d32d8..a8f8a9d33ef 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,9 +1,8 @@ { stdenv, fetchurl, kernel }: let - - version = "0.4.1"; - name = "bbswitch-${version}-${kernel.version}"; + baseName = "bbswitch-0.4.1"; + name = "${baseName}-${kernel.version}"; in @@ -11,7 +10,7 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${name}.tar.gz"; + url = "http://github.com/downloads/Bumblebee-Project/bbswitch/${baseName}.tar.gz"; sha256 = "d579c6efc5f6482f0cf0b2c1b1f1a127413218cdffdc8f2d5a946c11909bda23"; }; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index fb2c50a778d..7894e86ded9 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -1,10 +1,13 @@ { stdenv, fetchurl, kernel }: +let baseName = "frandom-1.1"; +in + stdenv.mkDerivation rec { - name = "frandom-1.1-${kernel.version}"; + name = "${baseName}-${kernel.version}"; src = fetchurl { - url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz"; + url = "http://sourceforge.net/projects/frandom/files/${baseName}.tar.gz"; sha256 = "15rgyk4hfawqg7z1spk2xlk1nn6rcdls8gdhc70f91shrc9pvlls"; }; From 0efd53814ff02286d96f1ecd84d110bb6c7e82a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:25 +0000 Subject: [PATCH 60/92] new library: libaacs for decoding bluray disks Does not contain any drm or copyright infringements. svn path=/nixpkgs/trunk/; revision=32485 --- .../development/libraries/libaacs/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/libaacs/default.nix diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix new file mode 100644 index 00000000000..d8ace22bc2d --- /dev/null +++ b/pkgs/development/libraries/libaacs/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, libgcrypt}: + +# library that allows libbluray to play AACS protected bluray disks +# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info. + +# Info on how to use / obtain aacs keys: +# http://vlc-bluray.whoknowsmy.name/ +# https://wiki.archlinux.org/index.php/BluRay + + +let baseName = "libaacs"; + version = "0.3.0"; +in + +stdenv.mkDerivation { + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2"; + sha256 = "bf92dab1a6a8ee08a55e8cf347c2cda49e6535b52e85bb1e92e1cfcc8ecec22c"; + }; + + buildInputs = [libgcrypt]; + + meta = { + homepage = http://www.videolan.org/developers/libbluray.html; + description = "Library to access Blu-Ray disks for video playback"; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 530c178f39a..dac6fccb62d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3864,6 +3864,8 @@ let lib3ds = callPackage ../development/libraries/lib3ds { }; + libaacs = callPackage ../development/libraries/libaacs { }; + libaal = callPackage ../development/libraries/libaal { }; libao = callPackage ../development/libraries/libao { From 383ec69fb68ed9782f2dc758bd479680f233a341 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:29 +0000 Subject: [PATCH 61/92] new library: libbluray for playing bluray disks optionally use libaacs to decrypt commercial disks svn path=/nixpkgs/trunk/; revision=32486 --- .../libraries/libbluray/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/libbluray/default.nix diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix new file mode 100644 index 00000000000..03bbcc933f4 --- /dev/null +++ b/pkgs/development/libraries/libbluray/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchgit, autoconf, automake, libtool, libaacs ? null, jdk ? null, ant ? null, withAACS ? false}: + +assert withAACS -> jdk != null && ant != null && libaacs != null; + +# Info on how to use: +# https://wiki.archlinux.org/index.php/BluRay + +let baseName = "libbluray"; + version = "0.2.1"; + +in + +stdenv.mkDerivation { + name = "${baseName}-${version}"; + + src = fetchgit { + url = git://git.videolan.org/libbluray.git; + rev = "3b9a9f044644a6abe9cb09377f714ded9fdd6c87"; + sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c"; + }; + + buildInputs = [autoconf automake libtool] ++ stdenv.lib.optionals withAACS [jdk ant libaacs]; + NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs"; + + preConfigure = "./bootstrap"; + configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"]; + + meta = { + homepage = http://www.videolan.org/developers/libbluray.html; + description = "Library to access Blu-Ray disks for video playback"; + license = stdenv.lib.licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac6fccb62d..e028ff39815 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3886,6 +3886,8 @@ let libbluedevil = callPackage ../development/libraries/libbluedevil { }; + libbluray = callPackage ../development/libraries/libbluray { }; + libcaca = callPackage ../development/libraries/libcaca { }; libcanberra = callPackage ../development/libraries/libcanberra { From e91b09057718c3344e66a3bd2c7d81ee782a7bd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:33 +0000 Subject: [PATCH 62/92] upgraded vlc to 2.0 - with bluray support svn path=/nixpkgs/trunk/; revision=32487 --- pkgs/applications/video/vlc/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 02000ffeb21..a728059beff 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, xlibs, libdvdnav +{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, qt4, freefont_ttf , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp @@ -10,18 +10,18 @@ stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "1.1.13"; + version = "2.0.0"; patchPhase = ''sed -e "s@/bin/echo@echo@g" -i configure''; src = fetchurl { - url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.bz2"; - sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83"; + url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; + sha256 = "455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106"; }; buildInputs = - [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread - dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt + [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread + libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preBuild = '' - substituteInPlace modules/misc/freetype.c --replace \ + substituteInPlace modules/text_renderer/freetype.c --replace \ /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \ ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf ''; From 9ac4ea27f9afb7ed4e3d461f644b7f8c9e4fca3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:36 +0000 Subject: [PATCH 63/92] upgraded phonon and its gstreamer backend to 4.6.0 svn path=/nixpkgs/trunk/; revision=32488 --- .../libraries/phonon-backend-gstreamer/default.nix | 10 +++++----- pkgs/development/libraries/phonon/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 17744bad32c..3b5a201e037 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all }: +{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }: -let version = "4.5.1"; in +let version = "4.6.0"; in stdenv.mkDerivation rec { name = "phonon-backend-gstreamer-${version}"; src = fetchurl { - url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.bz2"; - sha256 = "13m3kd0iy28nsn532xl97c50vq8ci3qs2i92yk4fw428qvknqck2"; + url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.xz"; + sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v"; }; buildInputs = - [ cmake pkgconfig phonon qt4 automoc4 + [ cmake pkgconfig phonon qt4 automoc4 xz gst_all.gstreamer gst_all.gstPluginsBase ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index c8eae2eac4e..3e0c5247ace 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, automoc4, qt4, xz }: let - v = "4.5.1"; + v = "4.6.0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz"; - sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001"; + sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4"; }; buildInputs = [ qt4 ]; From 51d9d68b516a12efd04db469ee8c5f65cbb67e83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:39 +0000 Subject: [PATCH 64/92] upgraded phonon vlc backend to 0.5.0 svn path=/nixpkgs/trunk/; revision=32489 --- .../libraries/phonon-backend-vlc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 3763c474e73..30b3482301a 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -1,8 +1,8 @@ -a@{ stdenv, fetchurl, qt4, vlc, automoc4, cmake, phonon }: +a@{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }: let pn = "phonon-backend-vlc"; - v = "0.2.0"; + v = "0.5.0"; vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version in @@ -10,11 +10,11 @@ stdenv.mkDerivation { name = "${pn}-${v}"; src = fetchurl { - url = "mirror://kde/stable/${pn}/${v}/src/${pn}-${v}.tar.gz"; - sha256 = "1sac7770vk0ppwbzl9nag387ks7sqmdnm7722kpzafhx1c2r7wsv"; + url = "mirror://kde/stable/phonon/${pn}/${v}/src/${pn}-${v}.tar.xz"; + sha256 = "2256fe9fef74bcd165c24ae8e9b606a48264c9193a4a1da6ef0aaa02dad76388"; }; - buildInputs = [ qt4 vlc cmake automoc4 phonon ]; + buildInputs = [ xz qt4 vlc cmake automoc4 phonon ]; meta = { description = "VideoLAN backend for Phonon multimedia framework"; From 444b195a3d7b0b2a38928e73a9d6e80e5b2064c9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:42 +0000 Subject: [PATCH 65/92] new package: premake -- lua based build configuration tool this is version 3, while 4 already exists. But I only need this tool for 'aacskeys', which doesn't work with 4 svn path=/nixpkgs/trunk/; revision=32490 --- .../tools/misc/premake/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/misc/premake/default.nix diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix new file mode 100644 index 00000000000..d56594c19af --- /dev/null +++ b/pkgs/development/tools/misc/premake/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, unzip}: + +let baseName = "premake"; + version = "3.7"; +in + +stdenv.mkDerivation { + name = "${baseName}-${version}"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip"; + sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5"; + }; + + buildInputs = [unzip]; + + installPhase = '' + install -Dm755 bin/premake $out/bin/premake + ''; + + meta = { + homepage = http://industriousone.com/premake; + description = "A simple build configuration and project generation tool using lua"; + license = stdenv.lib.licenses.bsd; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e028ff39815..36f2d801303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3119,6 +3119,8 @@ let */ pkgconfig = forceBuildDrv (callPackage ../development/tools/misc/pkgconfig { }); + premake = callPackage ../development/tools/misc/premake { }; + radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; From 6b0dda077194ab8b73f3b1534adec34c5a6f4fbd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 20:29:46 +0000 Subject: [PATCH 66/92] new package: aacskeys -- grab aacs keys from bluray disks svn path=/nixpkgs/trunk/; revision=32491 --- .../libraries/aacskeys/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/aacskeys/default.nix diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix new file mode 100644 index 00000000000..3bed95e2671 --- /dev/null +++ b/pkgs/development/libraries/aacskeys/default.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, openssl, jdk, premake}: + +# Info on how to use / obtain aacs keys: +# http://vlc-bluray.whoknowsmy.name/ +# https://wiki.archlinux.org/index.php/BluRay + + +let baseName = "aacskeys"; + version = "0.4.0c"; +in + +stdenv.mkDerivation { + name = "${baseName}-${version}"; + + patchPhase = '' + substituteInPlace "premake.lua" \ + --replace "/usr/lib/jvm/java-6-sun/include" "${jdk}/include" + ''; + + src = fetchurl { + url = "http://debian-multimedia.org/pool/main/a/${baseName}/${baseName}_${version}.orig.tar.gz"; + sha256 = "54ea78898917f4acaf78101dda254de56bc7696bad12cbf22ee6f09d4ee88a43"; + }; + + buildInputs = [openssl jdk premake]; + + installPhase = '' + ensureDir $out/{bin,lib,share/${baseName}} + + # Install lib + install -Dm444 lib/linux/libaacskeys.so $out/lib + + # Install program + install -Dm555 bin/linux/aacskeys $out/bin + + # Install resources + install -Dm444 HostKeyCertificate.txt $out/share/${baseName} + install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName} + ''; + + meta = { + homepage = http://forum.doom9.org/showthread.php?t=123311; + description = "A library and program to retrieve decryption keys for HD discs"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36f2d801303..a16fca55a02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3194,6 +3194,8 @@ let a52dec = callPackage ../development/libraries/a52dec { }; + aacskeys = callPackage ../development/libraries/aacskeys { }; + aalib = callPackage ../development/libraries/aalib { }; acl = callPackage ../development/libraries/acl { }; From 0258bf1ef1f49552e82e9075560ea25b738629a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 22 Feb 2012 21:14:53 +0000 Subject: [PATCH 67/92] premake: fixed meta.license field svn path=/nixpkgs/trunk/; revision=32492 --- pkgs/development/tools/misc/premake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index d56594c19af..4f534bd8664 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { meta = { homepage = http://industriousone.com/premake; description = "A simple build configuration and project generation tool using lua"; - license = stdenv.lib.licenses.bsd; + license = stdenv.lib.licenses.bsd3; }; } From 8f7485d784a9ff7406a820e3bf4d2443321e9a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Feb 2012 22:40:35 +0000 Subject: [PATCH 68/92] Making atlas do the check phase. svn path=/nixpkgs/trunk/; revision=32493 --- pkgs/development/libraries/science/math/atlas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 8450519ce48..12ee83ca88d 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { buildInputs = [ gfortran ]; + doCheck = true; + meta = { description = "Atlas library"; license = "GPL"; From 4d4d324776ff3d7bdf343ba5e60f21f5b1605900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Feb 2012 22:41:27 +0000 Subject: [PATCH 69/92] Making liblapack do the check phase svn path=/nixpkgs/trunk/; revision=32494 --- .../libraries/science/math/liblapack/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index acede395c84..28bfa4df801 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, atlas, cmake }: +{ stdenv, fetchurl, gfortran, atlas, cmake, python }: stdenv.mkDerivation { name = "liblapack-3.4.0"; @@ -9,6 +9,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ atlas ]; buildInputs = [ gfortran cmake ]; + buildNativeInputs = [ python ]; cmakeFlags = [ "-DUSE_OPTIMIZED_BLAS=ON" @@ -17,8 +18,19 @@ stdenv.mkDerivation { "-DCMAKE_Fortran_FLAGS=-fPIC" ]; + doCheck = true; + + checkPhase = " + sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py + ctest + "; + enableParallelBuilding = true; + passthru = { + blas = atlas; + }; + meta = { description = "Linear Algebra PACKage"; license = "revised-BSD"; From 61451871dfdd34a94df6e989be34b96569625dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Feb 2012 22:41:44 +0000 Subject: [PATCH 70/92] Updating qrupdate and making it do the check phase svn path=/nixpkgs/trunk/; revision=32495 --- .../libraries/qrupdate/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index ee341617230..465ec7eebb2 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,19 +1,29 @@ { stdenv , fetchurl , gfortran -, blas , liblapack }: stdenv.mkDerivation { - name = "qrupdate-1.1.1"; + name = "qrupdate-1.1.2"; src = fetchurl { - url = mirror://sourceforge/qrupdate/1.1/qrupdate-1.1.1.tar.gz ; - sha256 = "0ak68qd15zccr2d2qahxcxsrcdgxy7drg362jj9swv7rb39h00cz"; + url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ; + sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; }; - preConfigure = '' + configurePhase = '' export PREFIX=$out + sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \ + -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \ + Makeconf ''; + + doCheck = true; + + checkTarget = "test"; + + buildTarget = "lib"; + + installTarget = "install-staticlib"; - buildInputs = [gfortran blas liblapack] ; + buildInputs = [ gfortran liblapack ]; } From 371b34e49a8e66e105019f233aad213397ca203c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 22 Feb 2012 22:42:16 +0000 Subject: [PATCH 71/92] Making octave build with qrupdate, and keep the big log of tests results of the check phase in the out store path. svn path=/nixpkgs/trunk/; revision=32496 --- pkgs/development/interpreters/octave/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 4209ad7e36d..9d7405a64f0 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, -fftw, fftwSinglePrec, zlib, curl }: +fftw, fftwSinglePrec, zlib, curl, qrupdate }: stdenv.mkDerivation rec { name = "octave-3.4.3"; @@ -11,11 +11,17 @@ stdenv.mkDerivation rec { buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 graphicsmagick pcre liblapack texLive pkgconfig mesa fltk zlib curl - fftw fftwSinglePrec ]; + fftw fftwSinglePrec qrupdate ]; doCheck = true; enableParallelBuilding = true; configureFlags = [ "--enable-readline" "--enable-dl" ]; + + # Keep a copy of the octave tests detailed results in the output + # derivation, because someone may care + postInstall = '' + cp test/fntests.log $out/share/octave/${name}-fntests.log + ''; } From 98cdc2ae35b691e4c739c893b8a6a3d82c2c5233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Feb 2012 00:01:19 +0000 Subject: [PATCH 72/92] GNU libc: Update the Hurd port. svn path=/nixpkgs/trunk/; revision=32497 --- .../libraries/glibc-2.12/common.nix | 9 +++++---- .../glibc-2.12/hurd-sigstate-functions.patch | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index 0d56d877018..8f0c092d35c 100644 --- a/pkgs/development/libraries/glibc-2.12/common.nix +++ b/pkgs/development/libraries/glibc-2.12/common.nix @@ -12,7 +12,7 @@ cross : let # For GNU/Hurd, see below. - version = if hurdHeaders != null then "20111025" else "2.12.2"; + version = if hurdHeaders != null then "20120221" else "2.12.2"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -75,7 +75,8 @@ stdenv.mkDerivation ({ /* Allow nixos and nix handle the locale-archive. */ ./nix-locale-archive.patch - ]; + ] + ++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-sigstate-functions.patch); postPatch = '' # Needed for glibc to build with the gnumake 3.82 @@ -143,8 +144,8 @@ stdenv.mkDerivation ({ # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. # See . url = "git://git.sv.gnu.org/hurd/glibc.git"; - sha256 = "3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca"; - rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793"; + sha256 = "fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d"; + rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3"; } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch b/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch new file mode 100644 index 00000000000..d46db7b6393 --- /dev/null +++ b/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch @@ -0,0 +1,20 @@ +This patch adds a GNU ld version script entry for the `_hurd_sigstate_*' +functions that were introduced to support SA_SIGINFO. A similar patch +should be applied upstream soon. + +diff --git a/hurd/Versions b/hurd/Versions +index 83c8ab1..295cfda 100644 +--- a/hurd/Versions ++++ b/hurd/Versions +@@ -156,6 +156,11 @@ libc { + # functions used in macros & inline functions + __errno_location; + } ++ GLIBC_2.13 { ++ # functions introduced for SA_SIGINFO support and referenced from ++ # ++ _hurd_sigstate_*; ++ } + + %if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) + HURD_CTHREADS_0.3 { From c6210ec36dbf752d979cb8d842ef7d9bd4d87af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Feb 2012 00:01:24 +0000 Subject: [PATCH 73/92] Samba: Fix compilation for GNU/Hurd; add to Hydra. svn path=/nixpkgs/trunk/; revision=32498 --- pkgs/servers/samba/default.nix | 5 ++++- pkgs/servers/samba/libnss-wins-pthread.patch | 15 +++++++++++++++ pkgs/top-level/release-cross.nix | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/samba/libnss-wins-pthread.patch diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 42d577c55fa..037fa14491c 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { patches = [ # Fix for https://bugzilla.samba.org/show_bug.cgi?id=8541. ./readlink.patch + + # Allow cross-builds for GNU/Hurd. + ./libnss-wins-pthread.patch ]; buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] @@ -39,7 +42,7 @@ stdenv.mkDerivation rec { # XXX: Awful hack to allow cross-compilation. '' sed -i source3/configure \ -e 's/^as_fn_error \("cannot run test program while cross compiling\)/$as_echo \1/g' - ''; + ''; # " preConfigure = '' cd source3 diff --git a/pkgs/servers/samba/libnss-wins-pthread.patch b/pkgs/servers/samba/libnss-wins-pthread.patch new file mode 100644 index 00000000000..63e1485c20d --- /dev/null +++ b/pkgs/servers/samba/libnss-wins-pthread.patch @@ -0,0 +1,15 @@ +`libnss_wins' uses pthreads but is built without `-pthread'. This is +not a problem when building natively on GNU/Linux, but causes troubles +when cross-building for GNU/Hurd (undefined references to libpthread +functions.) + +--- samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:15.000000000 +0100 ++++ samba-3.6.1/source3/Makefile.in 2012-02-22 15:25:47.000000000 +0100 +@@ -2760,6 +2760,7 @@ bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP + @echo "Linking $@" + @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \ + $(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) \ ++ $(PTHREAD_LDFLAGS) \ + @SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@ + + bin/winbind_krb5_locator.@SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) $(LIBWBCLIENT) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 3e3cb3e3229..34ea73a78bc 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -205,6 +205,7 @@ in { nixUnstable.hostDrv = nativePlatforms; openssl.hostDrv = nativePlatforms; # dependency of Nix patch.hostDrv = nativePlatforms; + samba_light.hostDrv = nativePlatforms; # needed for `runInGenericVM' zile.hostDrv = nativePlatforms; }; }) // ( From 3f523771bcb532f127d7a278e0a58b29d54e1a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Feb 2012 00:01:29 +0000 Subject: [PATCH 74/92] Add SMBFS for GNU/Hurd. svn path=/nixpkgs/trunk/; revision=32499 --- pkgs/os-specific/gnu/default.nix | 7 ++++- pkgs/os-specific/gnu/smbfs/default.nix | 41 ++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/gnu/smbfs/default.nix diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 3978979d702..326918dd55e 100644 --- a/pkgs/os-specific/gnu/default.nix +++ b/pkgs/os-specific/gnu/default.nix @@ -1,7 +1,7 @@ # Packages that make up the GNU/Hurd operating system (aka. GNU). args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool -, texinfo, glibcCross, hurdPartedCross, libuuid +, texinfo, glibcCross, hurdPartedCross, libuuid, samba_light , gccCrossStageStatic, gccCrossStageFinal , forceBuildDrv, callPackage, platform, config, crossSystem }: @@ -86,4 +86,9 @@ rec { }).stdenv; } else { }); + + smbfs = callPackage ./smbfs { + samba = samba_light; + hurd = hurdCross; + }; } diff --git a/pkgs/os-specific/gnu/smbfs/default.nix b/pkgs/os-specific/gnu/smbfs/default.nix new file mode 100644 index 00000000000..f95b22a4669 --- /dev/null +++ b/pkgs/os-specific/gnu/smbfs/default.nix @@ -0,0 +1,41 @@ +{ fetchcvs, stdenv, hurd, machHeaders, samba }: + +let + date = "2011-11-14"; +in +stdenv.mkDerivation rec { + name = "smbfs-${date}"; + + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.savannah.nongnu.org:/sources/hurdextras"; + module = "smbfs"; + sha256 = "b36765fde77c6cafb04ab1ff44b19bb00b490064b5a02b9ced7828170ab47a70"; + inherit date; + }; + + patchPhase = + '' sed -i "Makefile" \ + -e 's|gcc|i586-pc-gnu-gcc|g ; + s|^LDFLAGS=\(.*\)$|LDFLAGS=\1 -pthread|g' + ''; + + buildInputs = [ hurd machHeaders samba ]; + + installPhase = + '' mkdir -p "$out/hurd" + cp -v smbfs "$out/hurd" + + mkdir -p "$out/share/doc/${name}" + cp -v README "$out/share/doc/${name}" + ''; + + meta = { + description = "SMB/CIFS file system translator for GNU/Hurd"; + + homepage = http://www.nongnu.org/hurdextras/; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + }; +} From e86e5db579efb718b206dba550fe48a7e457395a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Feb 2012 00:32:09 +0000 Subject: [PATCH 75/92] release-cross: Add `gnu.smbfs'. svn path=/nixpkgs/trunk/; revision=32500 --- pkgs/top-level/release-cross.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 34ea73a78bc..71e4944b303 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -182,6 +182,7 @@ in { gnu.hurdCross = nativePlatforms; gnu.mach.hostDrv = nativePlatforms; gnu.mig = nativePlatforms; + gnu.smbfs = nativePlatforms; coreutils.hostDrv = nativePlatforms; ed.hostDrv = nativePlatforms; From ddad8f0c02884d0dfa047d64cef8a76a9ecb9f07 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 23 Feb 2012 07:57:47 +0000 Subject: [PATCH 76/92] Phonon: style, +pulseaudio svn path=/nixpkgs/trunk/; revision=32503 --- .../phonon-backend-gstreamer/default.nix | 16 +++++++++------- .../libraries/phonon-backend-vlc/default.nix | 16 +++++++++------- pkgs/development/libraries/phonon/default.nix | 11 ++--------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 3b5a201e037..d4fb593ca80 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -1,19 +1,21 @@ { stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }: -let version = "4.6.0"; in +let + version = "4.6.0"; + pname = "phonon-backend-gstreamer"; +in stdenv.mkDerivation rec { - name = "phonon-backend-gstreamer-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v"; }; - buildInputs = - [ cmake pkgconfig phonon qt4 automoc4 xz - gst_all.gstreamer gst_all.gstPluginsBase - ]; + buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ]; + + buildNativeInputs = [ cmake automoc4 xz pkgconfig ]; meta = { homepage = http://phonon.kde.org/; diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 30b3482301a..faa88f8854f 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -1,20 +1,22 @@ -a@{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }: +{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }: let - pn = "phonon-backend-vlc"; + pname = "phonon-backend-vlc"; v = "0.5.0"; - vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version + vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version in stdenv.mkDerivation { - name = "${pn}-${v}"; + name = "${pname}-${v}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${pn}/${v}/src/${pn}-${v}.tar.xz"; - sha256 = "2256fe9fef74bcd165c24ae8e9b606a48264c9193a4a1da6ef0aaa02dad76388"; + url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; + sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2"; }; - buildInputs = [ xz qt4 vlc cmake automoc4 phonon ]; + buildNativeInputs = [ cmake automoc4 xz ]; + + buildInputs = [ qt4 vlc_ phonon ]; meta = { description = "VideoLAN backend for Phonon multimedia framework"; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 3e0c5247ace..440c775adb2 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, xz }: +{ stdenv, fetchurl, cmake, automoc4, qt4, xz, pulseaudio }: let v = "4.6.0"; @@ -12,17 +12,10 @@ stdenv.mkDerivation rec { sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qt4 pulseaudio ]; buildNativeInputs = [ cmake automoc4 xz ]; - cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs"; - preConfigure = - '' - substituteInPlace designer/CMakeLists.txt \ - --replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins' - ''; - meta = { homepage = http://phonon.kde.org/; description = "Multimedia API for Qt"; From 417124626b92bc1a7f6802136a55016bb8959739 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 23 Feb 2012 11:27:43 +0000 Subject: [PATCH 77/92] Add cmake-2.6.4 This is the minimum version required for KDE-4, so I need it to ensure that my cmake code works with cmake-2.6.4. svn path=/nixpkgs/trunk/; revision=32504 --- .../tools/build-managers/cmake/264.nix | 61 ++++++++++++ .../cmake/search-path-264.patch | 93 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 156 insertions(+) create mode 100644 pkgs/development/tools/build-managers/cmake/264.nix create mode 100644 pkgs/development/tools/build-managers/cmake/search-path-264.patch diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix new file mode 100644 index 00000000000..02c72879113 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/264.nix @@ -0,0 +1,61 @@ +{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4 +, darwinInstallNameToolUtility }: + +with stdenv.lib; + +let + os = stdenv.lib.optionalString; + majorVersion = "2.6"; + minorVersion = "4"; + version = "${majorVersion}.${minorVersion}"; +in + +# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "1wpxr5x4aggaqrqzjq3kg4hh09f0vyr1njik1pad01bvwd923pcw"; + }; + + patches = + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path-264.patch; + + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional stdenv.isDarwin darwinInstallNameToolUtility + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + postUnpack = + '' + dontUseCmakeConfigure=1 + source $setupHook + fixCmakeFiles $sourceRoot + ''; + + preConfigure = optionalString (stdenv ? glibc) + '' + substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.urkud ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/search-path-264.patch b/pkgs/development/tools/build-managers/cmake/search-path-264.patch new file mode 100644 index 00000000000..97ad6f119d8 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path-264.patch @@ -0,0 +1,93 @@ +diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake +index 4e4c2cb..9784655 100644 +--- a/Modules/Platform/Linux.cmake ++++ b/Modules/Platform/Linux.cmake +@@ -43,21 +43,10 @@ ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE) + # checking the platform every time. This option is advanced enough + # that only package maintainers should need to adjust it. They are + # capable of providing a setting on the command line. +- IF(EXISTS "/etc/debian_version") +- SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- "Install .so files without execute permission.") +- ELSE(EXISTS "/etc/debian_version") +- SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL +- "Install .so files without execute permission.") +- ENDIF(EXISTS "/etc/debian_version") ++ SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL ++ "Install .so files without execute permission.") + ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE) + + INCLUDE(Platform/UnixPaths) + +-# Debian has lib64 paths only for compatibility so they should not be +-# searched. +-IF(EXISTS "/etc/debian_version") +- SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +-ENDIF(EXISTS "/etc/debian_version") +-# always include the gcc compiler information + INCLUDE(Platform/gcc) +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index 584d334..4fcf951 100755 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -8,56 +8,18 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # List common installation prefixes. These will be used for all + # search types. + LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH +- # Standard +- / /usr /usr/local +- +- # CMake install location +- "${_CMAKE_INSTALL_DIR}" +- +- # Project install destination. +- "${CMAKE_INSTALL_PREFIX}" +- ) +- +-# List common include file locations not under the common prefixes. +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /opt/local/include /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include +- ) +- +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /opt/local/lib /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib +- ) +- +-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ "@glibc@" + ) + + LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /usr/lib /usr/lib32 /usr/lib64 ++ "@glibc@/lib" + ) + + LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + + # Enable use of lib64 search path variants by default. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a16fca55a02..70effd933f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2958,6 +2958,8 @@ let cmake = callPackage ../development/tools/build-managers/cmake { }; + cmake264 = callPackage ../development/tools/build-managers/cmake/264.nix { }; + cmakeCurses = cmake.override { useNcurses = true; }; cmakeWithGui = cmakeCurses.override { useQt4 = true; }; From 166e87319c042c5f1a9d2cbd4ea132162762c262 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 23 Feb 2012 11:27:47 +0000 Subject: [PATCH 78/92] Fix cmake-2.6.4 build (add xmlrpc-c) svn path=/nixpkgs/trunk/; revision=32505 --- pkgs/development/libraries/xmlrpc-c/default.nix | 16 ++++++++++++++++ .../tools/build-managers/cmake/264.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/xmlrpc-c/default.nix diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix new file mode 100644 index 00000000000..cd0eb3fcdcb --- /dev/null +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchsvn, curl }: + +let rev = "2262"; in +stdenv.mkDerivation { + name = "xmlrpc-c-r${rev}"; + + buildInputs = [ curl ]; + + preInstall = "export datarootdir=$out/share"; + + src = fetchsvn { + url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced; + rev = "2262"; + sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb"; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/264.nix b/pkgs/development/tools/build-managers/cmake/264.nix index 02c72879113..8924e8dd793 100644 --- a/pkgs/development/tools/build-managers/cmake/264.nix +++ b/pkgs/development/tools/build-managers/cmake/264.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive -, useNcurses ? false, ncurses, useQt4 ? false, qt4 +, useNcurses ? false, ncurses, useQt4 ? false, qt4, xmlrpc_c , darwinInstallNameToolUtility }: with stdenv.lib; @@ -11,7 +11,6 @@ let version = "${majorVersion}.${minorVersion}"; in -# WARNING: Do NOT upgrade cmake in trunk: it fails to build on i686-linux stdenv.mkDerivation rec { name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path-264.patch; - buildInputs = [ curl expat zlib bzip2 libarchive ] + buildInputs = [ curl expat zlib bzip2 libarchive xmlrpc_c ] ++ optional stdenv.isDarwin darwinInstallNameToolUtility ++ optional useNcurses ncurses ++ optional useQt4 qt4; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70effd933f3..57f73fb43fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4821,6 +4821,8 @@ let ]; }; + xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; + xvidcore = callPackage ../development/libraries/xvidcore { }; yajl = callPackage ../development/libraries/yajl { }; From e321903ff1afd9c607d5fae6a975196cb05cb3a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 11:33:26 +0000 Subject: [PATCH 79/92] Atlas aborts the build some kind of CPU frequency scaling is detected on the build machine because that feature offsets the performance timings. We ignore that check, however, because with binaries being pre-built on Hydra those timings aren't accurate for the local machine in the first place. The build log might show something such as the following: | It appears you have cpu throttling enabled, which makes timings | unreliable and an ATLAS install nonsensical. Aborting. | See ATLAS/INSTALL.txt for further information | Ignoring CPU throttling by user override! svn path=/nixpkgs/trunk/; revision=32506 --- .../libraries/science/math/atlas/default.nix | 35 ++++++++++++++----- pkgs/top-level/all-packages.nix | 8 ++++- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 12ee83ca88d..74d20621089 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -1,27 +1,46 @@ -{ stdenv, fetchurl, gfortran }: +{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true }: + +let + optionalString = stdenv.lib.optionalString; +in stdenv.mkDerivation { name = "atlas-3.9.67"; - + src = fetchurl { url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2; sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa"; }; - # configure outside of the source directory + # Configure outside of the source directory. preConfigure = '' mkdir build; cd build; configureScript=../configure; ''; - # the manual says you should pass -fPIC as configure arg .. It works - configureFlags = "-Fa alg -fPIC" + - (if stdenv.isi686 then " -b 32" else ""); + # * The manual says you should pass -fPIC as configure arg. Not sure why, but + # it works. + # + # * Atlas aborts the build if it detects that some kind of CPU frequency + # scaling is active on the build machine because that feature offsets the + # performance timings. We ignore that check, however, because with binaries + # being pre-built on Hydra those timings aren't accurate for the local + # machine in the first place. + configureFlags = "-Fa alg -fPIC" + + optionalString stdenv.isi686 " -b 32" + + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0"; buildInputs = [ gfortran ]; doCheck = true; meta = { - description = "Atlas library"; + homepage = "http://math-atlas.sourceforge.net/"; + description = "Automatically Tuned Linear Algebra Software (ATLAS)"; license = "GPL"; - homepage = http://math-atlas.sourceforge.net/; + + longDescription = '' + The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing + research effort focusing on applying empirical techniques in order to provide + portable performance. At present, it provides C and Fortran77 interfaces to a + portably efficient BLAS implementation, as well as a few routines from LAPACK. + ''; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57f73fb43fc..635b918d3a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8296,7 +8296,13 @@ let ### SCIENCE/MATH - atlas = callPackage ../development/libraries/science/math/atlas { }; + atlas = callPackage ../development/libraries/science/math/atlas { + # The build process measures CPU capabilities and optimizes the + # library to perform best on that particular machine. That is a + # great feature, but it's of limited use with pre-built binaries + # coming from a central build farm. + tolerateCpuTimingInaccuracy = true; + }; blas = callPackage ../development/libraries/science/math/blas { }; From be4b264bea3d622f21e5299493d46a405d4251de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 11:33:29 +0000 Subject: [PATCH 80/92] haskell-shakespeare-css: updated to version 0.10.7.1 svn path=/nixpkgs/trunk/; revision=32507 --- .../development/libraries/haskell/shakespeare-css/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 613399fa75b..20e4650d05b 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "0.10.7"; - sha256 = "0cla600s5715glimlf58gndpp7njhm26j78bfm16cxia5psp5zav"; + version = "0.10.7.1"; + sha256 = "0yi04ap2pl916ycs1wzaxrhjyx81lpmdad5in3qf1s4flfmi1h2k"; buildDepends = [ parsec shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 5232776a29eb77f1ed9f416ea7a53e34a87ec4e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 11:33:31 +0000 Subject: [PATCH 81/92] haskell-shakespeare-js: updated to version 0.11.1 svn path=/nixpkgs/trunk/; revision=32508 --- pkgs/development/libraries/haskell/shakespeare-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index b1dfc72ecec..fc651a69282 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "0.11.0.1"; - sha256 = "01gmsk1q5iq23m93n8mcmm02jqv3i7ksf1jw4qnla1gssdkx8ggk"; + version = "0.11.1"; + sha256 = "1sqkfl6pwwmn72xz5qf1bh58jr95w59ry6zmy939x73g9jgpzn6x"; buildDepends = [ shakespeare text ]; meta = { homepage = "http://www.yesodweb.com/book/templates"; From 808df319a25aacab6021daccf498a34028e56deb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 11:33:33 +0000 Subject: [PATCH 82/92] haskell-web-routes: updated to version 0.27.1 svn path=/nixpkgs/trunk/; revision=32509 --- pkgs/development/libraries/haskell/web-routes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 0a6d10539e1..270328441e1 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.26.3"; - sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx"; + version = "0.27.1"; + sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz"; buildDepends = [ blazeBuilder httpTypes mtl network parsec text utf8String ]; From 54939ca86c4c15738b43409c4ab19fe502c592da Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 11:33:36 +0000 Subject: [PATCH 83/92] haskell-xml-conduit: updated to version 0.5.3 svn path=/nixpkgs/trunk/; revision=32510 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 132d3de4a8f..056b8d53e65 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "0.5.2"; - sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd"; + version = "0.5.3"; + sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit conduit dataDefault failure systemFilepath text transformers From 23f9485c945c612fe7af2d3cad4af0dc49418248 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 11:33:39 +0000 Subject: [PATCH 84/92] haskell-mathblog: added version 0.4 svn path=/nixpkgs/trunk/; revision=32511 --- ...cies-on-SHA-HUnit-and-test-framework.patch | 41 +++++++++++++++++++ pkgs/applications/misc/mathblog/default.nix | 27 ++++++++++++ pkgs/top-level/haskell-packages.nix | 2 + 3 files changed, 70 insertions(+) create mode 100644 pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch create mode 100644 pkgs/applications/misc/mathblog/default.nix diff --git a/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch b/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch new file mode 100644 index 00000000000..bf524dc957d --- /dev/null +++ b/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch @@ -0,0 +1,41 @@ +From 0fbc8097f98481439e68aeb095a8d7e106924bbe Mon Sep 17 00:00:00 2001 +From: Jonathan Daugherty +Date: Tue, 21 Feb 2012 11:06:57 -0800 +Subject: [PATCH 6/8] Loosen dependencies on SHA, HUnit, and test-framework + +--- + mathblog.cabal | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/mathblog.cabal b/mathblog.cabal +index ea5498c..371dd12 100644 +--- a/mathblog.cabal ++++ b/mathblog.cabal +@@ -44,7 +44,7 @@ Executable mb + process >= 1.0, + time >= 1.1, + old-locale >= 1.0, +- SHA >= 1.4 && < 1.5, ++ SHA >= 1.4 && < 1.6, + bytestring >= 0.9 && < 1.0, + HStringTemplate >= 0.6 && < 0.7, + ConfigFile >= 1.1 && < 1.2 +@@ -79,12 +79,12 @@ Executable mb-tests + process >= 1.0 && < 1.1, + time >= 1.1, + old-locale >= 1.0 && < 1.1, +- SHA >= 1.4 && < 1.5, ++ SHA >= 1.4 && < 1.6, + bytestring >= 0.9 && < 1.0, + HStringTemplate >= 0.6 && < 0.7, + ConfigFile >= 1.1 && < 1.2, +- HUnit >= 1.2.2 && < 1.2.3, +- test-framework >= 0.3.3 && < 0.4, ++ HUnit >= 1.2.2 && < 1.2.5, ++ test-framework >= 0.3.3 && < 0.6, + test-framework-hunit >= 0.2.6 && < 0.3 + + GHC-Options: -Wall +-- +1.7.8 + diff --git a/pkgs/applications/misc/mathblog/default.nix b/pkgs/applications/misc/mathblog/default.nix new file mode 100644 index 00000000000..fa9dec04960 --- /dev/null +++ b/pkgs/applications/misc/mathblog/default.nix @@ -0,0 +1,27 @@ +{ cabal, ConfigFile, filepath, HStringTemplate, HUnit, pandoc +, pandocTypes, SHA, testFramework, testFrameworkHunit, time +}: + +cabal.mkDerivation (self: { + pname = "mathblog"; + version = "0.4"; + sha256 = "0kpawik74hp9k56b858idnlkla3iaalys8mas6c4gf4jfw2w0r3j"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA + testFramework testFrameworkHunit time + ]; + patches = [ + ./0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch + ]; + meta = { + description = "A program for creating and managing a static weblog with LaTeX math and function graphs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 85f76d42787..fa4c6ac4d9b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1622,6 +1622,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); leksah = callPackage ../applications/editors/leksah {}; + mathblog = callPackage ../applications/misc/mathblog {}; + xmobar = callPackage ../applications/misc/xmobar { parsec = self.parsec3; }; From 5892f691ddd733b3d9a863e82e634587dd6a567a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 16:08:52 +0000 Subject: [PATCH 85/92] haskell-cabal-file-th: updated to version 0.2.2 svn path=/nixpkgs/trunk/; revision=32513 --- .../libraries/haskell/cabal-file-th/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index 37350562eac..790ac305ac7 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -1,10 +1,10 @@ -{ cabal }: +{ cabal, Cabal }: cabal.mkDerivation (self: { pname = "cabal-file-th"; - version = "0.2.1"; - sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1"; - patchPhase = "sed -i cabal-file-th.cabal -e 's|Cabal >= 1.10 && < 1.13|Cabal|'"; + version = "0.2.2"; + sha256 = "1ql2gmg3mdfkmnk1m3966npr6l1in15fzlkbn7dr1cp4s90igqhy"; + buildDepends = [ Cabal ]; meta = { homepage = "http://github.com/nkpart/cabal-file-th"; description = "Template Haskell expressions for reading fields from a project's cabal file"; From 222adc9fc30d719fa7616fd54ac34330856c7b3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 16:08:57 +0000 Subject: [PATCH 86/92] haskell-funcmp: updated to version 1.6 svn path=/nixpkgs/trunk/; revision=32514 --- pkgs/development/libraries/haskell/funcmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index 60e93c81b94..1f26b0847d2 100755 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "funcmp"; - version = "1.5"; - sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e"; + version = "1.6"; + sha256 = "1l317gnav6adbdi849zdcgcvrlcs4mz4p0s67wg323prq713fkz0"; buildDepends = [ filepath ]; meta = { homepage = "http://savannah.nongnu.org/projects/funcmp/"; From 211be0db63971c3880d64453504124cb9a963f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 23 Feb 2012 16:20:09 +0000 Subject: [PATCH 87/92] Tell hydra to build xchat svn path=/nixpkgs/trunk/; revision=32515 --- pkgs/applications/networking/irc/xchat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix index 88ba5b9193e..30849c15ea3 100644 --- a/pkgs/applications/networking/irc/xchat/default.nix +++ b/pkgs/applications/networking/irc/xchat/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation { configureFlags = "--disable-nls"; meta = { + description = "IRC client using GTK". homepage = http://www.xchat.org; + platforms = with stdenv.lib.platforms; linux; }; } From 7c2ca5832986763b3e5bfa277f42ef3eeca8ba20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 17:56:52 +0000 Subject: [PATCH 88/92] xchat: fixed trivial syntax error svn path=/nixpkgs/trunk/; revision=32516 --- pkgs/applications/networking/irc/xchat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix index 30849c15ea3..4b9cef2d501 100644 --- a/pkgs/applications/networking/irc/xchat/default.nix +++ b/pkgs/applications/networking/irc/xchat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { configureFlags = "--disable-nls"; meta = { - description = "IRC client using GTK". + description = "IRC client using GTK"; homepage = http://www.xchat.org; platforms = with stdenv.lib.platforms; linux; }; From 1ee7c4250ffce7fad5749bee0de5530425052dce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 18:07:09 +0000 Subject: [PATCH 89/92] linux-3.2.nix: updated to version 3.2.7 svn path=/nixpkgs/trunk/; revision=32517 --- pkgs/os-specific/linux/kernel/linux-3.2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 458b8bbce3d..66643a3117e 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -226,7 +226,7 @@ in import ./generic.nix ( rec { - version = "3.2.4"; + version = "3.2.7"; testing = false; modDirVersion = version; @@ -234,10 +234,10 @@ import ./generic.nix ( preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; - + src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/${if testing then "testing/" else ""}linux-${version}.tar.bz2"; - sha256 = "1c648a7041e65a167d3fd8beda484a3d55c35cad9d6d189b9949d3c621887da7"; + sha256 = "e80009e097e137b9a1f1efacabc482c1d4b3651b238bf733a41595d0b387ae12"; }; config = configWithPlatform stdenv.platform; From 31e7a2ce7a0caa65095468709791e658944e2ef5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 23 Feb 2012 18:32:42 +0000 Subject: [PATCH 90/92] gecko-mediaplayer: updated to version 1.0.5 I hoped this update would fix the build errors, but in fact it didn't. :-( svn path=/nixpkgs/trunk/; revision=32518 --- .../mozilla-plugins/gecko-mediaplayer/default.nix | 8 ++++---- .../browsers/mozilla-plugins/gmtk/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index ddb70e6d633..0ff7c92d3d8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11 -, GConf, gnome_mplayer, MPlayer +, GConf, gnome_mplayer, MPlayer, gmtk }: stdenv.mkDerivation rec { - name = "gecko-mediaplayer-1.0.4"; + name = "gecko-mediaplayer-1.0.5"; src = fetchurl { url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz"; - sha256 = "18asxxsqng303cxcww75k4r6syqjs7lylibv997kq0869kz4spsp"; + sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49"; }; - buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner]; + buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner gmtk ]; # !!! fix this preBuild = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix new file mode 100644 index 00000000000..6ccab87ebe7 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }: + +stdenv.mkDerivation rec { + name = "gmtk-1.0.5"; + + src = fetchurl { + url = "http://gmtk.googlecode.com/files/${name}.tar.gz"; + sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468"; + }; + + buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 635b918d3a9..4af3ac9797c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6929,6 +6929,11 @@ let gqview = callPackage ../applications/graphics/gqview { }; + gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { + inherit (gnome) GConf; + inherit (gtkLibs) gtk; + }; + googleearth = callPackage_i686 ../applications/misc/googleearth { }; google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { From 65e7aeda65e30ceb44c6d8773bbf69dd122bd9c9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 23 Feb 2012 19:59:22 +0000 Subject: [PATCH 91/92] vala-0.14.2 svn path=/nixpkgs/trunk/; revision=32519 --- pkgs/development/compilers/vala/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 02a91cebb13..0aaab91cd81 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,16 +1,17 @@ -{stdenv, fetchurl, yacc, flex, pkgconfig, glib}: +{stdenv, fetchurl, yacc, flex, pkgconfig, glib, xz}: stdenv.mkDerivation rec { - baseName = "vala"; - baseVersion = "0.11"; - revision = "2"; - version = "${baseVersion}.${revision}"; - name = "${baseName}-${version}"; + name = "vala-0.14.2"; + src = fetchurl { - url = "mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2"; - sha256 = "489b60a49a03c8915b513a722ca08986c18ae0dc6489cce6bbb8415670612046"; + url = mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz; + sha256 = "1l5kllw9vpwv24lzv9fp64l3sad46wpxgvsgryrwlrjg91w6jzl0"; }; - buildInputs = [ yacc flex glib pkgconfig ]; + + buildNativeInputs = [ yacc flex pkgconfig xz ]; + + buildInputs = [ glib ]; + meta = { description = "Compiler for the GObject type system"; homepage = "http://live.gnome.org/Vala"; From bf2579b4a3b4e7b8aaa5437f72b607019978f22e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 23 Feb 2012 20:24:00 +0000 Subject: [PATCH 92/92] Latest netpbm (builds with libpng-1.5) svn path=/nixpkgs/trunk/; revision=32521 --- pkgs/tools/graphics/netpbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index a9d3b5c394c..06a89a1e2da 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchsvn { url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; - rev = 1177; - sha256 = "d8893599fcb7839025e7fbe24120928b4bbcd70f0e1034a21d91885c40a5c39f"; + rev = 1656; + sha256 = "0mbrvd8nc52yrg8wgxcvxsajxc9qrnjqhlcks6dpdzq7qmwjy6g9"; }; NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";