Merge remote-tracking branch 'origin/master' into staging-next

ci/pinned-nixpkgs.json

···
 {
-  "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
-  "sha256": "0qg99zj0gb0pc6sjlkmwhk1c1xz14qxmk6gamgfmcxpsfdp5vn72"
+  "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b",
+  "sha256": "0aqrxx1w40aqicjhg2057bpyrrbsx6mnii5dp5klpm4labfg2iwi"
 }

pkgs/applications/networking/browsers/chromium/default.nix

···
     min-version: result:
     let
       min-supported-version = (lib.head (lib.attrValues electron-source)).unwrapped.info.chromium.version;
+      # Warning can be toggled by changing the value of enabled:
+      enabled = false;
     in
-    lib.warnIf (lib.versionAtLeast min-supported-version min-version)
+    lib.warnIf (enabled && lib.versionAtLeast min-supported-version min-version)
       "chromium: min-supported-version ${min-supported-version} is newer than a conditional bounded at ${min-version}. You can safely delete it."
       result;
   chromiumVersionAtLeast =

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

···
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.28.4";
+  version = "1.28.5";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-Ml8lb8E9sFRSOjaTv1R0OO5+gjXJk2GoL4Fkb+yvb0g=";
+    hash = "sha256-oaU+E/LAoZTeJjWnjvDDW2sXocNebWZ1HNrjHHgkGJ4=";
   };
 
   npmDepsHash = "sha256-wzetOJxHJXK7oY1cwOG9YOrKKIDhFPD17em6UQ2859M=";

pkgs/by-name/bu/buildbox/package.nix

···
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "buildbox";
-  version = "1.3.7";
+  version = "1.3.11";
 
   src = fetchFromGitLab {
     owner = "BuildGrid";
     repo = "buildbox/buildbox";
     tag = finalAttrs.version;
-    hash = "sha256-US0qJrKoAYR4rMmolC8jx7IpQ2PiHZy7L2bog+I3G48=";
+    hash = "sha256-lIRYwZLjYCpA4TMO3GF/yykVKn7LDyNHW9zItZmS9vM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/de/deltatouch/package.nix

···
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltatouch";
-  version = "1.10.2";
+  version = "1.14.3";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "lk108";
     repo = "deltatouch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-QcrBo7lrMYkOZGSyS5fLAwNxZwKFrylU5P5my2Jl93k=";
+    hash = "sha256-vumMAMm9+dKlmi5a6ehIDePpQKkco/smYSM1K/QiXu4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/di/diesel-cli/package.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.8";
+  version = "2.2.9";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-+h5gLhbFxVnEHsFZqkkQe6rUiiZy6oYcF2mnb44VHDU=";
+    hash = "sha256-rMNCNvc4kLJxgiNqvGk3lTFTguqYnjo9H5ZplC+Wii4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vCdxtrhyIhy3VuLWl7XYysCFecHReHWhAs/BRaBTbrk=";
+  cargoHash = "sha256-2y2fODciv4NcvvHx1y0NZ6w8DM0QNHUGYSfPz5vVxmY=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/fl/flyctl/package.nix

···
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.94";
+  version = "0.3.99";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-eCAnOoP5YQL/UCKex/lGiY28JswJTBmg+AIRrrDaAmc=";
+    hash = "sha256-vmmInlco4uxiFFTxSqxpaJCUbLbUWN3Iw4SDaRYaaOI=";
   };
 
-  vendorHash = "sha256-OokZuh6wzu7xWu//T87n0tbFC3L+MpEJWkSaFJJJUVI=";
+  vendorHash = "sha256-iJdZDQaoaAf56wbE3v3apr6Zme4ZrY9PtfxAMncDM+Y=";
 
   subPackages = [ "." ];
 

pkgs/by-name/go/goperf/package.nix

···
 
 buildGoModule rec {
   pname = "goperf";
-  version = "0-unstable-2025-03-05";
+  version = "0-unstable-2025-04-07";
 
   src = fetchgit {
     url = "https://go.googlesource.com/perf";
-    rev = "02a15fd477bac975be19f213ea665ad854766179";
-    hash = "sha256-8v26SVtBbUNrBhBjcLM1RKVcgXmC9CFWWOBZ5pc1RfM=";
+    rev = "71ba5bc8ccce8a755de82e9bad6ca4e4d7b590d2";
+    hash = "sha256-xY9Z502YUUePqoocBWWPxD/TLFQtYq3TLyj3Izp8n9A=";
   };
 
-  vendorHash = "sha256-3ocSlOVE1hskLqshBeseoB+Wjuu9QJhhzshQUuygcQ0=";
+  vendorHash = "sha256-BYfn9ip8QCS+spYR51eS6SysYlZtBZf7GhuFZVh3Kb8=";
 
   passthru.updateScript = writeShellScript "update-goperf" ''
     export UPDATE_NIX_ATTR_PATH=goperf

pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix

···
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.127.1";
+  version = "1.128.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-DNUKbb+d3BBp8guas6apQ4yFeXCc0Ilijtbt1hZkap4=";
+    hash = "sha256-QgVx/9mZ3Do+42YwO8OtI2dcuckMX/xIaiBUi4HrK4Q=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-wI3vOfR5UpVFls2wPfgeIEj2+bmWdL3pDSsKfT+ysw8=";
+    hash = "sha256-PdAyEGLYmMLgcPQjzjuwvQo55olKgr079gsgQnUoKTM=";
   };
 
   postPatch = ''

pkgs/by-name/mi/mise/package.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "mise";
-  version = "2025.3.11";
+  version = "2025.4.1";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     rev = "v${version}";
-    hash = "sha256-n7A6LGjcVz6LWz8fkkG5XS2WZf3FFkbidnt/S5jxy5g=";
+    hash = "sha256-WEzf091KJbXTsyCNaz2QdiNklPZ3054jATGkl5Y+6lA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-On2+ROA71RyZdFPvH4Zem/494Q4uCYS4EZSvQL1DDWQ=";
+  cargoHash = "sha256-N04vcOJjx0GCKYXJCkQFQT4D8WWJsi62f3cdUW+4zMk=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/by-name/se/searxng/package.nix

···
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-02-09";
+    version = "0-unstable-2025-04-09";
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "a1e2b254677a22f1f8968a06564661ac6203c162";
-      hash = "sha256-DrSj1wQUWq9xVuQqt0BZ79JgyRS9qJqg1cdYTIBb1A8=";
+      rev = "15384e8fc596da9c4a7e27393f8100018c3a61ed";
+      hash = "sha256-exkn/gQALJteUAsg3qeSnRGEbKANkhSBDziWUgJ1fF8=";
     };
 
     postPatch = ''

pkgs/by-name/ty/typstyle/package.nix

···
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.2";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kCBM2A2MihzB3tafn6+uHYjj85GAlAxMtheXAY+RksM=";
+    hash = "sha256-IcQphXFtyvJVWfcrJbumLUqgUpRCyRg0asziuDwDl84=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-K0N6Sq/YeM/Hi/BbJZMpQp+bEwttbJ/nVCWx5gxs1qQ=";
+  cargoHash = "sha256-hwUVhPkq6EVYiRmEV7DPzseO7Ip4tl7+h9A2efmlpEs=";
 
   # Disabling tests requiring network access
   checkFlags = [

pkgs/by-name/uv/uv/package.nix

···
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.6.13";
+  version = "0.6.14";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-vJvF8ioEtiriWh120WhMxkYSody04PuXA6EISjWWvYA=";
+    hash = "sha256-1ZmH757yqzXCYYRJoNGzh2Jy5ACWjNHugcY0szztBRQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-pwbqYe2zdQJQGoqrIwryBHmnS8spPgQ0qdpmxdT+9sk=";
+  cargoHash = "sha256-zE6WP5rFUvx6B3ti5mlXPD4Z+1VQM0qpaScszKjTNmY=";
 
   buildInputs = [
     rust-jemalloc-sys

pkgs/by-name/va/vacuum-go/package.nix

···
   buildGoModule,
   fetchFromGitHub,
   testers,
-  vacuum-go,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "vacuum-go";
   version = "0.16.5";
 
···
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-r42bmY7wmEjA2Q/k8czyyNpU59a4z6vxeCnIfMkMScg=";
   };
 
···
   ldflags = [
     "-s"
     "-w"
-    "-X main.version=v${version}"
+    "-X main.version=v${finalAttrs.version}"
   ];
 
   subPackages = [ "./vacuum.go" ];
 
   passthru = {
     tests.version = testers.testVersion {
-      package = vacuum-go;
+      package = finalAttrs.finalPackage;
       command = "vacuum version";
-      version = "v${version}";
+      version = "v${finalAttrs.version}";
     };
   };
 
   meta = {
     description = "The world's fastest OpenAPI & Swagger linter";
     homepage = "https://quobix.com/vacuum";
-    changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${version}";
+    changelog = "https://github.com/daveshanley/vacuum/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "vacuum";
     maintainers = with lib.maintainers; [ konradmalik ];
   };
-}
+})

pkgs/development/libraries/science/math/or-tools/default.nix pkgs/by-name/or/or-tools/package.nix

···
   bzip2,
   cbc,
   cmake,
-  DarwinTools, # sw_vers
   eigen,
   ensureNewerSourcesForZipFilesHook,
   fetchFromGitHub,
···
   lib,
   pkg-config,
   protobuf,
-  python,
+  python3,
   re2,
   stdenv,
   swig,
···
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "or-tools";
   version = "9.12";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-5rFeAK51+BfjIyu/5f5ptaKMD7Hd20yHa2Vj3O3PkLU=";
   };
 
···
       sed -i -e "/protobuf/ { s/.*,/'protobuf >= 5.26',/ }" ortools/python/setup.py.in
     '';
 
-  cmakeFlags = [
-    "-DBUILD_DEPS=OFF"
-    "-DBUILD_PYTHON=ON"
-    "-DBUILD_pybind11=OFF"
-    "-DCMAKE_INSTALL_BINDIR=bin"
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DFETCH_PYTHON_DEPS=OFF"
-    "-DUSE_GLPK=ON"
-    "-DUSE_SCIP=OFF"
-    "-DPython3_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}"
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_MACOSX_RPATH=OFF" ];
+  cmakeFlags =
+    [
+      (lib.cmakeBool "BUILD_DEPS" false)
+      (lib.cmakeBool "BUILD_PYTHON" true)
+      (lib.cmakeBool "BUILD_pybind11" false)
+      (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+      (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+      (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+      (lib.cmakeBool "FETCH_PYTHON_DEPS" false)
+      (lib.cmakeBool "USE_GLPK" true)
+      (lib.cmakeBool "USE_SCIP" false)
+      (lib.cmakeFeature "Python3_EXECUTABLE" "${python3.pythonOnBuildForHost.interpreter}")
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      (lib.cmakeBool "CMAKE_MACOSX_RPATH" false)
+    ];
 
   strictDeps = true;
 
···
       cmake
       ensureNewerSourcesForZipFilesHook
       pkg-config
-      python.pythonOnBuildForHost
+      python3.pythonOnBuildForHost
       swig
       unzip
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      DarwinTools
-    ]
-    ++ (with python.pythonOnBuildForHost.pkgs; [
+    ++ (with python3.pythonOnBuildForHost.pkgs; [
       pip
       mypy-protobuf
       mypy
···
     cbc
     eigen
     glpk
-    python.pkgs.absl-py
-    python.pkgs.pybind11
-    python.pkgs.pybind11-abseil
-    python.pkgs.pybind11-protobuf
-    python.pkgs.pytest
-    python.pkgs.scipy
-    python.pkgs.setuptools
-    python.pkgs.wheel
+    highs
+    python3.pkgs.absl-py
+    python3.pkgs.pybind11
+    python3.pkgs.pybind11-abseil
+    python3.pkgs.pybind11-protobuf
+    python3.pkgs.pytest
+    python3.pkgs.scipy
+    python3.pkgs.setuptools
+    python3.pkgs.wheel
     re2
     zlib
   ];
···
     abseil-cpp
     highs
     protobuf
-    (python.pkgs.protobuf.override { protobuf = protobuf; })
-    python.pkgs.numpy
-    python.pkgs.pandas
-    python.pkgs.immutabledict
+    python3.pkgs.protobuf
+    python3.pkgs.immutabledict
+    python3.pkgs.numpy
+    python3.pkgs.pandas
   ];
   nativeCheckInputs = [
-    python.pkgs.matplotlib
-    python.pkgs.virtualenv
+    python3.pkgs.matplotlib
+    python3.pkgs.virtualenv
   ];
 
   # some tests fail on linux and hang on darwin
···
     "python"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/google/or-tools";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     description = ''
       Google's software suite for combinatorial optimization.
     '';
     mainProgram = "fzn-cp-sat";
-    maintainers = with maintainers; [ andersk ];
-    platforms = with platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ andersk ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})

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

···
 
 buildPythonPackage rec {
   pname = "libknot";
-  version = "3.4.5";
+  version = "3.4.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-z7OJiFQZ6m5y/qbZN9LLQ6NvKz3HQJXGGOE5gK0DTRM=";
+    hash = "sha256-GthzZgu8UW/BoW5AJSriKSKHEQF4w9S0Vnl9DKOsimk=";
   };
 
   postPatch = ''

pkgs/development/python-modules/mkdocs-drawio-file/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  poetry-core,
+  beautifulsoup4,
+  jinja2,
+  lxml,
+  mkdocs,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "mkdocs-drawio-file";
+  version = "1.5.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "mkdocs_drawio_file";
+    inherit version;
+    hash = "sha256-5OPaG98m7ycxtEUyAYWunomHwq+r10VBnzza3kYtHhE=";
+  };
+
+  build-system = [
+    poetry-core
+  ];
+
+  pythonRelaxDeps = [
+    "lxml"
+  ];
+
+  dependencies = [
+    beautifulsoup4
+    jinja2
+    lxml
+    mkdocs
+    requests
+  ];
+
+  pythonImportsCheck = [
+    "mkdocs_drawio_file"
+  ];
+
+  # No tests available
+  doCheck = false;
+
+  meta = {
+    description = "Embedding files of Diagrams.net (Draw.io) into MkDocs";
+    homepage = "https://github.com/onixpro/mkdocs-drawio-file/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

pkgs/development/python-modules/mkdocs-markmap/default.nix

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  attrs,
+  beautifulsoup4,
+  mkdocs,
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "mkdocs-markmap";
+  version = "2.5.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "markmap";
+    repo = "mkdocs_markmap";
+    tag = "v${version}";
+    hash = "sha256-jC0MgN0CM8VmUR9NYVM5P6J+f8Qplg1DDal7i246slM=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    attrs
+    beautifulsoup4
+    mkdocs
+    requests
+  ];
+
+  pythonImportsCheck = [
+    "mkdocs_markmap"
+  ];
+
+  # No tests available
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/markmap/mkdocs_markmap/releases/tag/v${version}";
+    description = "MkDocs plugin and extension to create mindmaps from markdown using markmap";
+    homepage = "https://github.com/markmap/mkdocs_markmap";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}

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

···
 
 buildPythonPackage rec {
   pname = "python-openstackclient";
-  version = "7.4.0";
+  version = "8.0.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "python_openstackclient";
     inherit version;
-    hash = "sha256-6BfhGgHLK1FvvZnc5FwJnI5BxD0RuxHmZycDqDhEnZ8=";
+    hash = "sha256-W3peBok/gztdKW0BnFDULHNo43dI7mvo6bFWVbmZQk4=";
   };
 
   build-system = [

pkgs/servers/monitoring/prometheus/knot-exporter.nix

···
 
 python3.pkgs.buildPythonApplication rec {
   pname = "knot-exporter";
-  version = "3.4.5";
+  version = "3.4.6";
   pyproject = true;
 
   src = fetchPypi {
     pname = "knot_exporter";
     inherit version;
-    hash = "sha256-OD8Z2xdRydEp3TeXX9l0ASus+c3YziGF50tn7QOugUE=";
+    hash = "sha256-OMBg7sjFU3GpVKiXNWVBr4Oa1v4MTr1jZMrR7MhzgVg=";
   };
 
   nativeBuildInputs = [

pkgs/top-level/all-packages.nix

···
     nodejs = nodejs_20;
   };
 
-  or-tools = callPackage ../development/libraries/science/math/or-tools {
-    inherit (darwin) DarwinTools;
-    python = python3;
-    protobuf = protobuf_29.override {
-      abseil-cpp = abseil-cpp_202407;
-    };
-    abseil-cpp = abseil-cpp_202407;
-  };
-
   p4est-sc = callPackage ../development/libraries/science/math/p4est-sc {
     p4est-sc-debugEnable = false;
   };

pkgs/top-level/python-packages.nix

···
 
   mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { };
 
+  mkdocs-drawio-file = callPackage ../development/python-modules/mkdocs-drawio-file { };
+
   mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { };
 
   mkdocs-get-deps = callPackage ../development/python-modules/mkdocs-get-deps { };
···
   mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { };
 
   mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { };
+
+  mkdocs-markmap = callPackage ../development/python-modules/mkdocs-markmap { };
 
   mkdocs-material = callPackage ../development/python-modules/mkdocs-material { };
 
···
 
   ormsgpack = callPackage ../development/python-modules/ormsgpack { };
 
-  ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python;
+  ortools = (toPythonModule (pkgs.or-tools.override { python3 = self.python; })).python;
 
   orvibo = callPackage ../development/python-modules/orvibo { };