Author: urkud
Date: Sun Jan 8 23:33:18 2012
New Revision: 31448
URL: https://nixos.org/websvn/nix/?rev=31448&sc=1
Log:
svn merge ^/nixpkgs/trunk
Added:
nixpkgs/branches/libpng15/pkgs/applications/office/skrooge/
- copied from r31447, nixpkgs/trunk/pkgs/applications/office/skrooge/
nixpkgs/branches/libpng15/pkgs/applications/office/zanshin/
- copied from r31447, nixpkgs/trunk/pkgs/applications/office/zanshin/
nixpkgs/branches/libpng15/pkgs/applications/video/dvswitch/
- copied from r31447, nixpkgs/trunk/pkgs/applications/video/dvswitch/
nixpkgs/branches/libpng15/pkgs/development/libraries/aqbanking/
- copied from r31447, nixpkgs/trunk/pkgs/development/libraries/aqbanking/
nixpkgs/branches/libpng15/pkgs/development/libraries/gwenhywfar/
- copied from r31447, nixpkgs/trunk/pkgs/development/libraries/gwenhywfar/
nixpkgs/branches/libpng15/pkgs/development/libraries/libalkimia/
- copied from r31447, nixpkgs/trunk/pkgs/development/libraries/libalkimia/
nixpkgs/branches/libpng15/pkgs/games/xmoto/r3402.patch
- copied unchanged from r31447, nixpkgs/trunk/pkgs/games/xmoto/r3402.patch
nixpkgs/branches/libpng15/pkgs/tools/misc/unclutter/
- copied from r31447, nixpkgs/trunk/pkgs/tools/misc/unclutter/
Deleted:
nixpkgs/branches/libpng15/pkgs/applications/misc/kbasket/
Modified:
nixpkgs/branches/libpng15/ (props changed)
nixpkgs/branches/libpng15/pkgs/applications/office/kmymoney/default.nix
nixpkgs/branches/libpng15/pkgs/games/six/default.nix
nixpkgs/branches/libpng15/pkgs/games/xmoto/default.nix
nixpkgs/branches/libpng15/pkgs/games/xmoto/src-for-default.nix
nixpkgs/branches/libpng15/pkgs/os-specific/linux/htop/default.nix
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/libpng15/pkgs/applications/office/kmymoney/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/applications/office/kmymoney/default.nix
Sun Jan 8 23:31:31 2012 (r31447)
+++ nixpkgs/branches/libpng15/pkgs/applications/office/kmymoney/default.nix
Sun Jan 8 23:33:18 2012 (r31448)
@@ -1,17 +1,19 @@
{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext,
- shared_mime_info, perl, boost, gpgme }:
+ shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
stdenv.mkDerivation rec {
- name = "kmymoney-4.5.3";
+ name = "kmymoney-4.6.1";
src = fetchurl {
url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
- sha256 = "1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9";
+ sha256 = "0ympq70z0a9zrs623jznj6hnjph2rdhpra0np2mqm1mmy72bkjjz";
};
- buildInputs = [ kdelibs kdepimlibs perl boost gpgme ];
+ buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
];
buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ];
+ KDEDIRS = libalkimia;
+
patches = [ ./qgpgme.patch ];
meta = {
Modified: nixpkgs/branches/libpng15/pkgs/games/six/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/games/six/default.nix Sun Jan 8
23:31:31 2012 (r31447)
+++ nixpkgs/branches/libpng15/pkgs/games/six/default.nix Sun Jan 8
23:33:18 2012 (r31448)
@@ -19,6 +19,7 @@
description = "Six - A Hex playing program for KDE";
homepage = http://six.retes.hu/;
license = "GPLv2";
+ platforms = stdenv.lib.platforms.linux;
};
buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ];
Modified: nixpkgs/branches/libpng15/pkgs/games/xmoto/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/games/xmoto/default.nix Sun Jan 8
23:31:31 2012 (r31447)
+++ nixpkgs/branches/libpng15/pkgs/games/xmoto/default.nix Sun Jan 8
23:33:18 2012 (r31448)
@@ -4,7 +4,7 @@
buildInputs = with a; [
chipmunk sqlite curl zlib bzip2 libjpeg libpng
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
- lua5 ode libxdg_basedir
+ lua5 ode libxdg_basedir libxml2
];
in
rec {
@@ -17,6 +17,8 @@
/* doConfigure should be removed if not needed */
phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"];
+ patches = [ ./r3402.patch ];
+
meta = {
description = "X-Moto - obstacled race game";
maintainers = [
Copied: nixpkgs/branches/libpng15/pkgs/games/xmoto/r3402.patch (from r31447,
nixpkgs/trunk/pkgs/games/xmoto/r3402.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/libpng15/pkgs/games/xmoto/r3402.patch Sun Jan 8
23:33:18 2012 (r31448, copy of r31447,
nixpkgs/trunk/pkgs/games/xmoto/r3402.patch)
@@ -0,0 +1,26 @@
+Index: a/src/image/tim_png.cpp
+===================================================================
+--- a/src/image/tim_png.cpp (revision 3401)
++++ b/src/image/tim_png.cpp (revision 3402)
+@@ -25,7 +25,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include "tim.h"
+-#include "png.h"
++#include <png.h>
++#include <zlib.h>
+
+
/*==============================================================================
+ Types
+Index: ChangeLog
+===================================================================
+--- a/ChangeLog (revision 3401)
++++ b/ChangeLog (revision 3402)
+@@ -1,3 +1,7 @@
++X-Moto 0.5.10 2012-
++--------------------------------
++ * libpng patch by Kelly Anderson
++
+ X-Moto 0.5.9 2011-11-13
+ --------------------------------
+ * fix a compilation error with libxml
Modified: nixpkgs/branches/libpng15/pkgs/games/xmoto/src-for-default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/games/xmoto/src-for-default.nix Sun Jan
8 23:31:31 2012 (r31447)
+++ nixpkgs/branches/libpng15/pkgs/games/xmoto/src-for-default.nix Sun Jan
8 23:33:18 2012 (r31448)
@@ -1,9 +1,9 @@
rec {
- version="0.5.7";
- name="xmoto-0.5.7";
- hash="19pwxjgvajv2img3sz8rd0c37d1gsidscwwjbm4jyxhahgg33mks";
+ version="0.5.9";
+ name="xmoto-0.5.9";
+ hash="1r1kl3w2scncw754lgsfa7i6hh4mg39zc3bcvd1iqcmdfr25gmvl";
url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";;
-
advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.7/xmoto-0.5.7-src.tar.gz";;
+
advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.9/xmoto-0.5.9-src.tar.gz";;
}
Modified: nixpkgs/branches/libpng15/pkgs/os-specific/linux/htop/default.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/os-specific/linux/htop/default.nix Sun Jan
8 23:31:31 2012 (r31447)
+++ nixpkgs/branches/libpng15/pkgs/os-specific/linux/htop/default.nix Sun Jan
8 23:33:18 2012 (r31448)
@@ -1,14 +1,14 @@
{fetchurl, stdenv, ncurses}:
let
- name = "htop-0.9";
+ name = "htop-1.0";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://sourceforge/htop/${name}.tar.gz";
- sha256 =
"4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd";
+ sha256 =
"242879b86db4b97e1090e7cd391247268ccbe90834ff34b6e8242926c9664852";
};
buildInputs = [ncurses];
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sun Jan 8
23:31:31 2012 (r31447)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sun Jan 8
23:33:18 2012 (r31448)
@@ -1506,6 +1506,8 @@
ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
+ unclutter = callPackage ../tools/misc/unclutter { };
+
unbound = callPackage ../tools/networking/unbound { };
units = callPackage ../tools/misc/units { };
@@ -2659,12 +2661,13 @@
pure = callPackage ../development/interpreters/pure {};
python = python27;
+ python3 = python32;
python26 = callPackage ../development/interpreters/python/2.6 { };
python27 = callPackage ../development/interpreters/python/2.7 { };
- python3 = callPackage ../development/interpreters/python/3.1 {
+ python31 = callPackage ../development/interpreters/python/3.1 {
arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
};
@@ -2821,7 +2824,10 @@
automake111x = callPackage
../development/tools/misc/automake/automake-1.11.x.nix {
doCheck = !stdenv.isArm && !stdenv.isCygwin
# Some of the parallel tests seem to hang on `i386-pc-solaris2.11'.
- && stdenv.system != "i686-solaris";
+ && stdenv.system != "i686-solaris"
+
+ # One test fails to terminate on FreeBSD: <http://bugs.gnu.org/8788>.
+ && !stdenv.isFreeBSD;
};
automoc4 = callPackage ../development/tools/misc/automoc4 { };
@@ -3144,6 +3150,8 @@
attr = callPackage ../development/libraries/attr { };
+ aqbanking = callPackage ../development/libraries/aqbanking { };
+
aubio = callPackage ../development/libraries/aubio { };
axis = callPackage ../development/libraries/axis { };
@@ -3692,6 +3700,8 @@
gts = callPackage ../development/libraries/gts { };
+ gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
+
# TODO : Add MIT Kerberos and let admin choose.
kerberos = heimdal;
@@ -6178,7 +6188,7 @@
xmoto = builderDefsPackage (import ../games/xmoto) {
inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
- lua5 ode libxdg_basedir;
+ lua5 ode libxdg_basedir libxml2;
};
xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
@@ -6517,6 +6527,11 @@
dvdauthor = callPackage ../applications/video/dvdauthor { };
+ dvswitch = callPackage ../applications/video/dvswitch {
+ inherit (gtkLibs) gtkmm;
+ inherit (xlibs) libXau libXdmcp libXv libpthreadstubs pixman;
+ };
+
dwm = callPackage ../applications/window-managers/dwm {
patches = getConfig [ "dwm" "patches" ] [];
};
@@ -8008,11 +8023,6 @@
inherit (kde3) kdelibs;
};
- kbasket = callPackage ../applications/misc/kbasket {
- stdenv = overrideGCC stdenv gcc43;
- inherit (kde3) kdelibs;
- };
-
kphone = callPackage ../applications/networking/kphone {
stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
};
@@ -8097,6 +8107,8 @@
kuickshow = callPackage ../applications/graphics/kuickshow { };
+ libalkimia = callPackage ../development/libraries/libalkimia { };
+
libktorrent = callPackage ../development/libraries/libktorrent { };
libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
@@ -8129,7 +8141,11 @@
semnotes = callPackage ../applications/misc/semnotes { };
+ skrooge = callPackage ../applications/office/skrooge { };
+
yakuake = callPackage ../applications/misc/yakuake { };
+
+ zanshin = callPackage ../applications/office/zanshin { };
};
redshift = callPackage ../applications/misc/redshift {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
