diff --git a/flake.nix b/flake.nix
index 3e38ff9f1a..ae542b2fcf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,20 +2,24 @@
   description = "Mantis flake";
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=a98302aa9b9628915878a6ea9776c40a0bb02950";
+  inputs.nixpkgs.url =
+    "github:nixos/nixpkgs?rev=a98302aa9b9628915878a6ea9776c40a0bb02950";
   inputs.sbt-derivation.url = "github:zaninime/sbt-derivation";
 
-  outputs = { self, nixpkgs, flake-utils, sbt-derivation }: #, libsonic, libsonic-jnr }:
+  outputs = { self, nixpkgs, flake-utils, sbt-derivation
+    }: # , libsonic, libsonic-jnr }:
     let
       overlay = import ./nix/overlay.nix self.rev;
-      pkgsForSystem = system: (import nixpkgs) {
-        inherit system; overlays = [
-        #libsonic.overlay
-        #libsonic-jnr.overlay
-        sbt-derivation.overlay
-        overlay
-      ];
-      };
+      pkgsForSystem = system:
+        (import nixpkgs) {
+          inherit system;
+          overlays = [
+            #libsonic.overlay
+            #libsonic-jnr.overlay
+            sbt-derivation.overlay
+            overlay
+          ];
+        };
 
       mkHydraUtils = mkPkgs:
         let
@@ -24,32 +28,34 @@
           # [attrset] -> attrset
           recursiveMerge = libPkgs.lib.foldr libPkgs.lib.recursiveUpdate { };
           mkHydraJobsForSystem = attrs: system:
-            recursiveMerge (map (n: { "${n}"."${system}" = (mkPkgs system)."${n}"; }) attrs);
-        in
-        {
+            recursiveMerge
+            (map (n: { "${n}"."${system}" = (mkPkgs system)."${n}"; }) attrs);
+        in {
           collectHydraSets = jobSets: { hydraJobs = recursiveMerge jobSets; };
-          mkHydraSet = attrs: systems: recursiveMerge (map (mkHydraJobsForSystem attrs) systems);
+          mkHydraSet = attrs: systems:
+            recursiveMerge (map (mkHydraJobsForSystem attrs) systems);
         };
 
       hydraUtils = mkHydraUtils pkgsForSystem;
       inherit (hydraUtils) collectHydraSets mkHydraSet;
 
-    in
-    flake-utils.lib.eachDefaultSystem
-      (system: rec {
-        pkgs = pkgsForSystem system;
-        legacyPackages = pkgs;
+    in flake-utils.lib.eachDefaultSystem (system: rec {
+      pkgs = pkgsForSystem system;
+      legacyPackages = pkgs;
 
-        defaultPackage = pkgs.mantis;
-        devShell = pkgs.mkShell {
-          nativeBuildInputs = with pkgs; [ solc sbt ];
-        };
-        apps.mantis = flake-utils.lib.mkApp { drv = pkgs.mantis; };
-        defaultApp = apps.mantis;
-      }) // (collectHydraSets [
-      (mkHydraSet [ "mantis" ] [ "x86_64-linux" ])
-      (mkHydraSet [ "mantis-entrypoint" ] [ "x86_64-linux" ])
-      (mkHydraSet [ "retesteth" ] [ "x86_64-linux" ])
-      (mkHydraSet [ "lllc" ] [ "x86_64-linux" ])
-    ]);
+      defaultPackage = pkgs.mantis;
+      devShell = pkgs.mkShell { nativeBuildInputs = with pkgs; [ solc sbt ]; };
+      apps.mantis = flake-utils.lib.mkApp { drv = pkgs.mantis; };
+      defaultApp = apps.mantis;
+    }) // (collectHydraSets
+      (map (name: mkHydraSet [ name ] [ "x86_64-linux" ]) [
+        "jdk8"
+        "lllc"
+        "mantis"
+        "mantis-entrypoint"
+        "netcat-gnu"
+        "retesteth"
+        "sbt"
+        "solc"
+      ]));
 }