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/top-level | |
| parent | 7c24880b4c6f2f91e50f613694bb2ab32b6bfb40 (diff) | |
| parent | 7bf94cadad5c416375c3e5dfd46f31a81b76ea05 (diff) | |
| download | nixlib-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar nixlib-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.gz nixlib-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.bz2 nixlib-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.lz nixlib-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.xz nixlib-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.tar.zst nixlib-2062abfd4f0d9c6d80439db9e3140fc24ae2477a.zip | |
Merge branch 'yubikey' of git://github.com/Calrama/nixpkgs
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e839833ee28c..e076230672c0 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; }; |