diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 11:25:41 +0200 |
| commit | 06fc1ec34dbae8bba4673475e64a8241026089f6 (patch) | |
| tree | 3e70796a291acc704ef5382f5af4866cab64e537 /pkgs/misc | |
| parent | 89f8af55f11b01e68cbfc6d10537413140261721 (diff) | |
| parent | ce623950ada9e1ef721760f05b9e3a14604fd764 (diff) | |
| download | nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.gz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.bz2 nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.lz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.xz nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.tar.zst nixlib-06fc1ec34dbae8bba4673475e64a8241026089f6.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/servers/serfdom/default.nix
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wine/winetricks.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index f47902cd0bf1..3dd3d4bc7311 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -2,13 +2,13 @@ , cabextract, unzip, p7zip, gnused, gnugrep, bash } : stdenv.mkDerivation rec { - rev = "1083"; + rev = "1199"; name = "winetricks-${rev}"; src = fetchsvn { url = "http://winetricks.googlecode.com/svn/trunk"; inherit rev; - sha256 = "0zakwn7g2ni6xw92i1y3pngyaxsr93714s4jy11adf7rxdkj0a32"; + sha256 = "1kji1n6ps09g8xnl9m7vqk3vkl03abzwnc43c52i8p0adnv06khb"; }; buildInputs = [ perl which ]; @@ -28,4 +28,3 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } - |