Merge pull request #119639 from rissson/yubioath-desktop-5.0.5

yubioath-desktop: 5.0.4 -> 5.0.5

authored by

Sandro and committed by
GitHub
1993d790 ed290c3a

+2 -30
-24
pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch
··· 1 - From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001 2 - From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> 3 - Date: Wed, 25 Nov 2020 11:26:49 +0100 4 - Subject: [PATCH] replace git with normal python package 5 - MIME-Version: 1.0 6 - Content-Type: text/plain; charset=UTF-8 7 - Content-Transfer-Encoding: 8bit 8 - 9 - Signed-off-by: Jörg Thalheim <joerg@thalheim.io> 10 - --- 11 - requirements.txt | 2 +- 12 - 1 file changed, 1 insertion(+), 1 deletion(-) 13 - 14 - diff --git a/requirements.txt b/requirements.txt 15 - index ef25aad..b4246a4 100644 16 - --- a/requirements.txt 17 - +++ b/requirements.txt 18 - @@ -1,2 +1,2 @@ 19 - -git+https://github.com/Yubico/yubikey-manager.git 20 - +yubikey-manager 21 - ./py/qr 22 - -- 23 - 2.29.2 24 -
···
+2 -6
pkgs/applications/misc/yubioath-desktop/default.nix
··· 6 7 mkDerivation rec { 8 pname = "yubioath-desktop"; 9 - version = "5.0.4"; 10 11 src = fetchurl { 12 url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; 13 - sha256 = "1aw88xvg6gjsfwmmlcrdcgyycn2cp7b8vxjzj14h7igcj02xh84h"; 14 }; 15 16 doCheck = false; ··· 18 buildInputs = [ stdenv qtbase qtquickcontrols2 qtgraphicaleffects python3 ]; 19 20 nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; 21 - 22 - patches = [ 23 - ./0001-replace-git-with-normal-python-package.patch 24 - ]; 25 26 postPatch = '' 27 substituteInPlace deployment.pri \
··· 6 7 mkDerivation rec { 8 pname = "yubioath-desktop"; 9 + version = "5.0.5"; 10 11 src = fetchurl { 12 url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; 13 + sha256 = "05xs6xh9pi50h0668arirj0gnz11adpixgsdkds072077gasdm0g"; 14 }; 15 16 doCheck = false; ··· 18 buildInputs = [ stdenv qtbase qtquickcontrols2 qtgraphicaleffects python3 ]; 19 20 nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; 21 22 postPatch = '' 23 substituteInPlace deployment.pri \