diff options
| author | Shea Levy <shea@shealevy.com> | 2016-06-21 19:45:27 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-06-21 19:45:27 -0400 |
| commit | 8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b (patch) | |
| tree | 1ebc0fbf9b0ad452e1039d53df4df0407a8acc4c /pkgs/top-level | |
| parent | 61ba956cc891ac579387047371488aae48d5d55d (diff) | |
| parent | fe04ea79ddc33a612181050c1fb69c6f928b2f6c (diff) | |
| download | nixlib-8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b.tar nixlib-8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b.tar.gz nixlib-8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b.tar.bz2 nixlib-8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b.tar.lz nixlib-8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b.tar.xz nixlib-8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b.tar.zst nixlib-8f28dad52ce7da0dd4d2342dfb740a5b5e1f4d9b.zip | |
Merge branch 'nix-tour' of git://github.com/qknight/nixpkgs
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 877145395ec1..6350f230fc4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10048,6 +10048,8 @@ in nix-binary-cache = callPackage ../servers/http/nix-binary-cache {}; + nix-tour = callPackage ../applications/misc/nix-tour {}; + nsd = callPackage ../servers/dns/nsd (config.nsd or {}); nsq = callPackage ../servers/nsq { }; |