Build all packages from the important packages list

flyingcircusio · Nov 12, 2023 · 96750d6 · 96750d6
1 parent 0b121ca
commit 96750d6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/build-important-packages.nix b/build-important-packages.nix
@@ -0,0 +1,10 @@
+with builtins;
+
+let
+  pkgs = import <fc> {};
+  pkgNames = fromJSON (readFile ./important_packages.json);
+  inherit (pkgs) lib;
+in pkgs.symlinkJoin {
+  name = "build-important-packages";
+  paths = map (p: lib.attrByPath (lib.splitString "." p) null pkgs) pkgNames;
+}
diff --git a/important_packages.json b/important_packages.json
@@ -11,6 +11,7 @@
   "binutils",
   "bundler",
   "cacert",
+  "calibre",
   "ceph",
   "cifs-utils",
   "chromedriver",
@@ -46,6 +47,7 @@
   "git",
   "github-runner",
   "gitlab",
+  "gitlab-ee",
   "gitlab-container-registry",
   "gitlab-runner",
   "glibc",
@@ -101,7 +103,6 @@
   "nfs-utils",
   "nginx",
   "nginxMainline",
-  "nginxModules.modsecurity",
   "nginxStable",
   "nix",
   "nodejs",

diff --git a/package-versions.json b/package-versions.json
@@ -504,11 +504,6 @@
     "pname": "nginx",
     "version": "1.24.0"
   },
-  "nginxModules.modsecurity": {
-    "name": "modsecurity",
-    "pname": "modsecurity",
-    "version": ""
-  },
   "nginxStable": {
     "name": "nginx-1.24.0",
     "pname": "nginx",

diff --git a/release/default.nix b/release/default.nix
@@ -115,18 +115,19 @@ let
     "gitlab-runner"
   ];
 
-  includedPkgNames = [
-    "awscli"
-    "calibre"
-    "element-web"
-    "firefox"
-    "gitlab-ee"
-  ];
-
-  testPkgNames = includedPkgNames ++
-    lib.subtractLists excludedPkgNames modifiedPkgNames;
-
-  testPkgs = listToAttrs (map (n: { name = n; value = pkgs.${n}; }) testPkgNames);
+  importantPkgNames = fromJSON (readFile ../important_packages.json);
+  testPkgNames = lib.subtractLists excludedPkgNames modifiedPkgNames;
+  testPkgs =
+    listToAttrs (map (n: { name = n; value = pkgs.${n}; }) testPkgNames);
+
+  importantPkgJobs =
+    (lib.foldl' lib.recursiveUpdate {}
+      (map
+        (dottedName:
+          let
+            path = lib.splitString "." dottedName;
+          in lib.setAttrByPath (path ++ ["x86_64-linux"]) (lib.hydraJob (lib.attrByPath path null pkgs)))
+        importantPkgNames));
 
   platformRoleDoc =
   let
@@ -151,6 +152,7 @@ let
 
   jobs = {
     pkgs = mapTestOn (packagePlatforms testPkgs);
+    importantPackages = importantPkgJobs;
     tests = import ../tests { inherit system pkgs; nixpkgs = nixpkgs_; };
   };
 
@@ -324,6 +326,7 @@ in
 
 jobs // {
   inherit channels tested images doc;
+  #inherit mapTestOn packagePlatforms testPkgs jobs importantPkgJobs;
 
   release = with lib; pkgs.releaseTools.channel rec {
     name = "release-${version}${versionSuffix}";