Compare commits
2 Commits
e07d9f21dc
...
6491ba90ad
| Author | SHA1 | Date | |
|---|---|---|---|
| 6491ba90ad | |||
| 967cfba8ec |
18
flake.nix
18
flake.nix
@ -16,8 +16,24 @@
|
|||||||
# full nixpkgs with our overlay applied
|
# full nixpkgs with our overlay applied
|
||||||
legacyPackages.${system} = pkgs;
|
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 = {
|
hydraJobs = {
|
||||||
inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
|
inherit (self.legacyPackages.x86_64-linux.bsc-ci) test;
|
||||||
|
packages = self.packages.${system};
|
||||||
};
|
};
|
||||||
|
|
||||||
# propagate nixpkgs lib, so we can do bscpkgs.lib
|
# propagate nixpkgs lib, so we can do bscpkgs.lib
|
||||||
|
|||||||
@ -88,9 +88,7 @@ in bscPkgs // {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgs = filterAttrs (_: isDerivation) bscPkgs;
|
pkgs = final.runCommand "ci-pkgs" { }
|
||||||
|
|
||||||
pkgsList = final.runCommand "ci-pkgs" { }
|
|
||||||
"printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
|
"printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
|
||||||
|
|
||||||
tests = final.runCommand "ci-tests" { }
|
tests = final.runCommand "ci-tests" { }
|
||||||
@ -98,7 +96,7 @@ in bscPkgs // {
|
|||||||
|
|
||||||
all = final.runCommand "ci-all" { }
|
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
|
cat $deps
|
||||||
printf '%s\n' $deps > $out
|
printf '%s\n' $deps > $out
|
||||||
'';
|
'';
|
||||||
|
|||||||
Reference in New Issue
Block a user