diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
| commit | e56832d7301f2be7c18abf12d151db00be88f6fa (patch) | |
| tree | 8023c83da9db86e0a31535ad9b09e9f601c3b250 /pkgs/top-level/aliases.nix | |
| parent | bd12c109931951a36449edaa9c8ed3fc85dc6984 (diff) | |
| parent | 8c465c5201e819486b3072be563738cc1801e8d7 (diff) | |
| download | nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.gz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.bz2 nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.lz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.xz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.zst nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c85361f91d8..c328f74729e0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -50,6 +50,7 @@ doNotDisplayTwice rec { fuse_zip = fuse-zip; # added 2016-04-27 gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 + googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = qt5.grantlee; # added 2015-12-19 gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 @@ -58,6 +59,7 @@ doNotDisplayTwice rec { inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 + keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 letsencrypt = certbot; # added 2016-05-16 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 |