diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:07:20 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:07:31 +0200 |
commit | 5a98b9f5140578d8cbd4db8bddfe01e24249c2a9 (patch) | |
tree | ac2552b31325f3d262bd8728d7fd2e23db6ad5c8 /pkgs/misc/emulators/wine | |
parent | 5e37c09f0664eb6583dbe30351cc3d21f1b4cadb (diff) | |
parent | e1a0d45d0046cc01388b98ab88cfe39b2f38fb88 (diff) | |
download | nixlib-5a98b9f5140578d8cbd4db8bddfe01e24249c2a9.tar nixlib-5a98b9f5140578d8cbd4db8bddfe01e24249c2a9.tar.gz nixlib-5a98b9f5140578d8cbd4db8bddfe01e24249c2a9.tar.bz2 nixlib-5a98b9f5140578d8cbd4db8bddfe01e24249c2a9.tar.lz nixlib-5a98b9f5140578d8cbd4db8bddfe01e24249c2a9.tar.xz nixlib-5a98b9f5140578d8cbd4db8bddfe01e24249c2a9.tar.zst nixlib-5a98b9f5140578d8cbd4db8bddfe01e24249c2a9.zip |
Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
Diffstat (limited to 'pkgs/misc/emulators/wine')
-rw-r--r-- | pkgs/misc/emulators/wine/unstable.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index bf55f93db5b7..b3c68429d6da 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.14"; + version = "1.7.19"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "029y4vsjz2jxy31g5nylpl7wm5qhw37dsbx4f0za6swk51z97w9d"; + sha256 = "1wigncw7xl6ni6kjmhmbzffhf0pav22b50aql93wz7h2r409psn5"; }; gecko = fetchurl { |