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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2020-10-28 18:48:56 +01:00
parent 41822ddb93 31839c352e
commit 0b32140b34
86 changed files with 633 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,16 +39,16 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "5.18";
version = "5.20";
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
sha256 = "0hpkcpi6j162bkgcgzzj8y471777q06j7pydl61yp6qscn4g80ch";
sha256 = "sha256-j1Ui+M6+vbqhL1jhumcaEfZjcuCu33T7kyz1qJOQhhw=";
inherit (stable) mono gecko32 gecko64;
};
staging = fetchFromGitHub rec {
# https://github.com/wine-staging/wine-staging/releases
inherit (unstable) version;
sha256 = "0bwcvkf1g1dsq1qmric3jfl85rfjzhq6x4h839hfqc536lkfbrpy";
sha256 = "sha256-1oWoLb5w9g3wDghpvHpNsJCws7QoZ/E2dqxLuaIgi6o=";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";

2
pkgs/misc/tpm2-pkcs11/default.nix
View File

@@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ lschuermann ];
maintainers = with maintainers; [ matthiasbeyer ];
};
}