Add hydraJobs with tests and packages

flake.nix

@@ -2,25 +2,23 @@
   inputs.nixpkgs.url = "nixpkgs";
 
   outputs = { self, nixpkgs, ...}:
-    let
+  let
+    pkgs = import nixpkgs {
       # For now we only support x86
       system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [ self.overlays.default ];
-      };
-    in
+      overlays = [ self.overlays.default ];
+    };
+  in
     {
       bscOverlay = import ./overlay.nix;
       overlays.default = self.bscOverlay;
-      # full nixpkgs with our overlay applied
-      legacyPackages.${system} = pkgs;
-
-      hydraJobs = {
-        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
-      };
+      legacyPackages.x86_64-linux = pkgs;
 
       # propagate nixpkgs lib, so we can do bscpkgs.lib
       inherit (nixpkgs) lib;
+
+      hydraJobs = {
+        inherit (self.legacyPackages.x86_64-linux.bsc-ci) test packages;
+      };
     };
 }

overlay.nix

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