From 5d861077b43d60fc2d0e2db8f47d90c01f03a2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Mon, 6 Oct 2025 16:42:40 +0200 Subject: [PATCH] Add meta to intel 2023 --- flake.nix | 4 +++- overlay.nix | 4 +++- pkgs/amd-uprof/driver.nix | 2 ++ pkgs/intel-oneapi/2023.nix | 19 +++++++++++++++++++ pkgs/lmbench/default.nix | 2 +- pkgs/paraver/default.nix | 3 ++- pkgs/paraver/kernel.nix | 10 ++++++++++ 7 files changed, 40 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index f3597270..39849c50 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,9 @@ in # propagate nixpkgs lib, so we can do bscpkgs.lib lib = nixpkgs.lib // { - bsc.maintainers = import ./pkgs/maintainers.nix; + maintainers = nixpkgs.lib.maintainers // { + bsc = import ./pkgs/maintainers.nix; + }; }; }; } diff --git a/overlay.nix b/overlay.nix index 961be83d..601b8c65 100644 --- a/overlay.nix +++ b/overlay.nix @@ -123,7 +123,9 @@ let in bscPkgs // { lib = prev.lib // { - bsc.maintainers = import ./pkgs/maintainers.nix; + maintainers = prev.lib.maintainers // { + bsc = import ./pkgs/maintainers.nix; + }; }; # Prevent accidental usage of bsc attribute diff --git a/pkgs/amd-uprof/driver.nix b/pkgs/amd-uprof/driver.nix index e69ef2c7..6ff87db9 100644 --- a/pkgs/amd-uprof/driver.nix +++ b/pkgs/amd-uprof/driver.nix @@ -29,5 +29,7 @@ in stdenv.mkDerivation { description = "AMD Power Profiler Driver"; homepage = "https://www.amd.com/es/developer/uprof.html"; platforms = lib.platforms.linux; + license = lib.licenses.unfree; + maintainers = with lib.maintainers.bsc; [ rarias ]; }; } diff --git a/pkgs/intel-oneapi/2023.nix b/pkgs/intel-oneapi/2023.nix index 2193e0d2..539ddcd0 100644 --- a/pkgs/intel-oneapi/2023.nix +++ b/pkgs/intel-oneapi/2023.nix @@ -26,6 +26,13 @@ let + meta = { + description = "Intel oneapi hpckit package component"; + homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers.bsc; [ abonerib ]; + }; + gcc = gcc13; v = { @@ -87,6 +94,8 @@ let dpkg -x $src $out done ''; + + inherit meta; }; joinDebs = name: names: @@ -145,6 +154,8 @@ let sed -i "s:I_MPI_SUBSTITUTE_INSTALLDIR:$out:g" "$i" done ''; + + inherit meta; }; intel-tbb = stdenv.mkDerivation rec { @@ -183,6 +194,8 @@ let rsync -a lib/intel64/gcc4.8/ $out/lib/ popd ''; + + inherit meta; }; intel-compiler-shared = stdenv.mkDerivation rec { @@ -240,6 +253,8 @@ let popd popd ''; + + inherit meta; }; @@ -305,6 +320,8 @@ let ln -s $out/lib $out/lib_lin popd ''; + + inherit meta; }; intel-compiler = stdenv.mkDerivation rec { @@ -392,6 +409,8 @@ let rsync -a documentation/en/man/common/ $out/share/man/ popd ''; + + inherit meta; }; wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }: diff --git a/pkgs/lmbench/default.nix b/pkgs/lmbench/default.nix index 55d19106..4e887b04 100644 --- a/pkgs/lmbench/default.nix +++ b/pkgs/lmbench/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "lmbench"; homepage = "https://github.com/intel/lmbench"; - maintainers = with lib.bsc.maintainers; [ rarias ]; + maintainers = with lib.maintainers.bsc; [ rarias ]; platforms = lib.platforms.all; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/paraver/default.nix b/pkgs/paraver/default.nix index 0145a498..92f2a73f 100644 --- a/pkgs/paraver/default.nix +++ b/pkgs/paraver/default.nix @@ -91,7 +91,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "https://github.com/bsc-performance-tools/wxparaver"; + homepage = "https://tools.bsc.es/paraver"; + downloadPage = "https://github.com/bsc-performance-tools/wxparaver"; description = "Performance analyzer based on event traces"; longDescription = '' Trace-based visualization and analysis tool designed to study quantitative diff --git a/pkgs/paraver/kernel.nix b/pkgs/paraver/kernel.nix index 588aa3d8..d8f577fd 100644 --- a/pkgs/paraver/kernel.nix +++ b/pkgs/paraver/kernel.nix @@ -1,5 +1,6 @@ { stdenv +, lib , fetchFromGitHub , autoreconfHook , boost @@ -57,4 +58,13 @@ stdenv.mkDerivation rec { xml2 zlib ]; + + meta = { + homepage = "https://tools.bsc.es/paraver"; + downloadPage = "https://github.com/bsc-performance-tools/paraver-kernel"; + description = "Kernel library used by wxparaver"; + maintainers = with lib.maintainers.bsc; [ rarias ]; + platforms = lib.platforms.linux; + license = lib.licenses.lgpl21Plus; + }; }