mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Merge pull request #115395 from dotlambda/yubikey-neo-manager-drop
yubikey-neo-manager: drop
This commit is contained in:
commit
301f4aa1d2
4 changed files with 1 additions and 47 deletions
|
@ -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 ];
|
||||
};
|
||||
}
|
|
@ -1,17 +0,0 @@
|
|||
Description: Remove PySide requirement, since python-pyside does not register itself correctly
|
||||
Author: Dain Nilsson <dain@yubico.com>
|
||||
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',
|
|
@ -787,6 +787,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
|
||||
|
|
|
@ -17557,8 +17557,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 { };
|
||||
|
|
Loading…
Reference in a new issue