Fix C runtime objects path

Some gcc versions append an extension to the patch version number, but this exetension is not part of the installation path. This patch removes the extension to the patch version.
openmpv: Remove dangling symlink
2025-05-26 10:29:16 +02:00 · 2025-05-26 10:28:30 +02:00 · 2025-03-07 15:21:11 +01:00 · 2025-02-28 13:36:00 +01:00
13 changed files with 15 additions and 69 deletions
--- a/overlay.nix
+++ b/overlay.nix
@@ -46,7 +46,6 @@ let
    stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
    tampi = callPackage ./pkgs/tampi/default.nix { };
-    vivado = callPackage ./pkgs/vivado/default.nix { };
    wxparaver = callPackage ./pkgs/paraver/default.nix { };
  };

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

--- a/pkgs/cn6/default.nix
+++ b/pkgs/cn6/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  ] ++ optionals (enableTest) [ mpi clangOmpss2 tampi ];

  src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/cn6.git";
+    url = "ssh://git@bscpm04.bsc.es/rarias/cn6.git";
    ref = "master";
    rev = "c72c3b66b720c2a33950f536fc819051c8f20a69";
  };
--- a/pkgs/llvm-ompss2/clang.nix
+++ b/pkgs/llvm-ompss2/clang.nix
@@ -14,7 +14,7 @@
 , gcc # needed to set the rpath of libstdc++ for clang-tblgen
 , enableDebug ? 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"
 , gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
 }:
--- a/pkgs/llvm-ompss2/default.nix
+++ b/pkgs/llvm-ompss2/default.nix
@@ -34,14 +34,15 @@ let
  targetConfig = stdenv.targetPlatform.config;
  inherit gcc;
  cc = clangOmpss2Unwrapped;
+  gccVersion = lib.strings.concatStringsSep "." [(lib.versions.major gcc.version) (lib.versions.minor gcc.version) (lib.versions.patch gcc.version)];
 in wrapCCWith {
  inherit cc bintools;
  # extraPackages adds packages to depsTargetTargetPropagated
  extraPackages = lib.optional (openmp != null) openmp;
  extraBuildCommands = ''
    echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
-    echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
-    echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
+    echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-cflags
+    echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags
    echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags

    for dir in ${gcc.cc}/include/c++/*; do
--- a/pkgs/llvm-ompss2/openmp.nix
+++ b/pkgs/llvm-ompss2/openmp.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
    rm -f $out/lib/libiomp*
  '' + lib.optionalString enableNosv ''
    rm -f $out/lib/libomp.*
+    rm -f $out/libllvmrt/libomp.*
  '';

  passthru = {
--- a/pkgs/mcxx/git.nix
+++ b/pkgs/mcxx/git.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  };

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

--- a/pkgs/mcxx/rarias.nix
+++ b/pkgs/mcxx/rarias.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

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

--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -17,7 +17,7 @@
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
 , gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
 }:
@@ -48,7 +48,7 @@ let

  source = if (useGit) then git else release;
 in
-  stdenv.mkDerivation (source // rec {
+  stdenv.mkDerivation (source // {
    pname = "nanos6";

    prePatch = ''
@@ -62,7 +62,7 @@ in
      export CACHELINE_WIDTH=${toString cachelineBytes}
      ./autogen.sh
    '' + lib.optionalString (useGit) ''
-      export NANOS6_GIT_VERSION=${src.rev}
+      export NANOS6_GIT_VERSION=${gitCommit}
      export NANOS6_GIT_BRANCH=${gitBranch}
    '';

--- a/pkgs/nixtools/default.nix
+++ b/pkgs/nixtools/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  pname = "nixtools";
  version = "${src.shortRev}";
  src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/nixtools";
+    url = "ssh://git@bscpm04.bsc.es/rarias/nixtools";
    ref = "master";
    rev = "a103e392048ace3ed88ce74648b32c9e6ed094da";
  };
--- a/pkgs/ovni/default.nix
+++ b/pkgs/ovni/default.nix
@@ -6,7 +6,7 @@
 , fetchFromGitHub
 , useGit ? false
 , gitBranch ? "master"
-, gitUrl ? "ssh://git@bscpm03.bsc.es/rarias/ovni.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/rarias/ovni.git"
 , gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
 , enableDebug ? false
 # Only enable MPI if the build is native (fails on cross-compilation)
--- a/pkgs/tampi/default.nix
+++ b/pkgs/tampi/default.nix
@@ -13,7 +13,7 @@
 , enableOvni ? true
 , ovni ? null
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/interoperability/tampi.git"
 , gitBranch ? "master"
 , gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc"
 }:
--- a/pkgs/vivado/default.nix
+++ b/pkgs/vivado/default.nix
@@ -1,55 +0,0 @@
-# Thanks to MLabs to made the switch.
-
-{
-  stdenv
-, lib
-, ncurses5
-, libxcrypt-legacy
-, zlib
-, libuuid
-, xorg
-, freetype
-, fontconfig
-, buildFHSEnv
-}:
-
-with lib;
-
-let
-  vivadoDeps = pkgs:
-    let
-      # Apply patch from https://github.com/nix-community/nix-environments/pull/54
-      # to fix ncurses libtinfo.so's soname issue
-      ncurses' = ncurses5.overrideAttrs (old: {
-        configureFlags = old.configureFlags ++ ["--with-termlib"];
-        postFixup = "";
-      });
-    in [
-      libxcrypt-legacy
-      (ncurses'.override {unicodeSupport = false;})
-      zlib
-      libuuid
-      xorg.libSM
-      xorg.libICE
-      xorg.libXrender
-      xorg.libX11
-      xorg.libXext
-      xorg.libXtst
-      xorg.libXi
-      freetype
-      fontconfig
-    ];
-
-  vivadoEnv = buildFHSEnv {
-    name = "vivado-env";
-    targetPkgs = vivadoDeps;
-  };
-
-  vivado = buildFHSEnv {
-    name = "vivado";
-    targetPkgs = vivadoDeps;
-    profile = "set -e; source /opt/Xilinx/Vivado/2024.2/settings64.sh";
-    runScript = "vivado";
-  };
-in
-  vivadoEnv
Author	SHA1	Message	Date
Aleix Roca Nonell	93d9c770e8	Fix C runtime objects path Some gcc versions append an extension to the patch version number, but this exetension is not part of the installation path. This patch removes the extension to the patch version.	2025-05-26 10:29:16 +02:00
Aleix Roca Nonell	e84e961b9f	openmpv: Remove dangling symlink	2025-05-26 10:28:30 +02:00
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