summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-19 06:02:01 +0000
committerGitHub <noreply@github.com>2021-07-19 06:02:01 +0000
commitf60c09468f716f8851b976289f66e1ebd9045b79 (patch)
treedb43cafb7476db93b44e84c76930d312f2357aff /pkgs/top-level/all-packages.nix
parentdde34afc632005a61b65b95f269dbc8b828c2f05 (diff)
parent9c688591fcae1c2c812c9929b399f1f08054f8b5 (diff)
downloadnixpkgs-f60c09468f716f8851b976289f66e1ebd9045b79.tar
nixpkgs-f60c09468f716f8851b976289f66e1ebd9045b79.tar.gz
nixpkgs-f60c09468f716f8851b976289f66e1ebd9045b79.tar.bz2
nixpkgs-f60c09468f716f8851b976289f66e1ebd9045b79.tar.lz
nixpkgs-f60c09468f716f8851b976289f66e1ebd9045b79.tar.xz
nixpkgs-f60c09468f716f8851b976289f66e1ebd9045b79.tar.zst
nixpkgs-f60c09468f716f8851b976289f66e1ebd9045b79.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a96cc6068c3..4f79c0844e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5821,6 +5821,10 @@ in
     lua = lua5;
   });
 
+  hockeypuck = callPackage ../servers/hockeypuck/server.nix { };
+
+  hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { };
+
   holochain-go = callPackage ../servers/holochain-go { };
 
   homesick = callPackage ../tools/misc/homesick { };