Compare commits

...

2 Commits

3 changed files with 11 additions and 5 deletions

View File

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

View File

@ -96,6 +96,10 @@ in bscPkgs // {
tests = final.runCommand "ci-tests" { } tests = final.runCommand "ci-tests" { }
"printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out"; "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
cross = prev.lib.genAttrs [ "riscv64" ] (target:
final.pkgsCross.${target}.bsc-ci.pkgs
);
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.pkgsList final.bsc-ci.tests ]}"

View File

@ -43,19 +43,21 @@ let
source = if (useGit) then git else release; source = if (useGit) then git else release;
in stdenv.mkDerivation rec { in stdenv.mkDerivation {
pname = "clang-ompss2"; pname = "clang-ompss2";
inherit (source) src version; inherit (source) src version;
enableParallelBuilding = true; enableParallelBuilding = true;
isClang = true;
passthru = { passthru = {
CC = "clang"; CC = "clang";
CXX = "clang++"; CXX = "clang++";
};
isClangWithOmpss = true; isClang = true;
isClangWithOmpss = true;
inherit gcc zlib;
};
nativeBuildInputs = [ nativeBuildInputs = [
bash bash