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/10] 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 000000000000..ccc088816c6a --- /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 722441121533..0c92ffbcdbb1 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 0830758837ff..078f62707b3c 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/10] 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 803e42a1b945..53d495eb4c57 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/10] * 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 af04ab54dbe4..000000000000 --- 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 078f62707b3c..029232a39fc2 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/10] 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 6cdc57d11b5d..4a1c0be649ff 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/10] 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 000000000000..0b54e8286095 --- /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 029232a39fc2..97dae6ac2a20 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/10] 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 97dae6ac2a20..da7b88385b68 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/10] * 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 34cd1d8ed260..e71bd9f2a864 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/10] 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 913f4acdc7dd..64e535bf2728 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 000000000000..0b02b0097252 --- /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/10] 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 0b2383126294..ad553c9db346 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/10] 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 bd1885f9bd95..caea5b4bb4fb 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