From 32a9769c2ddacf9441ee725ba5df095f5289979b Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Sun, 26 May 2024 13:38:43 +0200 Subject: [PATCH] all: simplify perf packages install --- packages/cubelib/result | 1 - packages/cubew/result | 1 - packages/opari2/default.nix | 21 --------------------- packages/opari2/result | 1 - packages/otf2/default.nix | 15 --------------- packages/otf2/result | 1 - packages/scalasca/result | 1 - packages/scorep/default.nix | 8 -------- packages/scorep/result | 1 - shared/packages.nix | 4 ---- 10 files changed, 54 deletions(-) delete mode 120000 packages/cubelib/result delete mode 120000 packages/cubew/result delete mode 100644 packages/opari2/default.nix delete mode 120000 packages/opari2/result delete mode 100644 packages/otf2/default.nix delete mode 120000 packages/otf2/result delete mode 120000 packages/scalasca/result delete mode 120000 packages/scorep/result diff --git a/packages/cubelib/result b/packages/cubelib/result deleted file mode 120000 index 12cfae0..0000000 --- a/packages/cubelib/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/zaxgv6nc3mia1lgwwkfazmqazdh299hf-cubelib \ No newline at end of file diff --git a/packages/cubew/result b/packages/cubew/result deleted file mode 120000 index c39e0dd..0000000 --- a/packages/cubew/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/lzdccb2yrwnsif0rvb8rcnraw4yvb3fp-cubew \ No newline at end of file diff --git a/packages/opari2/default.nix b/packages/opari2/default.nix deleted file mode 100644 index 34ffc3c..0000000 --- a/packages/opari2/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv -, fetchzip -, ... -}: - -stdenv.mkDerivation rec { - name = "opari2"; - version = "2.0.8"; - - src = fetchzip { - url = "https://perftools.pages.jsc.fz-juelich.de/cicd/${name}/tags/${name}-${version}/${name}-${version}.tar.gz"; - hash = "sha256-vrgoUIV+dyVvYJigdu3XXVDzDQrZZo2mHrmm2orVMXI="; - }; - - nativeBuildInputs = [ - ]; - - buildInputs = [ - ]; -} - diff --git a/packages/opari2/result b/packages/opari2/result deleted file mode 120000 index e7c96e4..0000000 --- a/packages/opari2/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/m9bi6nky6ldb7dim9l4dw1vhck06dfvd-opari2 \ No newline at end of file diff --git a/packages/otf2/default.nix b/packages/otf2/default.nix deleted file mode 100644 index b939a62..0000000 --- a/packages/otf2/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv -, fetchzip -, ... -}: - -stdenv.mkDerivation rec { - name = "otf2"; - version = "3.0.3"; - - src = fetchzip { - url = "https://perftools.pages.jsc.fz-juelich.de/cicd/${name}/tags/${name}-${version}/${name}-${version}.tar.gz"; - hash = "sha256-SELtnvnN6VNqJRZFU5SdOd19rAZHL8P9KZv8qu2uqu0="; - }; -} - diff --git a/packages/otf2/result b/packages/otf2/result deleted file mode 120000 index 8dd42f5..0000000 --- a/packages/otf2/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/ibpvvkjkqg79j8jnm7539yjy938jlf9a-otf2 \ No newline at end of file diff --git a/packages/scalasca/result b/packages/scalasca/result deleted file mode 120000 index 45438e0..0000000 --- a/packages/scalasca/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/fy2y6jh57ps5vlfi0h3ll2dz4qsfh2k0-scalasca-2.6.1 \ No newline at end of file diff --git a/packages/scorep/default.nix b/packages/scorep/default.nix index 98e0ec1..0690801 100644 --- a/packages/scorep/default.nix +++ b/packages/scorep/default.nix @@ -6,10 +6,6 @@ , which , pkg-config , callPackage -, cubew ? callPackage ../cubew { } -, cubelib ? callPackage ../cubelib { } -, otf2 ? callPackage ../otf2 { } -, opari2 ? callPackage ../opari2 { } , ... }: @@ -35,10 +31,6 @@ stdenv.mkDerivation rec { openmpi libbfd papi - cubew - cubelib - otf2 - opari2 ]; enableParallelBuilding = true; diff --git a/packages/scorep/result b/packages/scorep/result deleted file mode 120000 index 4c7b8c4..0000000 --- a/packages/scorep/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/6z986prqcs7l4jyhyf90q9nmpxh716ml-scorep-8.3 \ No newline at end of file diff --git a/shared/packages.nix b/shared/packages.nix index 843038a..8006731 100644 --- a/shared/packages.nix +++ b/shared/packages.nix @@ -5,10 +5,6 @@ with lib; { nixpkgs.overlays = [ (self: super: { - cubelib = self.callPackage ../packages/cubelib { }; - cubew = self.callPackage ../packages/cubew { }; - opari2 = self.callPackage ../packages/opari2 { }; - otf2 = self.callPackage ../packages/otf2 { }; scalasca = self.callPackage ../packages/scalasca { }; scorep = self.callPackage ../packages/scorep { };