rarias/devshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch bscpkgs inputs to jungle

Browse Source
This commit is contained in:
Rodrigo Arias 2025-10-14 09:51:17 +02:00
parent 9457de1983
commit 676a0ced1c
4 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arnau/posv/flake.lock generated
View File

@ -1,39 +1,42 @@
{ {
"nodes": { "nodes": {
"bscpkgs": { "jungle": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1758895966, "lastModified": 1760427467,
"narHash": "sha256-L8DeK85bI7Ry4YfqO/5svwO0nVZLN7lviWalIGtKr7g=", "narHash": "sha256-DemQ+XT3BWXh8fr6UDfGNUB4ba0tGJXyep5/lg+gBD4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "2ffdd53d86157ea83a867b544e7bedf89797b72b", "rev": "4261d327c678e52abdd568a27168ea7cdd0484a0",
"revCount": 985, "revCount": 1487,
"type": "git", "type": "git",
"url": "https://jungle.bsc.es/git/rarias/bscpkgs" "url": "https://jungle.bsc.es/git/rarias/jungle"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://jungle.bsc.es/git/rarias/bscpkgs" "url": "https://jungle.bsc.es/git/rarias/jungle"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752436162, "lastModified": 1752436162,
"narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
"path": "/nix/store/zk8v61cpk1wprp9ld5ayc1g5fq4pdkwv-source", "owner": "NixOS",
"repo": "nixpkgs",
"rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
"type": "path" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"type": "indirect" "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"bscpkgs": "bscpkgs" "jungle": "jungle"
} }
} }
}, },

8
arnau/posv/flake.nix
View File

@ -1,8 +1,8 @@
{ {
# Fetch the list of packages for BSC # Fetch the list of packages for BSC
inputs.bscpkgs.url = "git+https://jungle.bsc.es/git/rarias/bscpkgs"; inputs.jungle.url = "git+https://jungle.bsc.es/git/rarias/jungle";
outputs = { self, bscpkgs }: outputs = { self, jungle }:
let let
customOverlay = final: prev: { customOverlay = final: prev: {
# Disable GIL in python # Disable GIL in python
@ -17,11 +17,11 @@
gitUrl = "ssh://git@gitlab-internal.bsc.es/acinca/nos-v.git"; gitUrl = "ssh://git@gitlab-internal.bsc.es/acinca/nos-v.git";
}; };
}; };
pkgs = import bscpkgs.inputs.nixpkgs { pkgs = import jungle.inputs.nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlays = [
# Add our BSC packages # Add our BSC packages
bscpkgs.bscOverlay jungle.bscOverlay
# And our changes above on top # And our changes above on top
customOverlay customOverlay
]; ];

33
isabel/slurm/flake.lock generated
View File

@ -1,39 +1,42 @@
{ {
"nodes": { "nodes": {
"bscpkgs": { "jungle": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1749650500, "lastModified": 1760427467,
"narHash": "sha256-2MHfVPV6RA7qPSCtXh4+KK0F0UjN+J4z8//+n6NK7Xs=", "narHash": "sha256-DemQ+XT3BWXh8fr6UDfGNUB4ba0tGJXyep5/lg+gBD4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "9d1944c658929b6f98b3f3803fead4d1b91c4405", "rev": "4261d327c678e52abdd568a27168ea7cdd0484a0",
"revCount": 961, "revCount": 1487,
"type": "git", "type": "git",
"url": "https://git.sr.ht/~rodarima/bscpkgs" "url": "https://jungle.bsc.es/git/rarias/jungle"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.sr.ht/~rodarima/bscpkgs" "url": "https://jungle.bsc.es/git/rarias/jungle"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736867362, "lastModified": 1752436162,
"narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
"path": "/nix/store/2csx2kkb2hxyxhhmg2xs9jfyypikwwk6-source", "owner": "NixOS",
"rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", "repo": "nixpkgs",
"type": "path" "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"type": "indirect" "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"bscpkgs": "bscpkgs" "jungle": "jungle"
} }
} }
}, },

10
isabel/slurm/flake.nix
View File

@ -1,8 +1,8 @@
{ {
inputs.bscpkgs.url = "git+https://git.sr.ht/~rodarima/bscpkgs"; inputs.jungle.url = "git+https://jungle.bsc.es/git/rarias/jungle";
outputs = { self, bscpkgs }: outputs = { self, jungle }:
let let
nixpkgs = bscpkgs.inputs.nixpkgs; nixpkgs = jungle.inputs.nixpkgs;
clusterOverlay = (final: prev: { clusterOverlay = (final: prev: {
# Use cluster llvm compiler repo # Use cluster llvm compiler repo
clangOmpss2Unwrapped = prev.clangOmpss2Unwrapped.override { clangOmpss2Unwrapped = prev.clangOmpss2Unwrapped.override {
@ -15,8 +15,8 @@
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [ overlays = [
# Apply bscpkgs to get our BSC custom packages # Apply jungle overlay to get our BSC custom packages
bscpkgs.outputs.bscOverlay jungle.outputs.bscOverlay
# And on top apply our local changes to customize for cluster # And on top apply our local changes to customize for cluster
clusterOverlay clusterOverlay
]; ];