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

yubioath-desktop: 5.0.4 -> 5.0.5
This commit is contained in:
Sandro 2021-04-16 21:37:26 +02:00 committed by GitHub
commit 1993d790c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 30 deletions

View File

@ -1,24 +0,0 @@
From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Nov 2020 11:26:49 +0100
Subject: [PATCH] replace git with normal python package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index ef25aad..b4246a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-git+https://github.com/Yubico/yubikey-manager.git
+yubikey-manager
./py/qr
--
2.29.2

View File

@ -6,11 +6,11 @@
mkDerivation rec {
pname = "yubioath-desktop";
version = "5.0.4";
version = "5.0.5";
src = fetchurl {
url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
sha256 = "1aw88xvg6gjsfwmmlcrdcgyycn2cp7b8vxjzj14h7igcj02xh84h";
sha256 = "05xs6xh9pi50h0668arirj0gnz11adpixgsdkds072077gasdm0g";
};
doCheck = false;
@ -19,10 +19,6 @@ mkDerivation rec {
nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];
patches = [
./0001-replace-git-with-normal-python-package.patch
];
postPatch = ''
substituteInPlace deployment.pri \
--replace '/usr/bin' "$out/bin"