From bc30692f438721ac09d35f40a57d7cb91deed04c Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Mon, 10 Jun 2024 13:46:46 +0200
Subject: [PATCH] all: move scorep and friends to opt

---
 packages/cubelib/default.nix | 7 +++++--
 packages/cubew/default.nix   | 5 ++++-
 shared/userenv.nix           | 8 ++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/cubelib/default.nix b/packages/cubelib/default.nix
index aee6d7a..d1cb692 100644
--- a/packages/cubelib/default.nix
+++ b/packages/cubelib/default.nix
@@ -3,16 +3,19 @@
 , zlib
 , which
 , pkg-config
+, lib
 , ...
 }:
 
+with lib;
+
 stdenv.mkDerivation rec {
   name = "cubelib";
   version = "4.8.2";
 
   src = fetchzip {
-    url = "https://perftools.pages.jsc.fz-juelich.de/cicd/${name}/tags/${name}-${version}/${name}-${version}.tar.gz";
-    hash = "sha256-Ky6p6jAdHABQJs64VuIBDBWcujEBDVlyVTa8pZyQ2rM=";
+    url = "https://apps.fz-juelich.de/scalasca/releases/cube/${versions.majorMinor version}/dist/cubelib-${version}.tar.gz";
+    hash = "sha256-cf8SiurOSu+9xnmc3/6fJqziLFfgxfdNq1tMusN5ug4=";
   };
 
   nativeBuildInputs = [
diff --git a/packages/cubew/default.nix b/packages/cubew/default.nix
index 53d2705..180e300 100644
--- a/packages/cubew/default.nix
+++ b/packages/cubew/default.nix
@@ -3,15 +3,18 @@
 , zlib
 , which
 , pkg-config
+, lib
 , ...
 }:
 
+with lib;
+
 stdenv.mkDerivation rec {
   name = "cubew";
   version = "4.8.2";
 
   src = fetchzip {
-    url = "https://perftools.pages.jsc.fz-juelich.de/cicd/${name}/tags/${name}-${version}/${name}-${version}.tar.gz";
+    url = "https://apps.fz-juelich.de/scalasca/releases/cube/${versions.majorMinor version}/dist/cubew-${version}.tar.gz";
     hash = "sha256-Ky6p6jAdHABQJs64VuIBDBWcujEBDVlyVTa8pZyQ2rM=";
   };
 
diff --git a/shared/userenv.nix b/shared/userenv.nix
index d0bf789..2bc0eb1 100644
--- a/shared/userenv.nix
+++ b/shared/userenv.nix
@@ -50,8 +50,7 @@ let
       wget
       libz
 
-      scorep
-      scalasca
+      # tau
     ];
 
     ignoreCollisions = false;
@@ -80,4 +79,9 @@ in
     target = "profiles/per-group/cluster";
     source = userenv;
   };
+
+  systemd.tmpfiles.rules = [
+    ''L+ /opt/scalasca - - - - ${pkgs.scalasca}''
+    ''L+ /opt/scorep   - - - - ${pkgs.scorep}  ''
+  ];
 }