Rework bsc-ci

.gitea/workflows/ci.yaml

@@ -1,15 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:all:
-    runs-on: native
-    steps:
-      - uses: https://gitea.com/ScMi1/checkout@v1.4
-      - run: nix build -L --no-link --print-out-paths .#bsc-ci.all

overlay.nix

@@ -6,6 +6,9 @@ with final.lib;
 let
   callPackage = final.callPackage;
 
+  mkDeps = name: pkgs: final.runCommand name { }
+    "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
+
   bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
@@ -46,6 +49,33 @@ let
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
+
+  pkgs = filterAttrs (_: isDerivation) bscPkgs;
+
+  crossTargets = [ "riscv64" ];
+  cross = prev.lib.genAttrs crossTargets (target:
+    final.pkgsCross.${target}.bsc-ci.pkgs
+  );
+
+  buildList = name: paths: final.runCommand name ''
+    deps=${toString paths}
+    cat $deps
+    printf '%s\n' $deps > $out
+  '';
+
+  crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) final.bsc-ci.cross;
+
+  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
+  tests = buildList "ci-tests" (collect isDerivation final.bsc-ci.test);
+
+  all = buildList "ci-all" [tests pkgsList];
+
+in bscPkgs // {
+  # Prevent accidental usage of bsc attribute
+  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
+
+  # Internal for our CI tests
+  bsc-ci = {
     test = rec {
       #hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
       #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
@@ -79,40 +109,8 @@ let
       };
     };
 
-  pkgs = filterAttrs (_: isDerivation) bscPkgs;
+    inherit tests;
-
-  crossTargets = [ "riscv64" ];
-  cross = prev.lib.genAttrs crossTargets (target:
-    final.pkgsCross.${target}.bsc-ci.pkgs
-  );
-
-  buildList = name: paths:
-    final.runCommandLocal name { } ''
-      printf '%s\n' ${toString paths} | tee $out
-    '';
-
-  buildList' = name: paths:
-    final.runCommandLocal name { } ''
-      deps="${toString paths}"
-      cat $deps
-      printf '%s\n' $deps >$out
-    '';
-
-  crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
-
-  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
-  tests = buildList "ci-tests" (collect isDerivation test);
-
-  all = buildList' "ci-all" [ pkgsList tests ];
-
-in bscPkgs // {
-  # Prevent accidental usage of bsc attribute
-  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
-
-  # Internal for our CI tests
-  bsc-ci = {
     inherit pkgs pkgsList;
-    inherit test tests;
     inherit cross crossList;
     inherit all;
   };