JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=26018
This commit is contained in:
Eelco Dolstra 2011-02-17 16:33:39 +00:00
commit d6c6f9f0e0
12 changed files with 159 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/scripts/gnu/gnupdate
View File

@ -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))

4
pkgs/applications/networking/mailreaders/thunderbird/3.x.nix
View File

@ -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 =

50
pkgs/games/warmux/default.nix Normal file
View File

@ -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

2
pkgs/misc/ghostscript/default.nix
View File

@ -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;

81
pkgs/misc/ghostscript/pstoraster.patch Normal file
View File

@ -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;

11
pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
View File

@ -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 ];
};
}

4
pkgs/os-specific/linux/xf86-input-wacom/default.nix
View File

@ -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
};
}

4
pkgs/servers/monitoring/zabbix/default.nix
View File

@ -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 =

4
pkgs/tools/misc/recutils/default.nix
View File

@ -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;

6
pkgs/tools/package-management/nix/unstable.nix
View File

@ -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 ];

10
pkgs/top-level/all-packages.nix
View File

@ -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 { };
@ -3763,12 +3765,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 { };
@ -7087,6 +7090,8 @@ let
ut2004demo = callPackage ../games/ut2004demo { };
warmux = callPackage ../games/warmux {};
warsow = callPackage ../games/warsow {
libjpeg = libjpeg62;
};
@ -7466,6 +7471,7 @@ let
lilypond = callPackage ../misc/lilypond {
inherit (gtkLibs) pango;
guile = guile_1_8;
};
martyr = callPackage ../development/libraries/martyr { };

2
pkgs/top-level/guile-2-test.nix
View File

@ -79,4 +79,6 @@ in (mapTestOn {
ballAndPaddle = linux;
drgeo = linux;
lilypond = linux;
liquidwar = linux;
freetalk = linux;
})