Compare commits

..

12 Commits

Author SHA1 Message Date
bed3d8ce31
Remove gcc from tampi *buildInputs 2025-09-12 14:47:00 +02:00
94068997d9
Fix strictDeps ovni 2025-09-12 14:47:00 +02:00
ffcb91bd8d
Fix strictDeps osu 2025-09-12 14:46:56 +02:00
ce3ae340fc
Fix strictDeps mercurium 2025-09-12 14:46:56 +02:00
163a409c80
Fix strictDeps tampi 2025-09-12 14:46:56 +02:00
22921b9823
Fix strictDeps sonar 2025-09-12 14:46:56 +02:00
7431fd6057
Fix strictDeps nanos6 2025-09-12 14:46:56 +02:00
b63528025d
Fix strictDeps paraver 2025-09-12 14:46:56 +02:00
ae5345ea62
Fix strictDeps ompss2 2025-09-12 14:46:55 +02:00
29b3129517
Fix strictDeps intel 2023 2025-09-12 14:46:55 +02:00
1138e46b73
Fix strictDeps bench6 2025-09-12 14:46:55 +02:00
cf7948e3c9
Fix strictDeps bigotes 2025-09-12 14:46:55 +02:00
3 changed files with 12 additions and 22 deletions

View File

@ -2,23 +2,17 @@
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;

View File

@ -88,9 +88,7 @@ in bscPkgs // {
};
};
pkgs = 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 +96,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
'';

View File

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