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

Merge master into x-updates

Browse Source 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
This commit is contained in:
Vladimír Čunát
2013-12-18 23:21:29 +01:00
parent e8394e3f8c 43498628e8
commit 4c5a71f777
431 changed files with 2365 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/cups/drivers/cups-bjnp/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, cups}:
stdenv.mkDerivation rec {
name = "cups-bjnp-0.5.4";
name = "cups-bjnp-1.2.1";
src = fetchurl {
url = "mirror://sourceforge/cups-bjnp/${name}.tar.gz";
sha256 = "1q5npis0jgs44yvczrr6pz87glk1d9lv3vr2s4nqrk3l0q4xplf6";
sha256 = "0fjpp0mmmwfcr790hfjs0brsxxb7dz7v2xab6wc30rwzkqmgz95x";
};
preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"'';
pkgs/misc/drivers/foomatic-filters/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, cups, dbus }:
stdenv.mkDerivation rec {
name = "foomatic-filters-4.0.12";
name = "foomatic-filters-4.0.17";
src = fetchurl {
url = "http://www.openprinting.org/download/foomatic/${name}.tar.gz";
sha256 = "17w26r15094j4fqifa7f7i7jad4gsy9zdlq69kffrykcw31qx3q8";
sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2";
};
buildInputs = [ pkgconfig perl cups dbus ];
pkgs/misc/emulators/atari800/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, unzip, zlib, SDL}:
stdenv.mkDerivation {
name = "atari800-2.0.2";
name = "atari800-2.2.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://sourceforge/atari800/atari800-2.0.2.tar.gz;
md5 = "a81f8a5ace5fd89eb6094faef7c936af";
url = mirror://sourceforge/atari800/atari800-2.2.1.tar.gz;
sha256 = "0gkhlb3jc0rd7fcqjm41877fsqr7als3a0n552qmnjzrlcczf5yz";
};
rom = fetchurl {
url = mirror://sourceforge/atari800/xf25.zip;
pkgs/misc/emulators/wine/unstable.nix
+2 -2
View File
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
assert stdenv.gcc.gcc != null;
let
version = "1.7.7";
version = "1.7.8";
name = "wine-${version}";
src = fetchurl {
url = "mirror://sourceforge/wine/${name}.tar.bz2";
sha256 = "19xcspll0ljbr2v0y7xy4943pgqalya2zrzndqsl2d7kpyv061hi";
sha256 = "010qa6xn0b0161kcmm43yr0bp39iddb6d5i27mpl229shrgpzq9h";
};
gecko = fetchurl {
pkgs/misc/themes/mate-icon-theme/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk2, iconnamingutils }:
stdenv.mkDerivation {
name = "mate-icon-theme-1.6.1";
name = "mate-icon-theme-1.6.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.1.tar.xz";
sha256 = "154x0mcsvjmz84vi94kjh8hpydny3ab9lbg58wxh1lskmbc2473x";
url = "http://pub.mate-desktop.org/releases/1.6/mate-icon-theme-1.6.2.tar.xz";
sha256 = "1ahijywk6vj8yyiglqdpc56dkczyj1v99ziblaaclmhi4sxxb5jm";
};
buildInputs = [ pkgconfig intltool gtk2 iconnamingutils ];
pkgs/misc/themes/mate-themes/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation {
name = "mate-themes-1.6.1";
name = "mate-themes-1.6.2";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.1.tar.xz";
sha256 = "0lm2kvlwj0rpznb0n2g1sh1r6nz0p45i7flbnxivl9gi632wdmfp";
url = "http://pub.mate-desktop.org/releases/1.6/mate-themes-1.6.2.tar.xz";
sha256 = "145mjdijjvkpjjgqdfwjp30jvvs0qzxlnh15q6mig8df6drg5fn6";
};
buildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];