From f614149edf654c11f0ce03d0cf7ff01a532c2fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Nov 2025 18:37:38 +0100 Subject: [PATCH 01/15] Upgrade nixpkgs to 25.11 Reviewed-by: Rodrigo Arias Mallo --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 72c9c8e0..921a94e1 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1752436162, - "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 8025158f..c9315dab 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; }; outputs = { self, nixpkgs, ... }: -- 2.51.2 From 8677adba27af0ae39ad217289b3b13714688379e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Nov 2025 18:47:52 +0100 Subject: [PATCH 02/15] Fix renamed llvm bintools Moved from llvmPackages_latest.tools.bintools to llvmPackages_latest.bintools Reviewed-by: Rodrigo Arias Mallo --- pkgs/llvm-ompss2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/llvm-ompss2/default.nix b/pkgs/llvm-ompss2/default.nix index 1b53de3d..9a812693 100644 --- a/pkgs/llvm-ompss2/default.nix +++ b/pkgs/llvm-ompss2/default.nix @@ -27,10 +27,10 @@ let # We need to replace the lld linker from bintools with our linker just built, # otherwise we run into incompatibility issues when mixing compiler and linker # versions. - bintools-unwrapped = llvmPackages_latest.tools.bintools-unwrapped.override { + bintools-unwrapped = llvmPackages_latest.bintools-unwrapped.override { lld = clangOmpss2Unwrapped; }; - bintools = llvmPackages_latest.tools.bintools.override { + bintools = llvmPackages_latest.bintools.override { bintools = bintools-unwrapped; }; targetConfig = stdenv.targetPlatform.config; -- 2.51.2 From fe8586e7809910d78bef399bd658bf3a791638f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Nov 2025 18:49:19 +0100 Subject: [PATCH 03/15] Set pyproject=true in buildPythonApplication The buildPythonPackage and buildPythonApplication functions now require an explicit format attribute. Previously the default format used setuptools and called setup.py from the source tree, which is deprecated. The modern alternative is to configure pyproject = true with build-system = [ setuptools ]. Reviewed-by: Rodrigo Arias Mallo --- pkgs/meteocat-exporter/default.nix | 4 +++- pkgs/upc-qaire-exporter/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/meteocat-exporter/default.nix b/pkgs/meteocat-exporter/default.nix index 5bc4f096..470d658b 100644 --- a/pkgs/meteocat-exporter/default.nix +++ b/pkgs/meteocat-exporter/default.nix @@ -1,9 +1,11 @@ { python3Packages, lib }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "meteocat-exporter"; version = "1.0"; + pyproject = true; + src = ./.; doCheck = false; diff --git a/pkgs/upc-qaire-exporter/default.nix b/pkgs/upc-qaire-exporter/default.nix index b5c14cb2..ea3dc89b 100644 --- a/pkgs/upc-qaire-exporter/default.nix +++ b/pkgs/upc-qaire-exporter/default.nix @@ -1,9 +1,11 @@ { python3Packages, lib }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "upc-qaire-exporter"; version = "1.0"; + pyproject = true; + src = ./.; doCheck = false; -- 2.51.2 From 3f1f5ae8f2cfed5d7f6efb33c71df12277df4f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Nov 2025 18:53:54 +0100 Subject: [PATCH 04/15] Fix changed cudaPackages.cuda_cudart output See: https://github.com/NixOS/nixpkgs/pull/437723 Reviewed-by: Rodrigo Arias Mallo --- pkgs/cudainfo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/cudainfo/default.nix b/pkgs/cudainfo/default.nix index 9dddf35c..1f6165a1 100644 --- a/pkgs/cudainfo/default.nix +++ b/pkgs/cudainfo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = ./.; buildInputs = [ cudatoolkit # Required for nvcc - cudaPackages.cuda_cudart.static # Required for -lcudart_static + (lib.getOutput "static" cudaPackages.cuda_cudart) # Required for -lcudart_static autoAddDriverRunpath ]; installPhase = '' -- 2.51.2 From 6cbe33bd80e56743aab0adf38bd0ac19e7d16711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 26 Nov 2025 18:54:57 +0100 Subject: [PATCH 05/15] Replace wrapGAppsHook with wrapGAppsHook3 Reviewed-by: Rodrigo Arias Mallo --- pkgs/paraver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/paraver/default.nix b/pkgs/paraver/default.nix index 92f2a73f..56d93b4d 100644 --- a/pkgs/paraver/default.nix +++ b/pkgs/paraver/default.nix @@ -12,7 +12,7 @@ , paraverKernel , openssl , glibcLocales -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { autoconf automake autoreconfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ -- 2.51.2 From 779449f1db5e903e4e9b9043a37d91ab5405273f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Thu, 27 Nov 2025 13:23:19 +0100 Subject: [PATCH 06/15] Fix renamed option watchdog.runtimeTime The option 'systemd.watchdog.runtimeTime' has been renamed to 'systemd.settings.Manager.RuntimeWatchdogSec'. Reviewed-by: Rodrigo Arias Mallo --- m/common/base/watchdog.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m/common/base/watchdog.nix b/m/common/base/watchdog.nix index d4d297d0..563c0199 100644 --- a/m/common/base/watchdog.nix +++ b/m/common/base/watchdog.nix @@ -5,5 +5,5 @@ boot.kernelModules = [ "ipmi_watchdog" ]; # Enable systemd watchdog with 30 s interval - systemd.watchdog.runtimeTime = "30s"; + systemd.settings.Manager.RuntimeWatchdogSec = 30; } -- 2.51.2 From 909772975903422b545ea3cb2e71c158a7b2b145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Mon, 13 Oct 2025 13:01:50 +0200 Subject: [PATCH 07/15] Use standard gcc for intel packages This reverts 26f52aa27d53ef893104c5757cf23a3747b5f635 Reviewed-by: Rodrigo Arias Mallo --- pkgs/intel-oneapi/2023.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/intel-oneapi/2023.nix b/pkgs/intel-oneapi/2023.nix index 539ddcd0..4824c10e 100644 --- a/pkgs/intel-oneapi/2023.nix +++ b/pkgs/intel-oneapi/2023.nix @@ -10,7 +10,7 @@ , zlib , autoPatchelfHook , libfabric -, gcc13 +, gcc , wrapCCWith }: @@ -33,8 +33,6 @@ let maintainers = with lib.maintainers.bsc; [ abonerib ]; }; - gcc = gcc13; - v = { hpckit = "2023.1.0"; compiler = "2023.1.0"; -- 2.51.2 From 150969be9b54584e05ea1f68f45a0129513285e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Mon, 27 Oct 2025 11:47:32 +0100 Subject: [PATCH 08/15] Fix replaced nixseparatedebuginfod nixseparatedebuginfod has been replaced by nixseparatedebuginfod2 Reviewed-by: Rodrigo Arias Mallo --- m/module/debuginfod.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/m/module/debuginfod.nix b/m/module/debuginfod.nix index a7dc05d7..8f093e1c 100644 --- a/m/module/debuginfod.nix +++ b/m/module/debuginfod.nix @@ -1,3 +1,10 @@ { - services.nixseparatedebuginfod.enable = true; + services.nixseparatedebuginfod2 = { + enable = true; + substituters = [ + "local:" + "https://cache.nixos.org" + "http://hut/cache" + ]; + }; } -- 2.51.2 From 933c78a80bb4c55a263536f9236a3f8e494a5fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Tue, 2 Dec 2025 14:39:43 +0100 Subject: [PATCH 09/15] Fix moved package linuxPackages.perf is now perf Reviewed-by: Rodrigo Arias Mallo --- m/common/base/env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m/common/base/env.nix b/m/common/base/env.nix index d23dc73c..8d5aef0b 100644 --- a/m/common/base/env.nix +++ b/m/common/base/env.nix @@ -1,10 +1,10 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ vim wget git htop tmux pciutils tcpdump ripgrep nix-index nixos-option nix-diff ipmitool freeipmi ethtool lm_sensors cmake gnumake file tree - ncdu config.boot.kernelPackages.perf ldns pv + ncdu perf ldns pv # From jungle overlay osumb nixgen ]; -- 2.51.2 From a491546ffb0a60f8120fda5f76e4527129ac54fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Tue, 2 Dec 2025 16:21:43 +0100 Subject: [PATCH 10/15] Mark mcxx as broken and remove from package list Reviewed-by: Rodrigo Arias Mallo --- overlay.nix | 3 ++- pkgs/mcxx/default.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/overlay.nix b/overlay.nix index 8ffb4bcd..0683b8b8 100644 --- a/overlay.nix +++ b/overlay.nix @@ -30,7 +30,8 @@ let amd-uprof-driver = _prev.callPackage ./pkgs/amd-uprof/driver.nix { }; }); lmbench = callPackage ./pkgs/lmbench/default.nix { }; - mcxx = callPackage ./pkgs/mcxx/default.nix { }; + # Broken and unmantained + # mcxx = callPackage ./pkgs/mcxx/default.nix { }; meteocat-exporter = prev.callPackage ./pkgs/meteocat-exporter/default.nix { }; mpi = final.mpich; # Set MPICH as default mpich = callPackage ./pkgs/mpich/default.nix { mpich = prev.mpich; }; diff --git a/pkgs/mcxx/default.nix b/pkgs/mcxx/default.nix index 055bfd36..41fe2f5b 100644 --- a/pkgs/mcxx/default.nix +++ b/pkgs/mcxx/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { ]; meta = { + broken = true; homepage = "https://github.com/bsc-pm/mcxx"; description = "C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping"; maintainers = with lib.maintainers.bsc; [ rpenacob ]; -- 2.51.2 From d3e43eb6513f707e0acdc3e4d81037bf0960f035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Wed, 10 Dec 2025 14:28:20 +0100 Subject: [PATCH 11/15] Remove conflicting definitions in amd-uprof-driver See: https://lkml.org/lkml/2025/4/9/1709 Reviewed-by: Rodrigo Arias Mallo --- pkgs/amd-uprof/driver.nix | 2 +- pkgs/amd-uprof/remove-wr-rdmsrq.patch | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 pkgs/amd-uprof/remove-wr-rdmsrq.patch diff --git a/pkgs/amd-uprof/driver.nix b/pkgs/amd-uprof/driver.nix index 716e0d4e..dc0d86df 100644 --- a/pkgs/amd-uprof/driver.nix +++ b/pkgs/amd-uprof/driver.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ''; hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - patches = [ ./makefile.patch ./hrtimer.patch ]; + patches = [ ./makefile.patch ./hrtimer.patch ./remove-wr-rdmsrq.patch ]; makeFlags = [ "KERNEL_VERSION=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/amd-uprof/remove-wr-rdmsrq.patch b/pkgs/amd-uprof/remove-wr-rdmsrq.patch new file mode 100644 index 00000000..54d48e6a --- /dev/null +++ b/pkgs/amd-uprof/remove-wr-rdmsrq.patch @@ -0,0 +1,20 @@ +diff --git a/inc/PwrProfAsm.h b/inc/PwrProfAsm.h +index d77770a..c93a0e9 100644 +--- a/inc/PwrProfAsm.h ++++ b/inc/PwrProfAsm.h +@@ -347,6 +347,7 @@ + + #endif + ++/* + #define rdmsrq(msr,val1,val2,val3,val4) ({ \ + __asm__ __volatile__( \ + "rdmsr\n" \ +@@ -362,6 +363,7 @@ + :"c"(msr), "a"(val1), "d"(val2), "S"(val3), "D"(val4) \ + ); \ + }) ++*/ + + #define rdmsrpw(msr,val1,val2,val3,val4) ({ \ + __asm__ __volatile__( \ -- 2.51.2 From e84a2cadbbf0dda934fd1461522207ff674a7d80 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Wed, 7 Jan 2026 13:41:40 +0100 Subject: [PATCH 12/15] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f?narHash=sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD%2B/cTUzzgVFoaHrkqY%3D' (2025-11-30) → 'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05) Reviewed-by: Aleix Boné --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 921a94e1..f5c3dc2d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1767634882, + "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", "type": "github" }, "original": { -- 2.51.2 From a71cd78b4cd4bd39cde670d4877107182b68c7c9 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Wed, 7 Jan 2026 17:17:21 +0100 Subject: [PATCH 13/15] Fix infiniband interface names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Aleix Boné --- m/bay/configuration.nix | 2 +- m/hut/configuration.nix | 2 +- m/lake2/configuration.nix | 2 +- m/owl1/configuration.nix | 2 +- m/owl2/configuration.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/m/bay/configuration.nix b/m/bay/configuration.nix index 47e82644..7bdfe740 100644 --- a/m/bay/configuration.nix +++ b/m/bay/configuration.nix @@ -24,7 +24,7 @@ address = "10.0.40.40"; prefixLength = 24; } ]; - interfaces.ibp5s0.ipv4.addresses = [ { + interfaces.ibs785.ipv4.addresses = [ { address = "10.0.42.40"; prefixLength = 24; } ]; diff --git a/m/hut/configuration.nix b/m/hut/configuration.nix index 7fabe4fb..5b32bcee 100644 --- a/m/hut/configuration.nix +++ b/m/hut/configuration.nix @@ -45,7 +45,7 @@ address = "10.0.40.7"; prefixLength = 24; } ]; - interfaces.ibp5s0.ipv4.addresses = [ { + interfaces.ibs785.ipv4.addresses = [ { address = "10.0.42.7"; prefixLength = 24; } ]; diff --git a/m/lake2/configuration.nix b/m/lake2/configuration.nix index a67e5aea..477cf59c 100644 --- a/m/lake2/configuration.nix +++ b/m/lake2/configuration.nix @@ -46,7 +46,7 @@ address = "10.0.40.42"; prefixLength = 24; } ]; - interfaces.ibp5s0.ipv4.addresses = [ { + interfaces.ibs785.ipv4.addresses = [ { address = "10.0.42.42"; prefixLength = 24; } ]; diff --git a/m/owl1/configuration.nix b/m/owl1/configuration.nix index e471969d..99f88a0d 100644 --- a/m/owl1/configuration.nix +++ b/m/owl1/configuration.nix @@ -20,7 +20,7 @@ address = "10.0.40.1"; prefixLength = 24; } ]; - interfaces.ibp5s0.ipv4.addresses = [ { + interfaces.ibs785.ipv4.addresses = [ { address = "10.0.42.1"; prefixLength = 24; } ]; diff --git a/m/owl2/configuration.nix b/m/owl2/configuration.nix index e28c5e52..d771c260 100644 --- a/m/owl2/configuration.nix +++ b/m/owl2/configuration.nix @@ -21,7 +21,7 @@ prefixLength = 24; } ]; # Watch out! The OmniPath device is not in the same place here: - interfaces.ibp129s0.ipv4.addresses = [ { + interfaces.ibs801.ipv4.addresses = [ { address = "10.0.42.2"; prefixLength = 24; } ]; -- 2.51.2 From 22420e6ac897e41d29deb425de1c9a6925507949 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Thu, 8 Jan 2026 15:56:56 +0100 Subject: [PATCH 14/15] Remove unneeded perf package from eudy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is already included in the base list of packages, which is now only "perf" and doesn't depend on the kernel version. Reviewed-by: Aleix Boné --- m/eudy/kernel/perf.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/m/eudy/kernel/perf.nix b/m/eudy/kernel/perf.nix index 51340dfc..304a59f2 100644 --- a/m/eudy/kernel/perf.nix +++ b/m/eudy/kernel/perf.nix @@ -1,11 +1,6 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { - # add the perf tool - environment.systemPackages = with pkgs; [ - config.boot.kernelPackages.perf - ]; - # allow non-root users to read tracing data from the kernel boot.kernel.sysctl."kernel.perf_event_paranoid" = -2; boot.kernel.sysctl."kernel.kptr_restrict" = 0; -- 2.51.2 From dda6a667826a349d5c1e496bd731c856c2b93e9a Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Fri, 9 Jan 2026 17:59:44 +0100 Subject: [PATCH 15/15] Fix gitea user to allow sending email MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to send email, the gitea user needs to be in the mail-robot group. Fixes: https://jungle.bsc.es/git/rarias/jungle/issues/220 Reviewed-by: Aleix Boné --- m/tent/gitea.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m/tent/gitea.nix b/m/tent/gitea.nix index 546ac5f3..5c458306 100644 --- a/m/tent/gitea.nix +++ b/m/tent/gitea.nix @@ -27,4 +27,7 @@ }; }; }; + + # Allow gitea user to send mail + users.users.gitea.extraGroups = [ "mail-robot" ]; } -- 2.51.2