From ebef12e7793bf28d75307e004aa69a04d7bb5d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Mar 2021 10:43:20 +0100 Subject: [PATCH] yubikey-neo-manager: drop --- .../misc/yubikey-neo-manager/default.nix | 28 ------------------- .../fix-pyside-requirement.diff | 17 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/tools/misc/yubikey-neo-manager/default.nix delete mode 100644 pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix deleted file mode 100644 index 3991b99fcdc..00000000000 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchurl, python27Packages -, libykneomgr, yubikey-personalization, libu2f-host }: - -python27Packages.buildPythonPackage rec { - namePrefix = ""; - name = "yubikey-neo-manager-${version}"; - version = "1.4.0"; - src = fetchurl { - url = "https://developers.yubico.com/yubikey-neo-manager/Releases/${name}.tar.gz"; - sha256 = "1isxvx27hk0avxwgwcwys2z8ickfs816ii1aklvmi09ak1rgrf1g"; - }; - - propagatedBuildInputs = with python27Packages; [ pyside pycrypto ]; - patches = [ ./fix-pyside-requirement.diff ]; - - # aid ctypes load_libary() - makeWrapperArgs = [ - "--set LD_PRELOAD '${libykneomgr}/lib/libykneomgr.so ${yubikey-personalization}/lib/libykpers-1.so ${libu2f-host}/lib/libu2f-host.so'" - ]; - - meta = with lib; { - homepage = "https://developers.yubico.com/yubikey-neo-manager"; - description = "Cross platform personalization tool for the YubiKey NEO"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ mbakke ]; - }; -} diff --git a/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff b/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff deleted file mode 100644 index d11a3a1cc6d..00000000000 --- a/pkgs/tools/misc/yubikey-neo-manager/fix-pyside-requirement.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Remove PySide requirement, since python-pyside does not register itself correctly -Author: Dain Nilsson -Forwarded: no ---- a/setup.py -+++ b/setup.py -@@ -44,8 +44,9 @@ - entry_points={ - 'gui_scripts': ['neoman=neoman.__main__:main'] - }, -- install_requires=['PySide', 'pycrypto'], -- yc_requires=['ctypes', 'qt'], -+ install_requires=['pycrypto'], -+ yc_requires=['ctypes'], -+ packages=['neoman', 'neoman.model', 'neoman.view', 'neoman.yubicommon', 'neoman.yubicommon.setup', 'neoman.yubicommon.ctypes', 'neoman.yubicommon.qt'], - cmdclass={'executable': executable, 'qt_resources': qt_resources('neoman')}, - classifiers=[ - 'License :: OSI Approved :: BSD License', diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cd6418e1e81..dee6b3138e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -786,6 +786,7 @@ mapAliases ({ xv = xxv; # added 2020-02-22 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; + yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 yuzu = yuzu-mainline; # added 2021-01-25 zdfmediathk = mediathekview; # added 2019-01-19 gnome_user_docs = gnome-user-docs; # added 2019-11-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80e973fc02a..f124529b5ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17559,8 +17559,6 @@ in pythonPackages = python3Packages; }; - yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; - yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };