Merge master into staging-next

Author: nixpkgs-ci[bot]

nixos/modules/config/xdg/portals/wlr.nix

@@ -47,7 +47,7 @@ in
             exec_before = "disable_notifications.sh";
             exec_after = "enable_notifications.sh";
             chooser_type = "simple";
-            chooser_cmd = "''${pkgs.slurp}/bin/slurp -f %o -or";
+            chooser_cmd = "''${pkgs.slurp}/bin/slurp -f 'Monitor: %o' -or";
           };
         }
       '';

nixos/modules/services/misc/ollama.nix

@@ -103,6 +103,7 @@ in
             false
             "rocm"
             "cuda"
+            "vulkan"
           ]
         );
         default = null;
@@ -119,6 +120,7 @@ in
             - may require overriding gpu type with `services.ollama.rocmOverrideGfx`
               if rocm doesn't detect your AMD gpu
           - `"cuda"`: supported by most modern NVIDIA GPUs
+          - `"vulkan"`: supported by most modern GPUs on Linux
         '';
       };
       rocmOverrideGfx = lib.mkOption {

nixos/tests/all-tests.nix

@@ -1145,6 +1145,7 @@ in
   ollama = runTest ./ollama.nix;
   ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix;
   ollama-rocm = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-rocm.nix;
+  ollama-vulkan = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-vulkan.nix;
   ombi = runTest ./ombi.nix;
   omnom = runTest ./omnom;
   oncall = runTest ./web-apps/oncall.nix;

nixos/tests/ollama-vulkan.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+{
+  name = "ollama-vulkan";
+  meta.maintainers = with lib.maintainers; [ abysssol ];
+
+  nodes.vulkan =
+    { ... }:
+    {
+      services.ollama.enable = true;
+      services.ollama.acceleration = "vulkan";
+    };
+
+  testScript = ''
+    vulkan.wait_for_unit("multi-user.target")
+    vulkan.wait_for_open_port(11434)
+  '';
+}

nixos/tests/prometheus/pushgateway.nix

@@ -56,6 +56,9 @@
       + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-pushgateway.version}\"'"
     )
 
+    client.systemctl("start network-online.target")
+    client.wait_for_unit("network-online.target")
+
     # Add a metric and check in Prometheus
     client.wait_until_succeeds(
       "echo 'some_metric 3.14' | curl --data-binary @- http://pushgateway:9091/metrics/job/some_job"

pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix

@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-803feSIFyuBTyGGDH4zZ4hRGXRNN+J2y1p0C9I9qMro=";
+    hash = "sha256-7BHkRM9HcD5VDMCcAh2GFvGz+OSb7l/Ki3+V3v/RYSo=";
   };
 
   nativeBuildInputs = [

pkgs/applications/emulators/libretro/cores/ppsspp.nix

@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-11-08";
+  version = "0-unstable-2025-11-19";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "5646e471699de213b0fd30eecc50628322b0a8e2";
-    hash = "sha256-TZqqABGy2smTsIScDKb4hMAyghyN8jW6RMba1o6/nNU=";
+    rev = "c1581e6c3873331b93868bccd2f53f34a2316f89";
+    hash = "sha256-9w2CtCQIaCBf2hwbQaMWjin0HT7ioc7vwBVMqbLJhqw=";
     fetchSubmodules = true;
   };
 

pkgs/applications/video/mpv/scripts/thumbnail.nix

@@ -32,6 +32,6 @@ buildLua rec {
     changelog = "https://github.com/marzzzello/mpv_thumbnail_script/releases/tag/${version}";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ thegu5 ];
   };
 }

pkgs/by-name/bo/bookup/package.nix

@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  meson,
+  ninja,
+  pkg-config,
+  gettext,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  libadwaita,
+  gtksourceview5,
+  webkitgtk_6_0,
+  discount,
+  sqlite,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bookup";
+  version = "1.1.5";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "ilhooq";
+    repo = "bookup";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-s2j9AQMDJaKtYyXtHDscujPv2KIvO0pnX/OnXma93Ro=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext # msgfmt
+    wrapGAppsHook4
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    libadwaita
+    gtksourceview5
+    webkitgtk_6_0
+    discount
+    sqlite
+  ];
+
+  meta = {
+    description = "Markdown note-taking application for Gnome";
+    homepage = "https://gitlab.gnome.org/ilhooq/bookup";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ zendo ];
+    mainProgram = "bookup";
+  };
+})

pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch

@@ -0,0 +1,13 @@
+diff --git a/src/lib_ccx/hardsubx.c b/src/lib_ccx/hardsubx.c
+index 20b4388..fa6b5fa 100644
+--- a/src/lib_ccx/hardsubx.c
++++ b/src/lib_ccx/hardsubx.c
+@@ -125,7 +125,7 @@ int hardsubx_process_data(struct lib_hardsubx_ctx *ctx, struct lib_ccx_ctx *ctx_
+ 	if (ctx->frame)
+ 		av_frame_free(&ctx->frame);
+ 	if (ctx->rgb_frame)
+ 		av_frame_free(&ctx->rgb_frame);
+-	avcodec_close(ctx->codec_ctx);
++	avcodec_free_context(&ctx->codec_ctx);
+ 	avformat_close_input(&ctx->format_ctx);
+ }