From 479fc3a1d466305a8ef4c84dc448efd2ef49c6db Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 16 Feb 2011 22:19:59 +0000 Subject: [PATCH 01/14] Adding warmux svn path=/nixpkgs/trunk/; revision=25997 --- pkgs/games/warmux/default.nix | 50 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/games/warmux/default.nix diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix new file mode 100644 index 00000000000..40072ca7dfc --- /dev/null +++ b/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 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e9ede404bb..d08bdd0d881 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7098,6 +7098,8 @@ let ut2004demo = callPackage ../games/ut2004demo { }; + warmux = callPackage ../games/warmux {}; + warsow = callPackage ../games/warsow { libjpeg = libjpeg62; }; From 820e9d1b06315fcfe6c6dce95fad77b392f0136d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 16 Feb 2011 22:21:07 +0000 Subject: [PATCH 02/14] LiquidWar is not ready for Guile 2.0 svn path=/nixpkgs/trunk/; revision=25998 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d08bdd0d881..fe266773387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3768,12 +3768,13 @@ let 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 { }; From c0b92d04915cbd4cdb736fd6246c2dff9fd0fe1a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 16 Feb 2011 22:21:29 +0000 Subject: [PATCH 03/14] FreeTalk is not ready for Guile 2.0 svn path=/nixpkgs/trunk/; revision=25999 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe266773387..a876fa05733 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -644,7 +644,9 @@ let 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 { }; From 542d7424f04625f2dccd2a556ae763191ba99d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 16 Feb 2011 22:49:57 +0000 Subject: [PATCH 04/14] gnupdate: Remove compatibility hack. svn path=/nixpkgs/trunk/; revision=26000 --- maintainers/scripts/gnu/gnupdate | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate index b6ed75baa1b..afe6f3cc046 100755 --- a/maintainers/scripts/gnu/gnupdate +++ b/maintainers/scripts/gnu/gnupdate @@ -624,12 +624,6 @@ exec ${GUILE-guile} -L "$PWD" -l "$0" \ 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)) From 742b97a35bfb45491e0e59f42ec828dcd274d579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 16 Feb 2011 22:50:02 +0000 Subject: [PATCH 05/14] guile-2-test: Add LiquidWar and Freetalk. svn path=/nixpkgs/trunk/; revision=26001 --- pkgs/top-level/guile-2-test.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix index 5905aaee572..562b251d4c6 100644 --- a/pkgs/top-level/guile-2-test.nix +++ b/pkgs/top-level/guile-2-test.nix @@ -79,4 +79,6 @@ in (mapTestOn { ballAndPaddle = linux; drgeo = linux; lilypond = linux; + liquidwar = linux; + freetalk = linux; }) From ad5adaca9e86cfff61a4b883d2c27a9abe0dd1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 16 Feb 2011 22:50:06 +0000 Subject: [PATCH 06/14] GNU recutils 1.3. svn path=/nixpkgs/trunk/; revision=26002 --- pkgs/tools/misc/recutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index caceba2216f..307c60bd611 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -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; From e80dc8eb7f0e91d3c38005b84d3c262eec30c4d7 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Wed, 16 Feb 2011 23:34:19 +0000 Subject: [PATCH 07/14] Applying a patch for pstoraster, without this the cups test page was printing solid black, as described in the bug report: http://bugs.ghostscript.com/show_bug.cgi?id=691108 The patch was kindly taken from https://bugs.archlinux.org/task/18339 svn path=/nixpkgs/trunk/; revision=26003 --- pkgs/misc/ghostscript/default.nix | 2 +- pkgs/misc/ghostscript/pstoraster.patch | 81 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/ghostscript/pstoraster.patch diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index e1201fd08b8..053b7a0acfc 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { CFLAGS = "-fPIC"; - patches = [ ./purity.patch ./urw-font-files.patch ]; + patches = [ ./purity.patch ./urw-font-files.patch ./pstoraster.patch]; doCheck = true; diff --git a/pkgs/misc/ghostscript/pstoraster.patch b/pkgs/misc/ghostscript/pstoraster.patch new file mode 100644 index 00000000000..465c91e4f19 --- /dev/null +++ b/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 From dd5ad62588ab1e3a382b57f9b11c57bcdc68484c Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Wed, 16 Feb 2011 23:37:13 +0000 Subject: [PATCH 08/14] Adding myself as a maintainer since I want to keep this working, and applying the new style of license svn path=/nixpkgs/trunk/; revision=26004 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 45c4ce30f72..1102b2ebe40 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { ''; 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 }; } From da009302574073556c351f802f8df6a326afdd08 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Wed, 16 Feb 2011 23:52:14 +0000 Subject: [PATCH 09/14] Adding version, fixing the mirror path and the license and adding myself as maintainer svn path=/nixpkgs/trunk/; revision=26005 --- pkgs/misc/themes/gtk2/oxygen-gtk/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 608be713dd2..7679d0ead36 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -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 ]; }; } From 6029a74a29d8de0620713c06057155b3de90fdbc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 17 Feb 2011 08:23:56 +0000 Subject: [PATCH 10/14] LilyPond is not ready for Guile 2.0 svn path=/nixpkgs/trunk/; revision=26006 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a876fa05733..fc615ddabf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7482,6 +7482,7 @@ let lilypond = callPackage ../misc/lilypond { inherit (gtkLibs) pango; + guile = guile_1_8; }; martyr = callPackage ../development/libraries/martyr { }; From 3e89e6ad89c5ab34bd6f007273f8af5fe2893192 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Feb 2011 13:30:00 +0000 Subject: [PATCH 11/14] * Thunderbird 3.1.7. svn path=/nixpkgs/trunk/; revision=26011 --- pkgs/applications/networking/mailreaders/thunderbird/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix index 0242f22f396..12cbeb1328e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/3.x.nix @@ -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 = From 1062dbd1b0b160b16d950369cc0daffdd531aa83 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Feb 2011 13:37:48 +0000 Subject: [PATCH 12/14] * Bump. svn path=/nixpkgs/trunk/; revision=26012 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 4283a3a0e5b..cd6ad4ea3cd 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre25886"; + name = "nix-1.0pre26010"; src = fetchurl { - url = "http://hydra.nixos.org/build/894162/download/4/${name}.tar.bz2"; - sha256 = "4513a6a42f485bed692ba2d34214383496f59064b9eb5d5ecec739dda703ddb3"; + url = "http://hydra.nixos.org/build/919927/download/4/${name}.tar.bz2"; + sha256 = "3ed50758907be209d63d81673e9c0ce5b82441a2f0e8c9867c7c6b4385474ebc"; }; buildNativeInputs = [ perl pkgconfig ]; From 9bc4c552a6c99d546c0e07f8a0899996d5d38f31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Feb 2011 13:57:15 +0000 Subject: [PATCH 13/14] * Zabbix 1.8.4. svn path=/nixpkgs/trunk/; revision=26013 --- pkgs/servers/monitoring/zabbix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index e1e7c5acd71..09d53627450 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -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 = From 0970ed2f9ba3f832694b0e1edda0f33a862aac80 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Feb 2011 15:25:54 +0000 Subject: [PATCH 14/14] * Bump. svn path=/nixpkgs/trunk/; revision=26016 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index cd6ad4ea3cd..a72d81a6243 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.0pre26010"; + name = "nix-1.0pre26015"; src = fetchurl { - url = "http://hydra.nixos.org/build/919927/download/4/${name}.tar.bz2"; - sha256 = "3ed50758907be209d63d81673e9c0ce5b82441a2f0e8c9867c7c6b4385474ebc"; + url = "http://hydra.nixos.org/build/920246/download/4/${name}.tar.bz2"; + sha256 = "d2c9caa8573689de4e95eecaf9829d4b672ea3cb9bdfa825dac0ab0dbffb3c70"; }; buildNativeInputs = [ perl pkgconfig ];