Add hydraJobs with tests and packages

flake.nix

@@ -16,24 +16,8 @@
       # full nixpkgs with our overlay applied
       legacyPackages.${system} = pkgs;
 
-      # packages added by our overlay
-      packages.${system} =
-        let
-          inherit (builtins) attrNames removeAttrs;
-          inherit (nixpkgs.lib) flip filterAttrs getAttrs pipe isDerivation;
-        in
-        # extract the names of the packages from the overlay, then get the
-        # actual packages from the full package set with the overlay applied
-        pipe (self.overlays.default null { inherit (nixpkgs) lib; }) [
-          attrNames
-          (flip getAttrs pkgs)
-          (flip removeAttrs [ "bsc" ])
-          (filterAttrs (_: isDerivation))
-        ];
-
       hydraJobs = {
-        inherit (self.legacyPackages.x86_64-linux.bsc-ci) test;
-        packages = self.packages.${system};
+        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
       };
 
       # propagate nixpkgs lib, so we can do bscpkgs.lib

overlay.nix

@@ -88,7 +88,9 @@ in bscPkgs // {
       };
     };
 
-    pkgs = final.runCommand "ci-pkgs" { }
+    pkgs = filterAttrs (_: isDerivation) bscPkgs;
+
+    pkgsList = final.runCommand "ci-pkgs" { }
       "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
 
     tests = final.runCommand "ci-tests" { }
@@ -96,7 +98,7 @@ in bscPkgs // {
 
     all = final.runCommand "ci-all" { }
     ''
-      deps="${toString [ final.bsc-ci.pkgs final.bsc-ci.tests ]}"
+      deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
       cat $deps
       printf '%s\n' $deps > $out
     '';