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

Compare commits

merge into: arocanon:add-vivado
Branches Tags
arocanon:master arocanon:cross-build-fixes arocanon:fixes arocanon:add-vivado rarias:master rarias:add-vivado
...
pull from: arocanon:master
Branches Tags
arocanon:cross-build-fixes arocanon:fixes arocanon:master arocanon:add-vivado rarias:master rarias:add-vivado

2 Commits
add-vivado ... master

Author SHA1 Message Date
Aleix Boné
f962816eab Update PM gitlab URL to new server bscpm04.bsc.es 
The old server has died, so we move to the new URL at bscpm04.bsc.es.

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
 2025-03-07 15:21:11 +01:00
Rodrigo Arias Mallo
c4583f787d Fix Nanos6 build from git 
The src.rev attribute is not available as it comes from source before
the recursive operator. Instead, simply get it from the function inputs.

Cc: Aleix Boné <aleix.boneribo@bsc.es>
Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
 2025-02-28 13:36:00 +01:00
9 changed files with 11 additions and 11 deletions
Expand all files Collapse all files

2
pkgs/bench6/default.nix
View File

@@ -7,7 +7,7 @@
, mpi , mpi
, tampi , tampi
, gitBranch ? "master" , gitBranch ? "master"
, gitURL ? "ssh://git@bscpm03.bsc.es/rarias/bench6.git" , gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
, gitCommit ? "1e6ce2aa8ad7b4eef38df1581d7ec48a8815f85d" , gitCommit ? "1e6ce2aa8ad7b4eef38df1581d7ec48a8815f85d"
}: }:

2
pkgs/cn6/default.nix
View File

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
] ++ optionals (enableTest) [ mpi clangOmpss2 tampi ]; ] ++ optionals (enableTest) [ mpi clangOmpss2 tampi ];
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/rarias/cn6.git"; url = "ssh://git@bscpm04.bsc.es/rarias/cn6.git";
ref = "master"; ref = "master";
rev = "c72c3b66b720c2a33950f536fc819051c8f20a69"; rev = "c72c3b66b720c2a33950f536fc819051c8f20a69";
}; };

2
pkgs/llvm-ompss2/clang.nix
View File

@@ -14,7 +14,7 @@
, gcc # needed to set the rpath of libstdc++ for clang-tblgen , gcc # needed to set the rpath of libstdc++ for clang-tblgen
, enableDebug ? false , enableDebug ? false
, useGit ? false , useGit ? false
, gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git" , gitUrl ? "ssh://git@bscpm04.bsc.es/llvm-ompss/llvm-mono.git"
, gitBranch ? "master" , gitBranch ? "master"
, gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc" , gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
}: }:

2
pkgs/mcxx/git.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
}; };
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/mercurium/mcxx"; url = "ssh://git@bscpm04.bsc.es/mercurium/mcxx";
ref = "master"; ref = "master";
}; };

2
pkgs/mcxx/rarias.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
#src = /home/Computational/rarias/mcxx; #src = /home/Computational/rarias/mcxx;
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/rarias/mcxx"; url = "ssh://git@bscpm04.bsc.es/rarias/mcxx";
rev = "44129a6ac05b8f78b06e9e2eff71438b5ca4d29f"; rev = "44129a6ac05b8f78b06e9e2eff71438b5ca4d29f";
}; };

6
pkgs/nanos6/default.nix
View File

@@ -17,7 +17,7 @@
, cachelineBytes ? 64 , cachelineBytes ? 64
, enableGlibcxxDebug ? false , enableGlibcxxDebug ? false
, useGit ? false , useGit ? false
, gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6" , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
, gitBranch ? "master" , gitBranch ? "master"
, gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4" , gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
}: }:
@@ -48,7 +48,7 @@ let
source = if (useGit) then git else release; source = if (useGit) then git else release;
in in
stdenv.mkDerivation (source // rec { stdenv.mkDerivation (source // {
pname = "nanos6"; pname = "nanos6";
prePatch = '' prePatch = ''
@@ -62,7 +62,7 @@ in
export CACHELINE_WIDTH=${toString cachelineBytes} export CACHELINE_WIDTH=${toString cachelineBytes}
./autogen.sh ./autogen.sh
'' + lib.optionalString (useGit) '' '' + lib.optionalString (useGit) ''
export NANOS6_GIT_VERSION=${src.rev} export NANOS6_GIT_VERSION=${gitCommit}
export NANOS6_GIT_BRANCH=${gitBranch} export NANOS6_GIT_BRANCH=${gitBranch}
''; '';

2
pkgs/nixtools/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
pname = "nixtools"; pname = "nixtools";
version = "${src.shortRev}"; version = "${src.shortRev}";
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/rarias/nixtools"; url = "ssh://git@bscpm04.bsc.es/rarias/nixtools";
ref = "master"; ref = "master";
rev = "a103e392048ace3ed88ce74648b32c9e6ed094da"; rev = "a103e392048ace3ed88ce74648b32c9e6ed094da";
}; };

2
pkgs/ovni/default.nix
View File

@@ -6,7 +6,7 @@
, fetchFromGitHub , fetchFromGitHub
, useGit ? false , useGit ? false
, gitBranch ? "master" , gitBranch ? "master"
, gitUrl ? "ssh://git@bscpm03.bsc.es/rarias/ovni.git" , gitUrl ? "ssh://git@bscpm04.bsc.es/rarias/ovni.git"
, gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4" , gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
, enableDebug ? false , enableDebug ? false
# Only enable MPI if the build is native (fails on cross-compilation) # Only enable MPI if the build is native (fails on cross-compilation)

2
pkgs/tampi/default.nix
View File

@@ -13,7 +13,7 @@
, enableOvni ? true , enableOvni ? true
, ovni ? null , ovni ? null
, useGit ? false , useGit ? false
, gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git" , gitUrl ? "ssh://git@bscpm04.bsc.es/interoperability/tampi.git"
, gitBranch ? "master" , gitBranch ? "master"
, gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc" , gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc"
}: }: