abonerib/bscpkgs
1
0
Fork 0
forked from rarias/bscpkgs
Code Pull Requests 1 Activity

Rename test to tests and tests to testList

Browse Source 
Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
This commit is contained in:
Aleix Boné 2025-10-01 15:24:12 +02:00 committed by Rodrigo Arias Mallo
parent 34f4b6aa37
commit 92ee4a09d7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -17,7 +17,7 @@
legacyPackages.${system} = pkgs; legacyPackages.${system} = pkgs;
hydraJobs = { hydraJobs = {
inherit (self.legacyPackages.${system}.bsc-ci) test pkgs cross; inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
}; };
# propagate nixpkgs lib, so we can do bscpkgs.lib # propagate nixpkgs lib, so we can do bscpkgs.lib

8
overlay.nix
View File

@ -46,7 +46,7 @@ let
wxparaver = callPackage ./pkgs/paraver/default.nix { }; wxparaver = callPackage ./pkgs/paraver/default.nix { };
}; };
test = rec { tests = rec {
#hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys #hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
#sigsegv = callPackage ./test/reproducers/sigsegv.nix { }; #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
hello-c = callPackage ./test/compilers/hello-c.nix { }; hello-c = callPackage ./test/compilers/hello-c.nix { };
@ -101,9 +101,9 @@ let
crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross; crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs); pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
tests = buildList "ci-tests" (collect isDerivation test); testList = buildList "ci-tests" (collect isDerivation tests);
all = buildList' "ci-all" [ pkgsList tests ]; all = buildList' "ci-all" [ pkgsList testList ];
in bscPkgs // { in bscPkgs // {
# Prevent accidental usage of bsc attribute # Prevent accidental usage of bsc attribute
@ -112,7 +112,7 @@ in bscPkgs // {
# Internal for our CI tests # Internal for our CI tests
bsc-ci = { bsc-ci = {
inherit pkgs pkgsList; inherit pkgs pkgsList;
inherit test tests; inherit tests testList;
inherit cross crossList; inherit cross crossList;
inherit all; inherit all;
}; };