Author: eelco
Date: Thu Feb 17 16:33:39 2011
New Revision: 26018
URL: https://svn.nixos.org/websvn/nix/?rev=26018&sc=1
Log:
* Sync with the trunk.
Added:
nixpkgs/branches/x-updates/pkgs/games/warmux/
- copied from r26017, nixpkgs/trunk/pkgs/games/warmux/
nixpkgs/branches/x-updates/pkgs/misc/ghostscript/pstoraster.patch
- copied unchanged from r26017,
nixpkgs/trunk/pkgs/misc/ghostscript/pstoraster.patch
Replaced:
nixpkgs/branches/x-updates/pkgs/games/warmux/default.nix
- copied unchanged from r26017,
nixpkgs/trunk/pkgs/games/warmux/default.nix
Modified:
nixpkgs/branches/x-updates/ (props changed)
nixpkgs/branches/x-updates/maintainers/scripts/gnu/gnupdate
nixpkgs/branches/x-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/misc/xneur/0.8.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
nixpkgs/branches/x-updates/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/nix-build.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/rpm-build.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.8.2.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/compilers/ghc/6.8.3.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/aterm/2.8.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/glibc-2.9/ (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/goocanvas/ (props
changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/documentation/haddock/haddock-2.1.0.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/misc/ghostscript/default.nix
nixpkgs/branches/x-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/x-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/x-updates/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
nixpkgs/branches/x-updates/pkgs/os-specific/linux/atheros/r3867.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/util-linux-ng/ (props
changed)
nixpkgs/branches/x-updates/pkgs/os-specific/linux/xf86-input-wacom/default.nix
nixpkgs/branches/x-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/servers/monitoring/zabbix/default.nix
nixpkgs/branches/x-updates/pkgs/shells/bash/default.nix (props changed)
nixpkgs/branches/x-updates/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/branches/x-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/x-updates/pkgs/tools/misc/recutils/default.nix
nixpkgs/branches/x-updates/pkgs/tools/networking/wget/default.nix (props
changed)
nixpkgs/branches/x-updates/pkgs/tools/package-management/nix/unstable.nix
nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/x-updates/pkgs/top-level/guile-2-test.nix
Modified: nixpkgs/branches/x-updates/maintainers/scripts/gnu/gnupdate
==============================================================================
--- nixpkgs/branches/x-updates/maintainers/scripts/gnu/gnupdate Thu Feb 17
15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/maintainers/scripts/gnu/gnupdate Thu Feb 17
16:33:39 2011 (r26018)
@@ -624,12 +624,6 @@
project message args)
'())))
-(define pointer->procedure
- ;; Compatibility hack for Guile up to 1.9.12 included.
- (if (defined? 'pointer->procedure)
- pointer->procedure
- make-foreign-function))
-
(define version-string>?
(let ((strverscmp
(let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
Modified:
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
Thu Feb 17 15:41:28 2011 (r26017)
+++
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
Thu Feb 17 16:33:39 2011 (r26018)
@@ -11,14 +11,14 @@
}:
-let version = "3.1.6"; in
+let version = "3.1.7"; in
stdenv.mkDerivation {
name = "thunderbird-${version}";
src = fetchurl {
url =
"http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";;
- sha1 = "d9c089c64cc7a784e128d9c594ef649a35babe30";
+ sha1 = "c2d6cdedfe399c1ab41c00045e4fce835cc0b36f";
};
buildInputs =
Copied: nixpkgs/branches/x-updates/pkgs/games/warmux/default.nix (from r26017,
nixpkgs/trunk/pkgs/games/warmux/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/games/warmux/default.nix Thu Feb 17
16:33:39 2011 (r26018, copy of r26017,
nixpkgs/trunk/pkgs/games/warmux/default.nix)
@@ -0,0 +1,50 @@
+x@{builderDefsPackage
+ , curl, gnutls, fribidi, libpng, SDL, SDL_gfx, SDL_image, SDL_mixer
+ , SDL_net, SDL_ttf, libunwind, libX11, xproto, libxml2, pkgconfig
+ , gettext, intltool, libtool, perl
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="warmux";
+ version="11.01";
+ name="${baseName}-${version}";
+ url="http://download.gna.org/${baseName}/${name}.tar.bz2";;
+ hash="1f063yaab08gflh4hnd8clb4as41ayfphi4q0cmi8syjiaap2qgh";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "Ballistics turn-based battle game between teams";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = a.lib.licenses.gpl2;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://download.gna.org/warmux/";;
+ };
+ };
+}) x
+
Modified: nixpkgs/branches/x-updates/pkgs/misc/ghostscript/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/misc/ghostscript/default.nix Thu Feb
17 15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/pkgs/misc/ghostscript/default.nix Thu Feb
17 16:33:39 2011 (r26018)
@@ -37,7 +37,7 @@
CFLAGS = "-fPIC";
- patches = [ ./purity.patch ./urw-font-files.patch ];
+ patches = [ ./purity.patch ./urw-font-files.patch ./pstoraster.patch];
doCheck = true;
Copied: nixpkgs/branches/x-updates/pkgs/misc/ghostscript/pstoraster.patch (from
r26017, nixpkgs/trunk/pkgs/misc/ghostscript/pstoraster.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/x-updates/pkgs/misc/ghostscript/pstoraster.patch Thu Feb
17 16:33:39 2011 (r26018, copy of r26017,
nixpkgs/trunk/pkgs/misc/ghostscript/pstoraster.patch)
@@ -0,0 +1,81 @@
+Upstream issue: http://bugs.ghostscript.com/show_bug.cgi?id=691108
+e.g. printing a test page prints only black
+
+Patch: https://bugs.archlinux.org/task/18339
+
+--- a/cups/gdevcups.c
++++ b/cups/gdevcups.c
+@@ -975,7 +975,8 @@ cups_map_cmyk(gx_device *pdev, /* I - Device
info */
+ frac k, /* I - Black value */
+ frac *out) /* O - Device colors */
+ {
+- int c0, c1, c2, c3; /* Temporary color values */
++ int c0 = 0, c1 = 0,
++ c2 = 0, c3 = 0; /* Temporary color values */
+ float rr, rg, rb, /* Real RGB colors */
+ ciex, ciey, ciez, /* CIE XYZ colors */
+ ciey_yn, /* Normalized luminance */
+@@ -2703,9 +2704,13 @@ cups_put_params(gx_device *pdev, /* I - Device
info */
+ int color_set; /* Were the color attrs set? */
+ gdev_prn_space_params sp; /* Space parameter data */
+ int width, /* New width of page */
+- height; /* New height of page */
++ height, /* New height of page */
++ colorspace, /* New color space */
++ bitspercolor; /* New bits per color */
+ static int width_old = 0, /* Previous width */
+- height_old = 0; /* Previous height */
++ height_old = 0, /* Previous height */
++ colorspace_old = 0,/* Previous color space */
++ bitspercolor_old = 0;/* Previous bits per color */
+ ppd_attr_t *backside = NULL,
+ *backsiderequiresflippedmargins = NULL;
+ float swap;
+@@ -2800,9 +2805,10 @@ cups_put_params(gx_device *pdev, /* I - Device
info */
+ else if (code == 0) \
+ { \
+ dprintf1("DEBUG: Setting %s to", sname); \
+- for (i = 0; i < count; i ++) \
+- dprintf1(" %d", (unsigned)(arrayval.data[i])); \
+- cups->header.name[i] = (unsigned)arrayval.data[i]; \
++ for (i = 0; i < count; i ++) { \
++ dprintf1(" %d", (unsigned)(arrayval.data[i])); \
++ cups->header.name[i] = (unsigned)(arrayval.data[i]); \
++ } \
+ dprintf("...\n"); \
+ }
+
+@@ -3243,23 +3249,31 @@ cups_put_params(gx_device *pdev, /* I - Device
info */
+ }
+ #endif /* CUPS_RASTER_SYNCv1 */
+
++ colorspace = cups->header.cupsColorSpace;
++ bitspercolor = cups->header.cupsBitsPerColor;
++
+ /*
+ * Don't reallocate memory unless the device has been opened...
+ * Also reallocate only if the size has actually changed...
+ */
+
+- if (pdev->is_open && (width != width_old || height != height_old))
++ if (pdev->is_open &&
++ (width != width_old || height != height_old ||
++ colorspace != colorspace_old || bitspercolor != bitspercolor_old))
+ {
+
+ width_old = width;
+ height_old = height;
++ colorspace_old = colorspace;
++ bitspercolor_old = bitspercolor;
+
+ /*
+ * Device is open and size has changed, so reallocate...
+ */
+
+- dprintf4("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels...\n",
+- pdev->MediaSize[0], pdev->MediaSize[1], width, height);
++ dprintf6("DEBUG2: Reallocating memory, [%.0f %.0f] = %dx%d pixels,
color space: %d, bits per color: %d...\n",
++ pdev->MediaSize[0], pdev->MediaSize[1], width, height,
++ colorspace, bitspercolor);
+
+ sp = ((gx_device_printer *)pdev)->space_params;
\ No newline at end of file
Modified:
nixpkgs/branches/x-updates/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
Thu Feb 17 15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
Thu Feb 17 16:33:39 2011 (r26018)
@@ -2,19 +2,20 @@
cmake, glib, gtk, pkgconfig }:
stdenv.mkDerivation rec {
- name = "oxygen-gtk";
version = "1.0.1";
-
+ name = "oxygen-gtk-${version}";
+
src = fetchurl {
- url =
"mirror://kde/stable/${name}/${version}/src/${name}-${version}.tar.bz2";
+ url = "mirror://kde/stable/oxygen-gtk/${version}/src/${name}.tar.bz2";
sha256 = "0ki8qllr5ai48bl2pz8rxzf5cax08ckhgrn0nlf815ba83jfar32";
};
buildInputs = [ cmake glib gtk pkgconfig ];
- meta = {
+ meta = with stdenv.lib; {
description = "Port of the default KDE widget theme (Oxygen), to gtk";
homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk;
- licence = "LGPLv2";
+ license = licenses.lgpl2;
+ maintainers = [ maintainers.goibhniu ];
};
}
Modified:
nixpkgs/branches/x-updates/pkgs/os-specific/linux/xf86-input-wacom/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/os-specific/linux/xf86-input-wacom/default.nix
Thu Feb 17 15:41:28 2011 (r26017)
+++
nixpkgs/branches/x-updates/pkgs/os-specific/linux/xf86-input-wacom/default.nix
Thu Feb 17 16:33:39 2011 (r26018)
@@ -27,10 +27,10 @@
'';
meta = with stdenv.lib; {
- maintainers = [ maintainers.urkud ];
+ maintainers = [ maintainers.goibhniu maintainers.urkud ];
description = "Wacom digitizer driver for X11";
homepage = http://linuxwacom.sourceforge.net;
- license = "GPLv2";
+ license = licenses.gpl2;
platforms = platforms.linux; # Probably, works with other unices as well
};
}
Modified: nixpkgs/branches/x-updates/pkgs/servers/monitoring/zabbix/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/servers/monitoring/zabbix/default.nix
Thu Feb 17 15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/pkgs/servers/monitoring/zabbix/default.nix
Thu Feb 17 16:33:39 2011 (r26018)
@@ -2,11 +2,11 @@
let
- version = "1.8.3";
+ version = "1.8.4";
src = fetchurl {
url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
- sha256 = "0p064602bgkwcs0hmij9i8fn50bx4w6liw8b71hs6qcn3isjs9ip";
+ sha256 = "0fhn4gw8r96dy0z227k5bl144zpmgsk1jkwzhi61qqr44mz27fqc";
};
preConfigure =
Modified: nixpkgs/branches/x-updates/pkgs/tools/misc/recutils/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/tools/misc/recutils/default.nix Thu Feb
17 15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/pkgs/tools/misc/recutils/default.nix Thu Feb
17 16:33:39 2011 (r26018)
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, gettext, emacs, curl, check, bc }:
stdenv.mkDerivation rec {
- name = "recutils-1.2";
+ name = "recutils-1.3";
src = fetchurl {
url = "mirror://gnu/recutils/${name}.tar.gz";
- sha256 = "1y95niq6d06wyynrgkjs3bi1lj91v4qwdfam3sp31s4ki6vlaqkq";
+ sha256 = "0ywf939vw4zbpq6dmvw656fhkx8izma99pr1akzh8hs2rc9sp2pr";
};
doCheck = true;
Modified:
nixpkgs/branches/x-updates/pkgs/tools/package-management/nix/unstable.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/tools/package-management/nix/unstable.nix
Thu Feb 17 15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/pkgs/tools/package-management/nix/unstable.nix
Thu Feb 17 16:33:39 2011 (r26018)
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "nix-1.0pre25886";
+ name = "nix-1.0pre26015";
src = fetchurl {
- url = "http://hydra.nixos.org/build/894162/download/4/${name}.tar.bz2";;
- sha256 =
"4513a6a42f485bed692ba2d34214383496f59064b9eb5d5ecec739dda703ddb3";
+ url = "http://hydra.nixos.org/build/920246/download/4/${name}.tar.bz2";;
+ sha256 =
"d2c9caa8573689de4e95eecaf9829d4b672ea3cb9bdfa825dac0ab0dbffb3c70";
};
buildNativeInputs = [ perl pkgconfig ];
Modified: nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Thu Feb 17
15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/pkgs/top-level/all-packages.nix Thu Feb 17
16:33:39 2011 (r26018)
@@ -644,7 +644,9 @@
freeipmi = callPackage ../tools/system/freeipmi {};
- freetalk = callPackage
../applications/networking/instant-messengers/freetalk {};
+ freetalk = callPackage
../applications/networking/instant-messengers/freetalk {
+ guile = guile_1_8;
+ };
ftgl = callPackage ../development/libraries/ftgl { };
@@ -3763,12 +3765,13 @@
liquidwar = builderDefsPackage ../games/liquidwar {
inherit (xlibs) xproto libX11 libXrender;
- inherit gmp guile mesa libjpeg libpng
+ inherit gmp mesa libjpeg libpng
expat gettext perl
SDL SDL_image SDL_mixer SDL_ttf
curl sqlite
libogg libvorbis
;
+ guile = guile_1_8;
};
log4cxx = callPackage ../development/libraries/log4cxx { };
@@ -7087,6 +7090,8 @@
ut2004demo = callPackage ../games/ut2004demo { };
+ warmux = callPackage ../games/warmux {};
+
warsow = callPackage ../games/warsow {
libjpeg = libjpeg62;
};
@@ -7466,6 +7471,7 @@
lilypond = callPackage ../misc/lilypond {
inherit (gtkLibs) pango;
+ guile = guile_1_8;
};
martyr = callPackage ../development/libraries/martyr { };
Modified: nixpkgs/branches/x-updates/pkgs/top-level/guile-2-test.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/top-level/guile-2-test.nix Thu Feb 17
15:41:28 2011 (r26017)
+++ nixpkgs/branches/x-updates/pkgs/top-level/guile-2-test.nix Thu Feb 17
16:33:39 2011 (r26018)
@@ -79,4 +79,6 @@
ballAndPaddle = linux;
drgeo = linux;
lilypond = linux;
+ liquidwar = linux;
+ freetalk = linux;
})
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
