Merge bscpkgs into jungle #189
Loading…
x
Reference in New Issue
Block a user
No description provided.
Delete Branch "merge-bscpkgs"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Kaboom
Flake lock file updates: • Updated input 'nixpkgs': 'path:/nix/store/s4jqyj35hii03rs7j5n6vn7gpgp6ja81-source?lastModified=1692447944&narHash=sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U%3D&rev=d680ded26da5cf104dd2735a51e88d2d8f487b4d' (2023-08-19) → 'path:/nix/store/z7y28qzhk7driiwcw78k0mb24laknm0f-source?lastModified=1700390070&narHash=sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0%3D&rev=e4ad989506ec7d71f7302cc3067abd82730a4beb' (2023-11-19) Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>Flake lock file updates: • Updated input 'nixpkgs': 'path:/nix/store/z7y28qzhk7driiwcw78k0mb24laknm0f-source?lastModified=1700390070&narHash=sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0%3D&rev=e4ad989506ec7d71f7302cc3067abd82730a4beb' (2023-11-19) → 'path:/nix/store/2csx2kkb2hxyxhhmg2xs9jfyypikwwk6-source?lastModified=1736867362&narHash=sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8%3D&rev=9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc' (2025-01-14) Reviewed-by: Aleix Boné <abonerib@bsc.es>This makes `nix-build` and friends use the current flake lock instead of the outdated pinned version we had in `./nixpkgs.nix` With this, `nix-build -A ovni` and `nix build .#ovni` should produce the same result. This will fail if the flake nixpkgs input does not come from NixOS/nixpkgs. We could use edolstra/flake-compat instead, but it's overkill imho. Additionally, I made default.nix behave like nixpkgs, so that we can import bscpkgs à la nixpkgs (Apply overlays and other options that nixpkgs accepts): ```nix let pkgs = import bscpkgs { inherit system; }; in <...> ``` Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>Flake lock file updates: • Updated input 'nixpkgs': 'path:/nix/store/2csx2kkb2hxyxhhmg2xs9jfyypikwwk6-source?lastModified=1736867362&narHash=sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8%3D&rev=9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc' (2025-01-14) → 'path:/nix/store/zk8v61cpk1wprp9ld5ayc1g5fq4pdkwv-source?lastModified=1752436162&narHash=sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw%3D&rev=dfcd5b901dbab46c9c6e80b265648481aafb01f8' (2025-07-13) Reviewed-by: Aleix Boné <abonerib@bsc.es>To support the new instrumentation for HWC it would be useful to already build nOS-V with PAPI support enabled. The enablePapi switch allows it to be disabled with `nosv.override { enablePapi = false; }`. Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es> Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>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>5ce931db42to5d99acc02eWIP: Merge bscpkgs into jungleto Merge bscpkgs into jungle9f3bbfe606to44cc60fcd8