Merge staging-next into staging

nixos/modules/services/continuous-integration/woodpecker/agents.nix

@@ -110,7 +110,10 @@ let
   };
 in
 {
-  meta.maintainers = with lib.maintainers; [ ambroisie ];
+  meta.maintainers = with lib.maintainers; [
+    ambroisie
+    marcusramberg
+  ];
 
   options = {
     services.woodpecker-agents = {

pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix

@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-10-06";
+  version = "0.0.27-unstable-2025-10-12";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "a7052aca0bdfb93e524f0536ac80e6c542962f47";
-    hash = "sha256-crtzBzRcpuqQdqymUJMAxky1Lfk+6YY0YifThHXz7Rw=";
+    rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940";
+    hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

pkgs/applications/office/tagainijisho/0000-fix-cmake-min.patch

@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a3816f7..81116dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,8 +19,8 @@ set(VERSION 1.2.2)
+ set(QTVERSION 5.12)
+ set(CMAKE_AUTOMOC ON)
+ 
+-cmake_minimum_required(VERSION 2.8.12)
+-cmake_policy(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.10)
++cmake_policy(VERSION 3.10)
+ 
+ find_package(Qt5 ${QTVERSION} REQUIRED COMPONENTS Core Widgets PrintSupport Network LinguistTools)
+ 

pkgs/applications/office/tagainijisho/default.nix

@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94=";
   };
 
+  patches = [
+    ### Fix cmake minimum version
+    ./0000-fix-cmake-min.patch
+  ];
+
   nativeBuildInputs = [
     qttools
     cmake

pkgs/by-name/ba/ballerburg/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchgit,
   cmake,
   SDL,
   makeDesktopItem,
@@ -10,20 +11,19 @@
 }:
 
 let
-
   icon = fetchurl {
     url = "https://baller.tuxfamily.org/king.png";
-    sha256 = "1xq2h87s648wjpjl72ds3xnnk2jp8ghbkhjzh2g4hpkq2zdz90hy";
+    hash = "sha256-HoL02xd4XkiegF/CueBDV4ppbR+6iUPllRwRow+CAvc=";
   };
-
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ballerburg";
-  version = "1.2.0";
+  version = "1.2.3";
 
-  src = fetchurl {
-    url = "https://download.tuxfamily.org/baller/ballerburg-${version}.tar.gz";
-    sha256 = "sha256-BiX0shPBGA8sshee8rxs41x+mdsrJzBqhpDDic6sYwA=";
+  src = fetchgit {
+    url = "https://framagit.org/baller/ballerburg.git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4rO7ixLE+EV6zd0EryHU6QZeVoa6N4fvxwoJWa0aO70=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       name = "Ballerburg";
       desktopName = "Ballerburg SDL";
       exec = "_NET_WM_ICON=ballerburg ballerburg";
-      comment = meta.description;
+      comment = finalAttrs.meta.description;
       icon = "ballerburg";
       categories = [ "Game" ];
     })
@@ -55,15 +55,15 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Classic cannon combat game";
     mainProgram = "ballerburg";
     longDescription = ''
       Two castles, separated by a mountain, try to defeat each other with their cannonballs,
       either by killing the opponent's king or by weakening the opponent enough so that the king capitulates.'';
     homepage = "https://baller.tuxfamily.org/";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.j0hax ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ j0hax ];
+    platforms = lib.platforms.all;
   };
-}
+})

pkgs/by-name/dr/dreamchess/0000-fix-cmake-min.patch

@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a007f60..a993999 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.10)
+ project(DreamChess VERSION 0.3.0)
+ 
+ set(DREAMCHESS_RELEASE TRUE)

pkgs/by-name/dr/dreamchess/package.nix

@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-qus/RjwdAl9SuDXfLVKTPImqrvPF3xSDVlbXYLM3JNE=";
   };
 
+  patches = [
+    ### Fix cmake minimum version
+    ./0000-fix-cmake-min.patch
+  ];
+
   buildInputs = [
     SDL2
     SDL2_image

pkgs/by-name/gi/git-statuses/package.nix

@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "git-statuses";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "bircni";
     repo = "git-statuses";
     tag = finalAttrs.version;
-    hash = "sha256-phGEp9wo46owe47H+XjfDD5OlcN8cGr1oaeYMpkWies=";
+    hash = "sha256-ZjlLpPFd+T3NIK2lrzaCfNI7308n3wOco+scGJhxFNI=";
   };
 
-  cargoHash = "sha256-yG5oSwnhoFVbwdTteRgW1ljVmTnxoh8l4gG/pGuRmic=";
+  cargoHash = "sha256-30WX9dCvrjvPUhn2oIn6unAWEkTB8U2mCEXmixYVIkk=";
 
   # Needed to get openssl-sys to use pkg-config.
   env.OPENSSL_NO_VENDOR = 1;

pkgs/by-name/ma/mapnik/package.nix

@@ -12,6 +12,7 @@
   gdal,
   harfbuzz,
   icu,
+  libavif,
   libjpeg,
   libpng,
   libtiff,
@@ -25,17 +26,18 @@
   libpq,
   protozero,
   sparsehash,
+  openssl,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapnik";
-  version = "4.1.1";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+PCN3bjLGqfK4MF6fWApnSua4Pn/mKo2m9CY8/c5xC4=";
+    hash = "sha256-jbtVJHTAeKGpb6PtcK9Tt4qA6dsECwLSQG9JGsHJjvY=";
     fetchSubmodules = true;
   };
 
@@ -73,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     gdal
     (harfbuzz.override { withIcu = true; })
     icu
+    libavif
     libjpeg
     libpng
     libtiff
@@ -85,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpq
     protozero
     sparsehash
+    openssl
   ];
 
   cmakeFlags = [

pkgs/by-name/mo/monero-cli/package.nix

@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "monero-cli";
-  version = "0.18.4.2";
+  version = "0.18.4.3";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    hash = "sha256-ibwcvEHlJkMjXoJQMPVrlir5irdclJsmV7aBB4/m190=";
+    hash = "sha256-tu8PHTiz3ScJ0uQh1ztkFmEthjb+BERtPMxCyQhuZPw=";
   };
 
   patches = [

pkgs/by-name/mo/monero-gui/package.nix

@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.18.4.2";
+  version = "0.18.4.3";
 
   src = fetchFromGitHub {
     owner = "monero-project";
     repo = "monero-gui";
     rev = "v${version}";
-    hash = "sha256-FKQrB47q791lDaomI5A10qw1oGh5zp9TFPpFoX2ZAmc=";
+    hash = "sha256-uByiwIyR1pVmIrmu0Jdwb7aZE07hop4bP+PuEvJaIrE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/op/opengothic/package.nix

@@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "-Werror" ""
   '';
 
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
+  ];
+
   postFixup = ''
     wrapProgram $out/bin/Gothic2Notr \
       --set LD_PRELOAD "${lib.getLib alsa-lib}/lib/libasound.so.2"

pkgs/by-name/pg/pgit/package.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  runCommand,
+  git, # for passthru tests
+  pgit, # for passthru tests
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "pgit";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "picosh";
+    repo = "pgit";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-81ZiaY973+mGnYbDX+6fhe9NTYjQhWsvdpW0v42pasw=";
+  };
+
+  vendorHash = "sha256-in8GVcOlGsvmcbegJmYwvE0AVJhVJ83x1v3ymV0uTpg=";
+
+  passthru.tests.smoke =
+    runCommand "pgit-smoke-test"
+      {
+        buildInputs = [ git ];
+      }
+      ''
+        ${lib.getExe git} init -b smoke
+        ${lib.getExe git} config --local user.name "Nick Spackages"
+        ${lib.getExe git} config --local user.email "nixbld@localhost"
+        echo "Read me please" > README
+        ${lib.getExe git} add README
+        ${lib.getExe git} commit -m "First commit"
+        ${lib.getExe pgit} -desc "The description" -revs smoke -repo . -out ./public
+        grep "The description" ./public/index.html
+        grep "First commit" ./public/logs/smoke/index.html
+        grep "Read me please" ./public/tree/smoke/item/README.html
+        touch $out
+      '';
+
+  meta = with lib; {
+    description = "static site generator for git";
+    homepage = "https://pgit.pico.sh/";
+    license = licenses.mit;
+    mainProgram = "pgit";
+    maintainers = with maintainers; [ jaculabilis ];
+  };
+})

pkgs/by-name/qu/quarkus/package.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quarkus-cli";
-  version = "3.28.2";
+  version = "3.28.3";
 
   src = fetchurl {
     url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-d5OrUShc8TKJAcFd0Y3Cu1nkuj+dJBOg5uCrEbssNyw=";
+    hash = "sha256-ulB6jy3J1vKe1rO17p8Vw0V8C/sDcXYcuu6b2e3L6Ps=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/ra/radarr/deps.json

@@ -98,13 +98,13 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Cryptography.Internal",
-    "version": "8.0.16",
-    "hash": "sha256-uw/5GAPpefPeMrfG69EBOVciSHxBKs0E8Txkf+rttzs="
+    "version": "8.0.17",
+    "hash": "sha256-CS/I8fajxwimZC2WNpN5ai/hEVU6Pk4El8hKNr/QgfU="
   },
   {
     "pname": "Microsoft.AspNetCore.Cryptography.KeyDerivation",
-    "version": "8.0.16",
-    "hash": "sha256-Zpt7vlY0xdrk/6XDRtXb0t9MK6SiPP6sr3fC6gQ1/YQ="
+    "version": "8.0.17",
+    "hash": "sha256-fXjTm7dua1WoGVSkGX6swTFvsNwdhAJvI3Y6onrR3p4="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
@@ -599,8 +599,8 @@
   },
   {
     "pname": "Polly",
-    "version": "8.5.2",
-    "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA="
+    "version": "8.6.0",
+    "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
   },
   {
     "pname": "Polly.Contrib.WaitAndRetry",
@@ -609,8 +609,8 @@
   },
   {
     "pname": "Polly.Core",
-    "version": "8.5.2",
-    "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk="
+    "version": "8.6.0",
+    "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
   },
   {
     "pname": "RestSharp",
@@ -970,8 +970,8 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.9",
-    "hash": "sha256-sB1wGc419iqT+Stm+RFMFhBy3LM0YnHhrgmhYiGlf4Q="
+    "version": "3.1.11",
+    "hash": "sha256-MlRF+3SGfahbsB1pZGKMOrsfUCx//hCo7ECrXr03DpA="
   },
   {
     "pname": "Swashbuckle.AspNetCore.Annotations",

pkgs/by-name/ra/radarr/package.nix

@@ -21,7 +21,7 @@
   applyPatches,
 }:
 let
-  version = "5.26.2.10099";
+  version = "5.28.0.10274";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -29,7 +29,7 @@ let
       owner = "Radarr";
       repo = "Radarr";
       tag = "v${version}";
-      hash = "sha256-7tU9oxE1F/dcR5bwb/qHyux3WA6lEwdozLloDgOMVbU=";
+      hash = "sha256-iETtSByI9VjZdVjFHdfDcfSHUGz5Es8K8/HiB99KUqc=";
     };
     postPatch = ''
       mv src/NuGet.config NuGet.Config
@@ -41,12 +41,12 @@ let
       # However, the patches cleanly apply to v5 as well.
       (fetchpatch {
         name = "dotnet8-compatibility";
-        url = "https://github.com/Radarr/Radarr/commit/490891c63de589604bdc3373cfc85068c3826648.patch";
-        hash = "sha256-SCP7MPUkEZLSrls8ouekSXpXdgAJTwNFPirHjaMkQ6s=";
+        url = "https://github.com/Radarr/Radarr/commit/2235823af313ea1f39fd1189b69a75fc5d380c41.patch";
+        hash = "sha256-3YgQV4xc2i5DNWp2KxVz6M5S8n//a/Js7pckGZ06fWc=";
       })
       (fetchpatch {
         name = "dotnet8-darwin-compatibility";
-        url = "https://github.com/Radarr/Radarr/commit/f38a129289c49a242d8901dc2f041f9dc8bfc303.patch";
+        url = "https://github.com/Radarr/Radarr/commit/2a886fb26a70b4d48a4ad08d7ee23e5e4d81f522.patch";
         hash = "sha256-SAMUHqlSj8FPq20wY8NWbRytVZXTPtMXMfM3CoM8kSA=";
       })
     ];

pkgs/by-name/sg/sgt-puzzles/package.nix

@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sgt-puzzles";
-  version = "20250926.e00cb46";
+  version = "20251011.d928126";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
-    hash = "sha256-CsMrhYpaTRMz364kt5b/bCY67PCoYwS50Fxw8mi2QCY=";
+    hash = "sha256-/Iazd5voyNRocz68qILv5NoytZehKFX40a2vr+7YKqE=";
   };
 
   sgt-puzzles-menu = fetchurl {

pkgs/by-name/tr/tremotesf/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tremotesf";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "equeim";
     repo = "tremotesf2";
     tag = finalAttrs.version;
-    hash = "sha256-o6GSuRKO2LNpaFUuSu6VUeZN/blfpsz/piE7RZ47YfI=";
+    hash = "sha256-0nqdCf0rRPEf8O5ZuC2uYLSJavXIDhhiB3sNMryP3Jg=";
     # We need this for src/libtremotesf
     fetchSubmodules = true;
   };

pkgs/by-name/we/werf/package.nix

@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.47.8";
+  version = "2.49.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1F/Gy5bKq+08aJaNM5XdI8/z2A6p+4UL+Rf/NXhtWlU=";
+    hash = "sha256-K999EgTbyQeLO1xm94WeOAQ5Ld3stOuAI4LGs4fSU5g=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-bmHnpADqmJXMJvPRv7WpnafgPg+ZlwfsvXKdAxW5Ovg=";
+  vendorHash = "sha256-Vjce/pmFRusBOJEQjgrlhS4LPlOy4nOWwCm7o5BB+OQ=";
 
   subPackages = [ "cmd/werf" ];
 

pkgs/by-name/wo/woodpecker-plugin-git/package.nix

@@ -38,6 +38,9 @@ buildGoModule rec {
     changelog = "https://github.com/woodpecker-ci/plugin-git/releases/tag/${version}";
     license = lib.licenses.asl20;
     mainProgram = "plugin-git";
-    maintainers = with lib.maintainers; [ ambroisie ];
+    maintainers = with lib.maintainers; [
+      ambroisie
+      marcusramberg
+    ];
   };
 }

pkgs/by-name/za/zapret/package.nix

@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "71.4";
+  version = "72";
 
   src = fetchFromGitHub {
     owner = "bol-van";
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     tag = "v${finalAttrs.version}";
-    hash = "sha256-n7UasKtoQ4zfy2ho2vOREb0RPrDnhjYYbXcXTjelDvg=";
+    hash = "sha256-u9vtxkFxh7JK6Zb/IuS4qldf8ysDYospqOEuPObGyps=";
   };
 
   buildInputs = [

pkgs/development/interpreters/ruby/default.nix

@@ -57,9 +57,13 @@ let
     }:
     let
       ver = version;
+      isCross = stdenv.buildPlatform != stdenv.hostPlatform;
       # https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21
       yjitSupported =
-        stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64);
+        !isCross
+        && (
+          stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64)
+        );
       rubyDrv = lib.makeOverridable (
         {
           stdenv,

pkgs/development/python-modules/google-cloud-audit-log/default.nix

@@ -4,21 +4,18 @@
   fetchPypi,
   googleapis-common-protos,
   protobuf,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-audit-log";
-  version = "0.3.2";
+  version = "0.3.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_audit_log";
     inherit version;
-    hash = "sha256-JZjxUzp9fN1se/RIwS5VGcHVMWLXh4ThC83R32d5G8M=";
+    hash = "sha256-zKeB4fG1SY3xgyoLaDqZ6GwAsxAVu77vMAI4H3qWpj8=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/iamdata/default.nix

@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510101";
+  version = "0.1.202510121";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-/w2DDDjrEGwskvtP0v3w+xKNDCoJpeVQpHS38jFnfE8=";
+    hash = "sha256-JmVT8miQXDV9QZCj3IhYNFY5Bdn8Du13vM6jtiENYO4=";
   };
 
   build-system = [ hatchling ];

pkgs/development/python-modules/pyoverkiz/default.nix

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyoverkiz";
-  version = "1.18.2";
+  version = "1.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "iMicknl";
     repo = "python-overkiz-api";
     tag = "v${version}";
-    hash = "sha256-kGcDZp1oLkjHy/+iAdnsAceSY+jX9+hw3mFxCaT18YA=";
+    hash = "sha256-Iur39lUkHBd0VaP5YB36o04D8aY371BeSZ07iN7A9Wk=";
   };
 
   build-system = [ hatchling ];

pkgs/development/python-modules/python-mapnik/default.nix

@@ -24,18 +24,19 @@
   sqlite,
   pytestCheckHook,
   sparsehash,
+  pybind11,
 }:
 
 buildPythonPackage rec {
   pname = "python-mapnik";
-  version = "3.0.16-unstable-2024-02-22";
+  version = "4.1.3.unstable-2025-09-25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "python-mapnik";
-    rev = "5ab32f0209909cc98c26e1d86ce0c8ef29a9bf3d";
-    hash = "sha256-OqijA1WcyBcyWO8gntqp+xNIaV1Jqa0n1eMDip2OCvY=";
+    rev = "4b51d57911dc6a1a9f35c62c681fbdeb56fc69d4";
+    hash = "sha256-oXxfLvmptW1v19vaUj11nGEcTHOrneBIea2+GB6uK48=";
     # Only needed for test data
     fetchSubmodules = true;
   };
@@ -46,9 +47,6 @@ buildPythonPackage rec {
     (replaceVars ./find-libmapnik.patch {
       libmapnik = "${mapnik}/lib";
     })
-    # Use `std::optional` rather than `boost::optional`
-    # https://github.com/mapnik/python-mapnik/commit/e9f88a95a03dc081826a69da67bbec3e4cccd5eb
-    ./python-mapnik_std_optional.patch
   ];
 
   stdenv = python.stdenv;
@@ -58,6 +56,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     mapnik # for mapnik_config
     pkg-config
+    pybind11
   ];
 
   dependencies = [
@@ -131,5 +130,6 @@ buildPythonPackage rec {
     homepage = "https://mapnik.org";
     license = lib.licenses.lgpl21Plus;
     teams = [ lib.teams.geospatial ];
+    broken = true;
   };
 }

pkgs/development/python-modules/python-mapnik/find-libmapnik.patch

@@ -1,11 +1,12 @@
-diff --git a/build.py b/build.py
-index 0f94826b6..3cceb4546 100644
---- a/build.py
-+++ b/build.py
-@@ -110,8 +110,8 @@ py_env.AppendUnique(LIBS='mapnik-wkt')
+diff --git i/build.py w/build.py
+index 0f94826b6..5e91793f2 100644
+--- i/build.py
++++ w/build.py
+@@ -109,9 +109,8 @@ py_env.AppendUnique(LIBS='mapnik-wkt')
+ 
  _mapnik = py_env.LoadableModule('mapnik/_mapnik', sources, LDMODULEPREFIX='', LDMODULESUFFIX='.so')
  
- Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
+-Depends(_mapnik, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
 -Depends(_mapnik, env.subst('../../src/json/libmapnik-json${LIBSUFFIX}'))
 -Depends(_mapnik, env.subst('../../src/wkt/libmapnik-wkt${LIBSUFFIX}'))
 +Depends(_mapnik, env.subst('@libmapnik@/libmapnikjson${LIBSUFFIX}'))
@@ -13,18 +14,18 @@ index 0f94826b6..3cceb4546 100644
  
  if 'uninstall' not in COMMAND_LINE_TARGETS:
      pymapniklib = env.Install(target_path,_mapnik)
-diff --git a/setup.py b/setup.py
-index 9985da5a2..5a03a1ec8 100755
---- a/setup.py
-+++ b/setup.py
-@@ -118,8 +118,8 @@ linkflags.extend(check_output([mapnik_config, '--libs']).split(' '))
+diff --git i/setup.py w/setup.py
+index 24ca0ec5e..bc2b1e0e0 100755
+--- i/setup.py
++++ w/setup.py
+@@ -19,8 +19,8 @@ linkflags.extend(check_output([mapnik_config, '--libs']).split(' '))
  linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' '))
  linkflags.extend(check_output([mapnik_config, '--dep-libs']).split(' '))
  linkflags.extend([
--'-lmapnik-wkt',
--'-lmapnik-json',
-+'-lmapnikwkt',
-+'-lmapnikjson',
- ] + ['-l%s' % i for i in get_boost_library_names()])
+-    '-lmapnik-wkt',
+-    '-lmapnik-json',
++    '-lmapnikwkt',
++    '-lmapnikjson',
+ ])
  
- # Dynamically make the mapnik/paths.py file
+ # Remove symlinks

pkgs/development/python-modules/python-mapnik/python-mapnik_std_optional.patch

@@ -1,176 +0,0 @@
-diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
-index 9add692c9..488427b56 100644
---- a/src/mapnik_image.cpp
-+++ b/src/mapnik_image.cpp
-@@ -230,7 +230,7 @@ unsigned get_type(mapnik::image_any & im)
- 
- std::shared_ptr<image_any> open_from_file(std::string const& filename)
- {
--    boost::optional<std::string> type = type_from_filename(filename);
-+    auto type = type_from_filename(filename);
-     if (type)
-     {
-         std::unique_ptr<image_reader> reader(get_image_reader(filename,*type));
-diff --git a/src/mapnik_layer.cpp b/src/mapnik_layer.cpp
-index 4fc7ea579..fbd277a81 100644
---- a/src/mapnik_layer.cpp
-+++ b/src/mapnik_layer.cpp
-@@ -95,7 +95,7 @@ struct layer_pickle_suite : boost::python::pickle_suite
- 
- std::vector<std::string> & (mapnik::layer::*_styles_)() = &mapnik::layer::styles;
- 
--void set_maximum_extent(mapnik::layer & l, boost::optional<mapnik::box2d<double> > const& box)
-+void set_maximum_extent(mapnik::layer & l, std::optional<mapnik::box2d<double> > const& box)
- {
-     if (box)
-     {
-@@ -107,7 +107,7 @@ void set_maximum_extent(mapnik::layer & l, boost::optional<mapnik::box2d<double>
-     }
- }
- 
--void set_buffer_size(mapnik::layer & l, boost::optional<int> const& buffer_size)
-+void set_buffer_size(mapnik::layer & l, std::optional<int> const& buffer_size)
- {
-     if (buffer_size)
-     {
-@@ -121,7 +121,7 @@ void set_buffer_size(mapnik::layer & l, boost::optional<int> const& buffer_size)
- 
- PyObject * get_buffer_size(mapnik::layer & l)
- {
--    boost::optional<int> buffer_size = l.buffer_size();
-+    std::optional<int> buffer_size = l.buffer_size();
-     if (buffer_size)
-     {
- #if PY_VERSION_HEX >= 0x03000000
-diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp
-index 3587e5d8a..cfa523b03 100644
---- a/src/mapnik_map.cpp
-+++ b/src/mapnik_map.cpp
-@@ -105,7 +105,7 @@ mapnik::featureset_ptr query_map_point(mapnik::Map const& m, int index, double x
-     return m.query_map_point(idx, x, y);
- }
- 
--void set_maximum_extent(mapnik::Map & m, boost::optional<mapnik::box2d<double> > const& box)
-+void set_maximum_extent(mapnik::Map & m, std::optional<mapnik::box2d<double> > const& box)
- {
-     if (box)
-     {
-diff --git a/src/python_optional.hpp b/src/python_optional.hpp
-index d690b7c51..9d86c340e 100644
---- a/src/python_optional.hpp
-+++ b/src/python_optional.hpp
-@@ -28,7 +28,7 @@
- #include <mapnik/util/noncopyable.hpp>
- #pragma GCC diagnostic pop
- 
--// boost::optional<T> to/from converter from John Wiegley
-+// std::optional<T> to/from converter from John Wiegley
- 
- template <typename T, typename TfromPy>
- struct object_from_python
-@@ -54,7 +54,7 @@ struct python_optional : public mapnik::util::noncopyable
- {
-     struct optional_to_python
-     {
--        static PyObject * convert(const boost::optional<T>& value)
-+        static PyObject * convert(const std::optional<T>& value)
-         {
-             return (value ? boost::python::to_python_value<T>()(*value) :
-                     boost::python::detail::none());
-@@ -90,9 +90,9 @@ struct python_optional : public mapnik::util::noncopyable
-                                     data)->storage.bytes;
- 
-             if (data->convertible == source)        // == None
--                new (storage) boost::optional<T>(); // A Boost uninitialized value
-+                new (storage) std::optional<T>(); // A Boost uninitialized value
-             else
--                new (storage) boost::optional<T>(*static_cast<T *>(data->convertible));
-+                new (storage) std::optional<T>(*static_cast<T *>(data->convertible));
- 
-             data->convertible = storage;
-         }
-@@ -100,18 +100,18 @@ struct python_optional : public mapnik::util::noncopyable
- 
-     explicit python_optional()
-     {
--        register_python_conversion<boost::optional<T>,
-+        register_python_conversion<std::optional<T>,
-             optional_to_python, optional_from_python>();
-     }
- };
- 
--// to/from boost::optional<bool>
-+// to/from std::optional<bool>
- template <>
- struct python_optional<float> : public mapnik::util::noncopyable
- {
-     struct optional_to_python
-     {
--        static PyObject * convert(const boost::optional<float>& value)
-+        static PyObject * convert(const std::optional<float>& value)
-         {
-             return (value ? PyFloat_FromDouble(*value) :
-                     boost::python::detail::none());
-@@ -133,30 +133,30 @@ struct python_optional<float> : public mapnik::util::noncopyable
-                               boost::python::converter::rvalue_from_python_stage1_data * data)
-         {
-             using namespace boost::python::converter;
--            void * const storage = ((rvalue_from_python_storage<boost::optional<bool> > *)
-+            void * const storage = ((rvalue_from_python_storage<std::optional<bool> > *)
-                                     data)->storage.bytes;
-             if (source == Py_None)  // == None
--                new (storage) boost::optional<float>(); // A Boost uninitialized value
-+                new (storage) std::optional<float>(); // A Boost uninitialized value
-             else
--                new (storage) boost::optional<float>(PyFloat_AsDouble(source));
-+                new (storage) std::optional<float>(PyFloat_AsDouble(source));
-             data->convertible = storage;
-         }
-     };
- 
-     explicit python_optional()
-     {
--        register_python_conversion<boost::optional<float>,
-+        register_python_conversion<std::optional<float>,
-             optional_to_python, optional_from_python>();
-     }
- };
- 
--// to/from boost::optional<float>
-+// to/from std::optional<float>
- template <>
- struct python_optional<bool> : public mapnik::util::noncopyable
- {
-     struct optional_to_python
-     {
--        static PyObject * convert(const boost::optional<bool>& value)
-+        static PyObject * convert(const std::optional<bool>& value)
-         {
-             if (value)
-             {
-@@ -181,13 +181,13 @@ struct python_optional<bool> : public mapnik::util::noncopyable
-                               boost::python::converter::rvalue_from_python_stage1_data * data)
-         {
-             using namespace boost::python::converter;
--            void * const storage = ((rvalue_from_python_storage<boost::optional<bool> > *)
-+            void * const storage = ((rvalue_from_python_storage<std::optional<bool> > *)
-                                     data)->storage.bytes;
-             if (source == Py_None)  // == None
--                new (storage) boost::optional<bool>(); // A Boost uninitialized value
-+                new (storage) std::optional<bool>(); // A Boost uninitialized value
-             else
-             {
--                new (storage) boost::optional<bool>(source == Py_True ? true : false);
-+                new (storage) std::optional<bool>(source == Py_True ? true : false);
-             }
-             data->convertible = storage;
-         }
-@@ -195,7 +195,7 @@ struct python_optional<bool> : public mapnik::util::noncopyable
- 
-     explicit python_optional()
-     {
--        register_python_conversion<boost::optional<bool>,
-+        register_python_conversion<std::optional<bool>,
-             optional_to_python, optional_from_python>();
-     }
- };

pkgs/development/python-modules/ultralytics/default.nix

@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics";
-  version = "8.3.205";
+  version = "8.3.213";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "ultralytics";
     tag = "v${version}";
-    hash = "sha256-+vJMSqJYUHNEFJhK0BUC2NkKwhady3gYdASGkbwZRxY=";
+    hash = "sha256-xlsC+sENv4xhKf0H+h1Kd9AyRE2KEVCRL91BMhH1wA4=";
   };
 
   build-system = [ setuptools ];

pkgs/development/tools/continuous-integration/woodpecker/common.nix

@@ -44,6 +44,7 @@ in
     license = licenses.asl20;
     maintainers = with maintainers; [
       ambroisie
+      marcusramberg
       techknowlogick
     ];
   };

pkgs/servers/sql/postgresql/ext/pg_partman.nix

@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_partman";
-  version = "5.2.4";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "pgpartman";
     repo = "pg_partman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w=";
+    hash = "sha256-Lib7UY06qjv95ndwx3sjPBcL5MtsLNx8IVOpZ1CgDG8=";
   };
 
   meta = {