Merge remote-tracking branch 'upstream/master' into openssl-1.1

This commit is contained in:
Robin Gloster
2019-08-23 02:00:31 +02:00
126 changed files with 3903 additions and 707 deletions

View File

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "mptre";
repo = "yank";
rev = "v${meta.version}";
sha256 = "0jhr4ywn5x5s15sczhdyyaqy3xh5z4zsx3g42ma26prpnr4gjczz";
sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc";
inherit name;
};
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
downloadPage = "https://github.com/mptre/yank/releases";
license = licenses.mit;
version = "1.1.0";
version = "1.2.0";
maintainers = [ maintainers.dochang ];
platforms = platforms.unix;
};

View File

@@ -20,11 +20,11 @@ let inherit (stdenv) lib; in
stdenv.mkDerivation rec {
pname = "yubikey-manager-qt";
version = "1.1.2";
version = "1.1.3";
src = fetchurl {
url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
sha256 = "01ax8zjrahs2sjbgsys2ahh57sdcap0ij3y1r1bbvsgzr7xxm2q8";
sha256 = "087ms9i0n3rm8a0hvc4a2dk3rffbm6rmgz0m8gbjk6g37iml6nb7";
};
nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ];