Fix renamed option for watchdog time

The option `systemd.watchdog.runtimeTime' defined in `/nix/store/m7h6slsq394m872xnhxsxqrkhndz1lqs-source/m/common/base/watchdog.nix' has been renamed to `systemd.settings.Manager.RuntimeWatchdogSec'.
'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'
2025-11-27 13:24:49 +01:00 · 2025-11-26 18:54:58 +01:00 · 2025-11-26 18:53:54 +01:00 · 2025-11-26 18:50:30 +01:00 · 2025-11-26 18:47:57 +01:00 · 2025-11-26 18:37:58 +01:00
8 changed files with 17 additions and 13 deletions
--- a/flake.lock
+++ b/flake.lock
@ -2,16 +2,16 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1752436162,
-        "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
+        "lastModified": 1764020296,
+        "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
+        "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
--- 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, ... }:
--- 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;
 }
--- 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 = ''
--- 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;
--- 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;
--- 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 = [
--- 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;
Author	SHA1	Message	Date
Aleix Boné	0bd4c83330	Fix renamed option for watchdog time The option `systemd.watchdog.runtimeTime' defined in `/nix/store/m7h6slsq394m872xnhxsxqrkhndz1lqs-source/m/common/base/watchdog.nix' has been renamed to `systemd.settings.Manager.RuntimeWatchdogSec'.	2025-11-27 13:24:49 +01:00
Aleix Boné	97cbf5e30e	'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'	2025-11-26 18:54:58 +01:00
Aleix Boné	14ac26e2c8	cudaPackages.cuda_cudart has a single output now See: https://github.com/NixOS/nixpkgs/pull/437723	2025-11-26 18:53:54 +01:00
Aleix Boné	bc74b7d42b	Set pyproject=true in buildPythonApplication Fixes: ``` To build with setuptools as before, set `pyproject = true` and `build-system = [ setuptools ] ```	2025-11-26 18:50:30 +01:00
Aleix Boné	547d4f9315	llvmPackages_latest.tools.bintools* -> llvmPackages_latest.bintools*	2025-11-26 18:47:57 +01:00
Aleix Boné	3f46d04b20	Upgrade nixpkgs to nixos 25.11	2025-11-26 18:37:58 +01:00