wip

overlay.nix

@@ -46,6 +46,7 @@ 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 { };
   };
 

pkgs/bench6/default.nix

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

pkgs/cn6/default.nix

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

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@bscpm04.bsc.es/llvm-ompss/llvm-mono.git"
+, gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git"
 , gitBranch ? "master"
 , gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
 }:

pkgs/mcxx/git.nix

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

pkgs/mcxx/rarias.nix

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

pkgs/nanos6/default.nix

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

pkgs/nixtools/default.nix

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

pkgs/ovni/default.nix

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

pkgs/tampi/default.nix

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

pkgs/vivado/default.nix

@@ -0,0 +1,55 @@
+# 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