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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2017-03-23 13:31:28 +01:00
parent f0875982d1 632e81083c
commit c1a9dc3d37
163 changed files with 3073 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/emulators/wine/sources.nix
View File

@@ -31,23 +31,23 @@ in rec {
};
unstable = fetchurl rec {
version = "2.1";
version = "2.4";
url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz";
sha256 = "13klfadvd44zdfrzh38al99s53i02x3mlhcj5z7fq7vqwh3xzdc7";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
inherit (unstable) version;
sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs";
sha256 = "052s4y7d8lw2k0hk17zwz9bgbsl013g8953ad001y2kqjxwcnilh";
owner = "wine-compholio";
repo = "wine-staging";
rev = "v${version}";
};
winetricks = fetchFromGitHub rec {
version = "20170207";
sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw";
version = "20170316";
sha256 = "193g3b6rfbxkxmq1y0rawrkrzb225ly71hprif3lv09gmi2bf95a";
owner = "Winetricks";
repo = "winetricks";
rev = version;

4
pkgs/misc/screensavers/xlockmore/default.nix
View File

@@ -3,10 +3,10 @@
stdenv.mkDerivation rec {
name = "xlockmore-5.50";
name = "xlockmore-5.51";
src = fetchurl {
url = "http://sillycycle.com/xlock/${name}.tar.xz";
sha256 = "0a9sargn36b5lxil777p35z8m5jr744h9xmc021057aq8kgp4pv3";
sha256 = "13b088pp75c071ycas37d51jcnb5zk6g87xjxi92x2awirqqw4a7";
curlOpts = "--user-agent 'Mozilla/5.0'";
};