Remove gcc from tampi *buildInputs

.gitea/workflows/ci.yaml

@@ -1,15 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:all:
-    runs-on: native
-    steps:
-      - uses: https://gitea.com/ScMi1/checkout@v1.4
-      - run: nix build -L --no-link --print-out-paths .#bsc-ci.all

flake.nix

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

overlay.nix

@@ -6,6 +6,9 @@ with final.lib;
 let
   callPackage = final.callPackage;
 
+  mkDeps = name: pkgs: final.runCommand name { }
+    "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
+
   bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
@@ -46,7 +49,13 @@ let
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
-  tests = rec {
+in bscPkgs // {
+  # Prevent accidental usage of bsc attribute
+  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
+
+  # Internal for our CI tests
+  bsc-ci = {
+    test = rec {
       #hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
       #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
       hello-c = callPackage ./test/compilers/hello-c.nix { };
@@ -79,41 +88,17 @@ let
       };
     };
 
-  pkgs = filterAttrs (_: isDerivation) bscPkgs;
+    pkgs = final.runCommand "ci-pkgs" { }
+      "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
 
-  crossTargets = [ "riscv64" ];
+    tests = final.runCommand "ci-tests" { }
-  cross = prev.lib.genAttrs crossTargets (target:
+      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
-    final.pkgsCross.${target}.bsc-ci.pkgs
-  );
 
-  buildList = name: paths:
+    all = final.runCommand "ci-all" { }
-    final.runCommandLocal name { } ''
+    ''
-      printf '%s\n' ${toString paths} | tee $out
+      deps="${toString [ final.bsc-ci.pkgs final.bsc-ci.tests ]}"
-    '';
-
-  buildList' = name: paths:
-    final.runCommandLocal name { } ''
-      deps="${toString paths}"
       cat $deps
-      printf '%s\n' $deps >$out
+      printf '%s\n' $deps > $out
     '';
-
-  crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
-
-  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
-  testList = buildList "ci-tests" (collect isDerivation tests);
-
-  all = buildList' "ci-all" [ pkgsList testList ];
-
-in bscPkgs // {
-  # Prevent accidental usage of bsc attribute
-  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
-
-  # Internal for our CI tests
-  bsc-ci = {
-    inherit pkgs pkgsList;
-    inherit tests testList;
-    inherit cross crossList;
-    inherit all;
   };
 }

pkgs/llvm-ompss2/clang.nix

@@ -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