diff options
author | Petr Rockai <me@mornfall.net> | 2014-01-29 18:54:07 +0100 |
---|---|---|
committer | Petr Rockai <me@mornfall.net> | 2014-01-29 18:54:07 +0100 |
commit | 2062abfd4f0d9c6d80439db9e3140fc24ae2477a (patch) | |
tree | 641f8f09457a99930ef01cb85208e4276e0f5312 /pkgs | |
parent | 7c24880b4c6f2f91e50f613694bb2ab32b6bfb40 (diff) | |
parent | 7bf94cadad5c416375c3e5dfd46f31a81b76ea05 (diff) | |
download | nixpkgs-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar nixpkgs-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.gz nixpkgs-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.bz2 nixpkgs-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.lz nixpkgs-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.xz nixpkgs-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.zst nixpkgs-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.zip |
Merge branch 'yubikey' of git://github.com/Calrama/nixpkgs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/ykpers/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/libyubikey/default.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix new file mode 100644 index 00000000000..e7bfa8ded50 --- /dev/null +++ b/pkgs/applications/misc/ykpers/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}: + +stdenv.mkDerivation rec +{ + version = "1.15.0"; + name = "ykpers-${version}"; + + src = fetchurl + { + url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz"; + sha256 = "1n4s8kk31q5zh2rm7sj9qmv86yl8ibimdnpvk9ny391a88qlypyd"; + }; + + buildInputs = [pkgconfig libusb1 libyubikey]; + + meta = + { + homepage = "http://opensource.yubico.com/yubikey-personalization/"; + description = "YubiKey Personalization cross-platform library and tool"; + license = "bsd"; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix new file mode 100644 index 00000000000..25c2117b059 --- /dev/null +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec +{ + version = "1.11"; + name = "libyubikey-${version}"; + + src = fetchurl + { + url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz"; + sha256 = "19pm4rqsnm9r0n5j26bqkxa1jpimdavzcvg5g7p416vkjhxc6lw9"; + }; + + meta = + { + homepage = "http://opensource.yubico.com/yubico-c/"; + description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; + license = "bsd"; + maintainers = [ stdenv.lib.maintainers.calrama ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e839833ee28..e076230672c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5063,6 +5063,8 @@ let libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; libyamlcpp03 = callPackage ../development/libraries/libyaml-cpp/0.3.x.nix { }; + libyubikey = callPackage ../development/libraries/libyubikey {}; + libzip = callPackage ../development/libraries/libzip { }; libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { }; @@ -9153,6 +9155,8 @@ let qgis = callPackage ../applications/misc/qgis {}; + ykpers = callPackage ../applications/misc/ykpers {}; + yoshimi = callPackage ../applications/audio/yoshimi { fltk = fltk13; }; |