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

Compare commits

base: abonerib:push-vmmrtpymxvyx
Branches Tags
abonerib:master abonerib:pkgs/clsparse abonerib:pkgs/aocc abonerib:add-meta abonerib:pkgs/taopencl abonerib:pkgs/tasycl abonerib:enableStrictDeps abonerib:pkgs/tacuda abonerib:fix/crossRV64 abonerib:CIstrictDeps abonerib:mega-merge abonerib:fix/paraver abonerib:hydraJobs abonerib:push-vmmrtpymxvyx abonerib:update-paraver abonerib:pkgs/tasycl-next abonerib:fix/sycl abonerib:feat/hydra rarias:master rarias:add-vivado
..
compare: abonerib:hydraJobs
Branches Tags
abonerib:pkgs/clsparse abonerib:pkgs/aocc abonerib:add-meta abonerib:pkgs/taopencl abonerib:pkgs/tasycl abonerib:enableStrictDeps abonerib:pkgs/tacuda abonerib:fix/crossRV64 abonerib:master abonerib:CIstrictDeps abonerib:mega-merge abonerib:fix/paraver abonerib:hydraJobs abonerib:push-vmmrtpymxvyx abonerib:update-paraver abonerib:pkgs/tasycl-next abonerib:fix/sycl abonerib:feat/hydra rarias:master rarias:add-vivado

3 Commits
push-vmmrt ... hydraJobs

Author SHA1 Message Date
Aleix Boné
2ffdd53d86 Add hydraJobs with tests and packages 
Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
 2025-09-26 16:12:46 +02:00
Aleix Boné
c7b5ec13b8 Provide nixpkgs.lib in bscpkgs outputs 
Currently, we can use bscpkgs similarly to nixpkgs either through
the flake outputs or with import bscpkgs:

```nix
# currently supported:
bscpkgs.legacyPackages.x86_64-linux.hello
let pkgs = import bscpkgs { system = "x86_64-linux"; }; in pkgs.hello
```
The missing piece is nixpkgs.lib (not pkgs.lib, the system agnostic
one). The workaround is to do bscpkgs.inputs.nixpkgs.lib instead. We can
simplify this by forwarding the lib to our outputs.

This enables us to use bscpkgs as a drop-in
replacing the inputs to our flake from nixpkgs to bscpkgs.
(inputs.nixpkgs.url = "<*BSC*pkgs url>").


Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Aleix Boné <abonerib@bsc.es>
 2025-09-12 14:28:42 +02:00
Rodrigo Arias Mallo
00dfe801f4 Fix GPI-2 and enable TAGASPI 
The rdma-core driver.h include is no longer installed:

 56dd87acd2

So ibv_read_sysfs_file() is not defined. As the symbols is still
distributed, we simply add the missing prototype manually.

Similarly, the gaspi_get_system_mem() function is not available from the
gaspi public headers, so we define it in the max_mem.c test.

Fixes: rarias/bscpkgs#7
Reviewed-by: Aleix Boné <abonerib@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
 2025-09-12 14:21:00 +02:00
2 changed files with 19 additions and 8 deletions
Expand all files Collapse all files

21
flake.nix
View File

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

6
overlay.nix
View File

@@ -88,7 +88,9 @@ in bscPkgs // {
};
};
pkgs = final.runCommand "ci-pkgs" { }
pkgs = filterAttrs (_: isDerivation) bscPkgs;
pkgsList = final.runCommand "ci-pkgs" { }
"printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
tests = final.runCommand "ci-tests" { }
@@ -96,7 +98,7 @@ in bscPkgs // {
all = final.runCommand "ci-all" { }
''
deps="${toString [ final.bsc-ci.pkgs final.bsc-ci.tests ]}"
deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
cat $deps
printf '%s\n' $deps > $out
'';