rarias/bscpkgs
rarias/bscpkgs
Archived
2
0
Fork 3
Code Issues 2 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix nativeBuildInputs and add cross compilation target #10

Manually merged
abonerib merged 17 commits from abonerib/bscpkgs:CIstrictDeps into master 2025-10-01 15:57:34 +02:00
Conversation 10 Commits 17 Files Changed 15 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 92ee4a09d7 - Show all commits

2
flake.nix
View File

@ -17,7 +17,7 @@
legacyPackages.${system} = pkgs;
hydraJobs = {
inherit (self.legacyPackages.${system}.bsc-ci) test pkgs cross;
inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
};
abonerib marked this conversation as resolved Outdated
abonerib commented 2025-09-29 17:10:40 +02:00
Outdated
Review
Copy Link

@rarias do you want to add this to bsc-ci.cross also?

@rarias do you want to add this to `bsc-ci.cross` also?
rarias commented 2025-09-30 17:37:06 +02:00
Outdated
Review
Copy Link

It would be great to have some target that we can build by hand that includes bsc cross packages. Maybe something like this?

diff --git a/overlay.nix b/overlay.nix
index 817fd51..c981742 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -100,6 +100,9 @@ in bscPkgs // {
       final.pkgsCross.${target}.bsc-ci.pkgs
     );

+    crossList = final.runCommand "ci-cross" { }
+      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.cross.riscv64)} > $out";
+
     all = final.runCommand "ci-all" { }
     ''
       deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
It would be great to have some target that we can build by hand that includes bsc cross packages. Maybe something like this? ```diff diff --git a/overlay.nix b/overlay.nix index 817fd51..c981742 100644 --- a/overlay.nix +++ b/overlay.nix @@ -100,6 +100,9 @@ in bscPkgs // { final.pkgsCross.${target}.bsc-ci.pkgs ); + crossList = final.runCommand "ci-cross" { } + "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.cross.riscv64)} > $out"; + all = final.runCommand "ci-all" { } '' deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}" ```
# 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 { };
};
test = rec {
tests = rec {
#hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
#sigsegv = callPackage ./test/reproducers/sigsegv.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;
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 // {
# Prevent accidental usage of bsc attribute
@ -112,7 +112,7 @@ in bscPkgs // {
# Internal for our CI tests
bsc-ci = {
inherit pkgs pkgsList;
inherit test tests;
inherit tests testList;
abonerib marked this conversation as resolved Outdated
abonerib commented 2025-10-01 15:18:59 +02:00
Outdated
Review
Copy Link

We could rename test -> tests and tests -> testsList for consistency.

We could rename `test -> tests` and `tests -> testsList` for consistency.
👍 1
inherit cross crossList;
inherit all;
};