hockeypuck{,-web}: move to pkgs/by-name

this shouldn't create any rebuilds

pkgs/by-name/ho/hockeypuck-web/package.nix

@@ -1,17 +1,14 @@
 {
   stdenv,
   lib,
-  fetchFromGitHub,
+  hockeypuck,
   nixosTests,
 }:
 
-let
-  sources = (import ./sources.nix) { inherit fetchFromGitHub; };
-in
 stdenv.mkDerivation {
-  pname = "${sources.pname}-web";
+  pname = "hockeypuck-web";
 
-  inherit (sources) version src;
+  inherit (hockeypuck) version src;
 
   dontBuild = true; # We should just copy the web templates
 

pkgs/by-name/ho/hockeypuck/package.nix

@@ -5,11 +5,16 @@
   nixosTests,
 }:
 
-let
-  sources = (import ./sources.nix) { inherit fetchFromGitHub; };
-in
-buildGoModule {
-  inherit (sources) pname version src;
+buildGoModule (finalAttrs: {
+  pname = "hockeypuck";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "hockeypuck";
+    repo = "hockeypuck";
+    rev = finalAttrs.version;
+    sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
+  };
 
   modRoot = "src/hockeypuck/";
   vendorHash = null;
@@ -23,4 +28,4 @@ buildGoModule {
     license = lib.licenses.agpl3Plus;
     maintainers = [ ];
   };
-}
+})

pkgs/servers/hockeypuck/sources.nix

@@ -1,16 +0,0 @@
-{ fetchFromGitHub }:
-
-let
-  pname = "hockeypuck";
-  version = "2.1.0";
-in
-{
-  inherit version pname;
-
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    sha256 = "0da3ffbqck0dr7d89gy2yillp7g9a4ziyjlvrm8vgkkg2fs8dlb1";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -2799,10 +2799,6 @@ with pkgs;
     lua = lua5;
   };
 
-  hockeypuck = callPackage ../servers/hockeypuck/server.nix { };
-
-  hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { };
-
   host = bind.host;
 
   hotdoc = python3Packages.callPackage ../development/tools/hotdoc { };