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/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 {