diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-05-08 13:46:46 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-05-08 13:46:46 +0200 |
| commit | 1278859d3167b9f84bfab680d9c8c463adf64a60 (patch) | |
| tree | bc090295f32889e68e2e6407cf8888021b3595e4 /pkgs/misc/emulators | |
| parent | d4561be1cb5032c00cf97fc82397f1307f156996 (diff) | |
| parent | 0c020c98f9d4f49d5c9907db5f4b35aac7df959b (diff) | |
| download | nixlib-1278859d3167b9f84bfab680d9c8c463adf64a60.tar nixlib-1278859d3167b9f84bfab680d9c8c463adf64a60.tar.gz nixlib-1278859d3167b9f84bfab680d9c8c463adf64a60.tar.bz2 nixlib-1278859d3167b9f84bfab680d9c8c463adf64a60.tar.lz nixlib-1278859d3167b9f84bfab680d9c8c463adf64a60.tar.xz nixlib-1278859d3167b9f84bfab680d9c8c463adf64a60.tar.zst nixlib-1278859d3167b9f84bfab680d9c8c463adf64a60.zip | |
Merge branch 'master' into x-updates
Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/wine/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 32f6f2fc7991..b6013b5eb4d5 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - version = "1.5.28"; + version = "1.5.29"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0ik02c11bp1glafcw82drkmjp8lxrkycvas3jlrvf1rv46blpy0b"; + sha256 = "1cc8g1mrs02nk16jz4a8brr82slp944k4c1nmaa2xpz183a0wz1q"; }; gecko = fetchurl { |