Merge pull request #16425 from mbakke/yubikey-neo-manager

yubikey-neo-manager: init at 1.4.0
This commit is contained in:
Frederik Rietdijk 2016-06-23 15:39:25 +02:00 committed by GitHub
commit 41ca3ba4a9
3 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,28 @@
{ stdenv, fetchurl, makeWrapper, 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 stdenv.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 ];
};
}

View File

@ -0,0 +1,17 @@
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',

View File

@ -9504,6 +9504,8 @@ in
yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };
yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { };
yubikey-personalization = callPackage ../tools/misc/yubikey-personalization {
libusb = libusb1;
};