diff --git a/flake.lock b/flake.lock index 72c9c8e0..f5c3dc2d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1752436162, - "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", + "lastModified": 1767634882, + "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", + "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", "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, ... }: 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/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 ]; 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; } 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; 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/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" + ]; + }; } 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; } ]; 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" ]; } 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/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__( \ 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 = '' 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"; 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; 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 ]; 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/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 = [ 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;