diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-07 09:25:12 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-07 09:25:12 +0200 |
| commit | 6b8223e634b1326f448b870351ae53a0607aa043 (patch) | |
| tree | cc1754cc8e195a5b84bdadf0d01db22f73da25af /pkgs/top-level/all-packages.nix | |
| parent | 43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (diff) | |
| parent | 1c3e3e081c22ba4dbf8f1b8cb31a55830596b838 (diff) | |
| download | nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.gz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.bz2 nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.lz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.xz nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.zst nixlib-6b8223e634b1326f448b870351ae53a0607aa043.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18717d5e1ae2..4bea3f9b5823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4861,6 +4861,8 @@ in kea = callPackage ../tools/networking/kea { }; + keysmith = libsForQt5.callPackage ../tools/security/keysmith { }; + ispell = callPackage ../tools/text/ispell {}; jumanpp = callPackage ../tools/text/jumanpp {}; @@ -13209,7 +13211,6 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; - libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; libjpeg = libjpeg_turbo; libjreen = callPackage ../development/libraries/libjreen { }; @@ -19840,6 +19841,8 @@ in git-review = callPackage ../applications/version-management/git-review { }; + github-cli = gitAndTools.gh; + gitolite = callPackage ../applications/version-management/gitolite { }; inherit (gnome3) gitg; |