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";
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/build-support/cabal/default.nix
similarity index 98%
rename from pkgs/development/libraries/haskell/cabal/cabal.nix
rename to pkgs/build-support/cabal/default.nix
index a490bdc7d214..8ae8c06d5132 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/build-support/cabal/default.nix
@@ -126,12 +126,12 @@
./Setup copy
- mkdir -p $out/bin # necessary to get it added to PATH
+ ensureDir $out/bin # necessary to get it added to PATH
local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
local installedPkgConf=$confDir/${self.fname}.installedconf
local pkgConf=$confDir/${self.fname}.conf
- mkdir -p $confDir
+ ensureDir $confDir
./Setup register --gen-pkg-config=$pkgConf
if test -f $pkgConf; then
echo '[]' > $installedPkgConf
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/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index e231c20e7a3e..b8ed81de487b 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 @@
+
+
+
+-
+
+
+
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/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/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index 99f73e07a631..5fc5e9be84e8 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
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 = [
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/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}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 700058082aa9..769e4ad3f9cc 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.
@@ -3796,6 +3791,8 @@ let
intltool = gnome.intltool;
+ irrlicht3843 = callPackage ../development/libraries/irrlicht { };
+
isocodes = callPackage ../development/libraries/iso-codes { };
itk = callPackage ../development/libraries/itk { };
@@ -7678,6 +7675,8 @@ let
alienarena = callPackage ../games/alienarena { };
+ andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
+
asc = callPackage ../games/asc {
lua = lua5;
libsigcxx = libsigcxx12;
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;
};