Convert nix/hydra/docker.nix to flake-parts module (#2025)

Author: locallycompact

flake.nix

@@ -28,6 +28,7 @@
         inputs.hydra-coding-standards.flakeModule
         inputs.process-compose-flake.flakeModule
         ./nix/hydra/demo.nix
+        ./nix/hydra/docker.nix
       ];
       systems = [
         "x86_64-linux"
@@ -90,14 +91,6 @@
             gitRev = self.rev or "dirty";
           };
 
-          hydraImages = import ./nix/hydra/docker.nix {
-            inherit hydraPackages pkgs;
-          };
-
-          prefixAttrs = s: attrs:
-            with pkgs.lib.attrsets;
-            mapAttrs' (name: value: nameValuePair (s + name) value) attrs;
-
           tx-cost-diff =
             let
               pyEnv = pkgs.python3.withPackages (ps: with ps; [ pandas html5lib beautifulsoup4 tabulate ]);
@@ -119,7 +112,7 @@
 
           packages =
             hydraPackages //
-            (if pkgs.stdenv.isLinux then (prefixAttrs "docker-" hydraImages) else { }) // {
+            {
               spec = inputs.hydra-spec.packages.${system}.default;
               inherit tx-cost-diff;
             };

nix/hydra/docker.nix

@@ -1,66 +1,69 @@
 # Docker images built from our packages. NOTE: These images don't include any
 # metadata, as this is only added by the Github workflow.
 
-{ hydraPackages # as defined in packages.nix
-, pkgs
-}:
-{
-  hydra-node = pkgs.dockerTools.buildImage {
-    name = "hydra-node";
-    tag = "latest";
-    created = "now";
-    contents = [
-      pkgs.busybox
-    ];
-    config = {
-      Entrypoint = [ "${hydraPackages.hydra-node-static}/bin/hydra-node" ];
-    };
-  };
+{ lib, ... }: {
 
-  hydra-node-for-netem = pkgs.dockerTools.buildImage {
-    name = "hydra-node-for-netem";
-    tag = "latest";
-    created = "now";
-    contents = [
-      pkgs.iproute2
-      pkgs.busybox
-    ];
-    config = {
-      Entrypoint = [ "${hydraPackages.hydra-node-static}/bin/hydra-node" ];
-    };
-  };
+  perSystem = { pkgs, self', ... }:
+    lib.mkIf pkgs.stdenv.isLinux {
+      packages = {
+        docker-hydra-node = pkgs.dockerTools.buildImage {
+          name = "hydra-node";
+          tag = "latest";
+          created = "now";
+          contents = [
+            pkgs.busybox
+          ];
+          config = {
+            Entrypoint = [ "${self'.packages.hydra-node-static}/bin/hydra-node" ];
+          };
+        };
 
-  hydra-tui = pkgs.dockerTools.buildImage {
-    name = "hydra-tui";
-    tag = "latest";
-    created = "now";
-    config = {
-      Entrypoint = [ "${hydraPackages.hydra-tui-static}/bin/hydra-tui" ];
-    };
-  };
+        docker-hydra-node-for-netem = pkgs.dockerTools.buildImage {
+          name = "hydra-node-for-netem";
+          tag = "latest";
+          created = "now";
+          contents = [
+            pkgs.iproute2
+            pkgs.busybox
+          ];
+          config = {
+            Entrypoint = [ "${self'.packages.hydra-node-static}/bin/hydra-node" ];
+          };
+        };
 
-  hydraw = pkgs.dockerTools.buildImage {
-    name = "hydraw";
-    tag = "latest";
-    created = "now";
-    config = {
-      Entrypoint = [ "${hydraPackages.hydraw-static}/bin/hydraw" ];
-      WorkingDir = "/static";
-    };
-    contents = [
-      (pkgs.runCommand "hydraw-static-files" { } ''
-        mkdir $out
-        ln -s ${../../hydraw/static} $out/static
-      '')
-    ];
-  };
+        docker-hydra-tui = pkgs.dockerTools.buildImage {
+          name = "hydra-tui";
+          tag = "latest";
+          created = "now";
+          config = {
+            Entrypoint = [ "${self'.packages.hydra-tui-static}/bin/hydra-tui" ];
+          };
+        };
+
+        docker-hydraw = pkgs.dockerTools.buildImage {
+          name = "hydraw";
+          tag = "latest";
+          created = "now";
+          config = {
+            Entrypoint = [ "${self'.packages.hydraw-static}/bin/hydraw" ];
+            WorkingDir = "/static";
+          };
+          contents = [
+            (pkgs.runCommand "hydraw-static-files" { } ''
+              mkdir $out
+              ln -s ${../../hydraw/static} $out/static
+            '')
+          ];
+        };
 
-  hydra-chain-observer = pkgs.dockerTools.buildImage {
-    name = "hydra-chain-observer";
-    tag = "latest";
-    created = "now";
-    config = {
-      Entrypoint = [ "${hydraPackages.hydra-chain-observer-static}/bin/hydra-chain-observer" ];
+        docker-hydra-chain-observer = pkgs.dockerTools.buildImage {
+          name = "hydra-chain-observer";
+          tag = "latest";
+          created = "now";
+          config = {
+            Entrypoint = [ "${self'.packages.hydra-chain-observer-static}/bin/hydra-chain-observer" ];
+          };
+        };
+      };
     };
-  };
 }