Author: urkud
Date: Mon Feb 20 05:30:06 2012
New Revision: 32417
URL: https://nixos.org/websvn/nix/?rev=32417&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/stdenv-updates/pkgs/build-support/cabal/
- copied from r32416, nixpkgs/trunk/pkgs/build-support/cabal/
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/irrlicht/
- copied from r32416, nixpkgs/trunk/pkgs/development/libraries/irrlicht/
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch
- copied unchanged from r32416,
nixpkgs/trunk/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch
nixpkgs/branches/stdenv-updates/pkgs/games/andyetitmoves/
- copied from r32416, nixpkgs/trunk/pkgs/games/andyetitmoves/
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/haskell/cabal/
nixpkgs/branches/stdenv-updates/pkgs/tools/graphics/graphviz/2.24.nix
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qtscriptgenerator/default.nix
nixpkgs/branches/stdenv-updates/pkgs/games/super-tux-kart/default.nix
nixpkgs/branches/stdenv-updates/pkgs/games/the-butterfly-effect/default.nix
nixpkgs/branches/stdenv-updates/pkgs/servers/http/nginx/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
Mon Feb 20 05:28:06 2012 (r32416)
+++ nixpkgs/branches/stdenv-updates/pkgs/applications/audio/amarok/default.nix
Mon Feb 20 05:30:06 2012 (r32417)
@@ -7,11 +7,11 @@
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";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qtscriptgenerator/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qtscriptgenerator/default.nix
Mon Feb 20 05:28:06 2012 (r32416)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qtscriptgenerator/default.nix
Mon Feb 20 05:30:06 2012 (r32417)
@@ -8,7 +8,7 @@
};
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 = ''
Copied:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch
(from r32416,
nixpkgs/trunk/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/qtscriptgenerator/qt-4.8.patch
Mon Feb 20 05:30:06 2012 (r32417, copy of r32416,
nixpkgs/trunk/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 @@
+
+
+ </object-type>
+- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type()
== QEvent::FileOpen"/>
+ <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() ==
QEvent::FocusIn || %1->type() == QEvent::FocusOut">
+ <modify-function signature="reason()const">
+ <remove/>
+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 @@
+
+
+ </object-type>
+- <object-type name="QFileOpenEvent" polymorphic-id-expression="%1->type()
== QEvent::FileOpen"/>
+ <object-type name="QFocusEvent" polymorphic-id-expression="%1->type() ==
QEvent::FocusIn || %1->type() == QEvent::FocusOut">
+ <modify-function signature="reason()const">
+ <remove/>
Modified: nixpkgs/branches/stdenv-updates/pkgs/games/super-tux-kart/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/games/super-tux-kart/default.nix
Mon Feb 20 05:28:06 2012 (r32416)
+++ nixpkgs/branches/stdenv-updates/pkgs/games/super-tux-kart/default.nix
Mon Feb 20 05:30:06 2012 (r32417)
@@ -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
'';
Modified:
nixpkgs/branches/stdenv-updates/pkgs/games/the-butterfly-effect/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/games/the-butterfly-effect/default.nix
Mon Feb 20 05:28:06 2012 (r32416)
+++ nixpkgs/branches/stdenv-updates/pkgs/games/the-butterfly-effect/default.nix
Mon Feb 20 05:30:06 2012 (r32417)
@@ -1,5 +1,5 @@
x@{builderDefsPackage
- , qt4, box2d
+ , qt4, box2d, which
,fetchsvn
, ...}:
builderDefsPackage
Modified: nixpkgs/branches/stdenv-updates/pkgs/servers/http/nginx/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/servers/http/nginx/default.nix Mon Feb
20 05:28:06 2012 (r32416)
+++ nixpkgs/branches/stdenv-updates/pkgs/servers/http/nginx/default.nix Mon Feb
20 05:30:06 2012 (r32417)
@@ -22,6 +22,10 @@
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 = [
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
Mon Feb 20 05:28:06 2012 (r32416)
+++ nixpkgs/branches/stdenv-updates/pkgs/tools/networking/dhcpcd/default.nix
Mon Feb 20 05:30:06 2012 (r32417)
@@ -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}";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Feb
20 05:28:06 2012 (r32416)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Mon Feb
20 05:30:06 2012 (r32417)
@@ -784,11 +784,6 @@
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 @@
intltool = gnome.intltool;
+ irrlicht3843 = callPackage ../development/libraries/irrlicht { };
+
isocodes = callPackage ../development/libraries/iso-codes { };
itk = callPackage ../development/libraries/itk { };
@@ -7678,6 +7675,8 @@
alienarena = callPackage ../games/alienarena { };
+ andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {}
else null;
+
asc = callPackage ../games/asc {
lua = lua5;
libsigcxx = libsigcxx12;
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Mon Feb
20 05:28:06 2012 (r32416)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/haskell-packages.nix Mon Feb
20 05:30:06 2012 (r32417)
@@ -121,7 +121,7 @@
# 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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
