flake.nix

@@ -29,13 +29,17 @@
       systems = [
         "x86_64-linux"
       ];
-      forAllSystems = nixpkgs.lib.genAttrs systems;
+      forAllSystems = f:
+        builtins.foldl' (systems: system:
+          systems // { ${system} = f system; }
+        ) {} systems;
+    in rec {
 
-      artiq-jobsets = system: artiqInputName: a6p:
+      packages = forAllSystems (system:
         let
           pkgs = nixpkgs.legacyPackages.${system};
 
-          artiq-fast-src =
+          artiq-fast-src = artiqInputName:
             let
               inherit (sources.${artiqInputName}) lastModified rev narHash;
               hash = builtins.replaceStrings ["sha256-"] [""] narHash;
@@ -63,51 +67,36 @@
                 echo "{ stdenv, git, fetchgit }: \"$MAJOR_VERSION.`cut -c1-8 <<< ${rev}`$SUFFIX\"" > $out/pkgs/artiq-version.nix
                 echo "{ stdenv, git, fetchgit }: \"${toString lastModified}\"" > $out/pkgs/artiq-timestamp.nix
             '';
-          artiq-fast =
-            import artiq-fast-src {
+          artiq-fast = artiqInputName:
+            import (artiq-fast-src artiqInputName) {
               inherit pkgs;
             };
 
-          artiq-board-generated =
+          artiq-board-generated = artiqInputName:
             (import ./artiq-board-generated {
               inherit pkgs;
               sinaraSystemsSrc = null; #sources.sinara-systems.outPath;
               sinaraSystemsRev = sources.sinara-systems.rev;
               sinaraSystemsHash = builtins.replaceStrings ["sha256-"] [""]
                 sources.sinara-systems.narHash;
-              artiq-fast = artiq-fast-src;
+              artiq-fast = artiq-fast-src artiqInputName;
             }).generated-nix;
 
-          artiq-full =
+          artiq-full = artiqInputName: a6p:
             import ./artiq-full.nix {
-              inherit pkgs a6p artiq-board-generated;
-              artiq-fast = artiq-fast-src;
+              inherit pkgs;
+              inherit a6p;
+              artiq-board-generated = artiq-board-generated artiqInputName;
+              sinaraSystemsSrc = sources.sinara-systems.outPath;
+              artiq-fast = artiq-fast-src artiqInputName;
             };
-        in {
-          inherit artiq-fast artiq-full;
-        };
-    in {
-      packages = forAllSystems (system:
-        builtins.foldl' (a: b: a // b) {} (
-          builtins.attrValues (
-            artiq-jobsets system "artiq-beta-src" true
-          )
-        )
+
+          allPackages = artiqInputName: a6p:
+            (artiq-fast artiqInputName) //
+            (artiq-full artiqInputName a6p);
+        in allPackages "artiq-beta-src" true
       );
 
       defaultPackage = forAllSystems (system: self.packages.${system}.artiq);
-
-      hydraJobs =
-        let
-          jobset = artiqInputName: a6p: name:
-            forAllSystems (system: (artiq-jobsets system artiqInputName a6p).${name});
-        in {
-          fast = jobset "artiq-src" true "artiq-fast";
-          fast-beta = jobset "artiq-beta-src" true "artiq-fast";
-          fast-legacy = jobset "artiq-legacy-src" false "artiq-fast";
-          full = jobset "artiq-src" true "artiq-full";
-          full-beta = jobset "artiq-beta-src" true "artiq-full";
-          full-legacy = jobset "artiq-legacy-src" false "artiq-full";
-        };
     };
 }