From dba0cfb2d9bf4d0b0db113e896c094e3d1fefd34 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Fri, 16 Apr 2021 17:56:26 +0200 Subject: [PATCH] yubioath-desktop: 5.0.4 -> 5.0.5 Signed-off-by: Marc 'risson' Schmitt --- ...place-git-with-normal-python-package.patch | 24 ------------------- .../misc/yubioath-desktop/default.nix | 8 ++----- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch diff --git a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch deleted file mode 100644 index d56a6cfab073..000000000000 --- a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -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 ---- - 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 - diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index dbd33db16f9b..bb4b5afe1b28 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -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"