From 5404b661983683e0686023cee92727e097aa0918 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Tue, 8 Apr 2025 21:03:30 +0200 Subject: [PATCH 01/22] matrix-synapse: 1.127.1 -> 1.128.0 Release notes: https://github.com/element-hq/synapse/releases/tag/v1.128.0 Full changelog: https://github.com/element-hq/synapse/compare/v1.127.1...v1.128.0 --- pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 2090477f2050..2e37b113d49a 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -17,20 +17,20 @@ let 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 = '' From f1b4c9081205e97954de04cde326813f87255597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 8 Apr 2025 16:28:31 -0700 Subject: [PATCH 02/22] deltatouch: 1.10.2 -> 1.14.3 Diff: https://codeberg.org/lk108/deltatouch/compare/v1.10.2...v1.14.3 Changelog: https://codeberg.org/lk108/deltatouch/src/tag/v1.14.3/CHANGELOG --- pkgs/by-name/de/deltatouch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix index 7b2d061fe88a..d2dfbb4ce306 100644 --- a/pkgs/by-name/de/deltatouch/package.nix +++ b/pkgs/by-name/de/deltatouch/package.nix @@ -12,14 +12,14 @@ 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 = [ From 7df412e59e7ecd8f4ed9eeaed997191cc8aa4f52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 08:41:13 +0000 Subject: [PATCH 03/22] flyctl: 0.3.94 -> 0.3.99 --- pkgs/by-name/fl/flyctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index 35b6127ae73b..7a09a25b604e 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -9,16 +9,16 @@ 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 = [ "." ]; From b8fc49614bd94e28ba14e9f528b4ec8987a4c6f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 12:06:04 +0000 Subject: [PATCH 04/22] diesel-cli: 2.2.8 -> 2.2.9 --- pkgs/by-name/di/diesel-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 92b98816e363..902d395b93bc 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [ 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 From 0fe5843ab46e89de97f32b65722f373a8a40e536 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 9 Apr 2025 21:23:13 +0200 Subject: [PATCH 05/22] ci: Update pinned Nixpkgs From the nixpkgs-unstable channel: https://hydra.nixos.org/eval/1814458#tabs-inputs --- ci/pinned-nixpkgs.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pinned-nixpkgs.json b/ci/pinned-nixpkgs.json index c5c558dc61bc..00cd71fab0ab 100644 --- a/ci/pinned-nixpkgs.json +++ b/ci/pinned-nixpkgs.json @@ -1,4 +1,4 @@ { - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", - "sha256": "0qg99zj0gb0pc6sjlkmwhk1c1xz14qxmk6gamgfmcxpsfdp5vn72" + "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", + "sha256": "0aqrxx1w40aqicjhg2057bpyrrbsx6mnii5dp5klpm4labfg2iwi" } From 28857bf83da0db902b391eb8bac1528fddfd1289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 20:53:46 +0000 Subject: [PATCH 06/22] mise: 2025.3.11 -> 2025.4.1 --- pkgs/by-name/mi/mise/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 29355753f408..7e1498c91c1d 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -23,17 +23,17 @@ 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 From cb3018882f13c5bfc835b46825fd0f2c532d7017 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 31 Mar 2025 21:00:00 +0200 Subject: [PATCH 07/22] vacuum-go: use finalAttrs pattern --- pkgs/by-name/va/vacuum-go/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index c5da16a18cfd..cc6819cad37b 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -3,10 +3,9 @@ buildGoModule, fetchFromGitHub, testers, - vacuum-go, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "vacuum-go"; version = "0.16.5"; @@ -14,7 +13,7 @@ buildGoModule rec { 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="; }; @@ -24,25 +23,25 @@ buildGoModule rec { 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 ]; }; -} +}) From 6c94a68c58c844bc90cf6b4a392fc0604933d7d8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Mar 2025 15:35:58 +0100 Subject: [PATCH 08/22] or-tools: move to by-name --- ...1-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch | 0 .../or-tools/default.nix => by-name/or/or-tools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/science/math => by-name/or}/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch (100%) rename pkgs/{development/libraries/science/math/or-tools/default.nix => by-name/or/or-tools/package.nix} (100%) diff --git a/pkgs/development/libraries/science/math/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch b/pkgs/by-name/or/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch similarity index 100% rename from pkgs/development/libraries/science/math/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch rename to pkgs/by-name/or/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/by-name/or/or-tools/package.nix similarity index 100% rename from pkgs/development/libraries/science/math/or-tools/default.nix rename to pkgs/by-name/or/or-tools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99c189b702a0..11f192274081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18155,7 +18155,7 @@ with pkgs; nodejs = nodejs_20; }; - or-tools = callPackage ../development/libraries/science/math/or-tools { + or-tools = callPackage ../by-name/or/or-tools/package.nix { inherit (darwin) DarwinTools; python = python3; protobuf = protobuf_29.override { From 4a1dd30cdf1e22727b23c3048994e9cf49f18479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 10:58:50 +0000 Subject: [PATCH 09/22] prometheus-knot-exporter: 3.4.5 -> 3.4.6 --- pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 5d6dc3e0e57b..32ba7d411c3f 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -7,13 +7,13 @@ 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 = [ From 837f302dcf2b274e6dc038d62b6e7809e89e2fc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 11:20:26 +0000 Subject: [PATCH 10/22] goperf: 0-unstable-2025-03-05 -> 0-unstable-2025-04-07 --- pkgs/by-name/go/goperf/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 06fef208efbb..c5f97eafa6dc 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ 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 From 881e4bb2134e0bb44c1754278ae93d5fe8a4272d Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Thu, 10 Apr 2025 11:49:04 +0000 Subject: [PATCH 11/22] uv: 0.6.13 -> 0.6.14 Changelog: https://github.com/astral-sh/uv/blob/0.6.14/CHANGELOG.md Diff: https://github.com/astral-sh/uv/compare/refs/tags/0.6.13..0.6.14 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 24ee7fbd4f40..6542c21fd422 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ 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 From 150620cef008e6e8748f82f13da7e4456a1cac4d Mon Sep 17 00:00:00 2001 From: Louis Thevenet Date: Thu, 10 Apr 2025 13:57:40 +0200 Subject: [PATCH 12/22] searxng: 0-unstable-2025-02-09 -> 0-unstable-2025-04-09 --- pkgs/by-name/se/searxng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 264dc4473f28..9e8307b0d48e 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -37,13 +37,13 @@ in 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 = '' From 68ae051ca534be9b89353f9f0e0b09ac58a30fa6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Mar 2025 15:53:28 +0100 Subject: [PATCH 13/22] or-tools: cleanup --- pkgs/by-name/or/or-tools/package.nix | 81 ++++++++++++++-------------- pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index 4457003bbadf..2443016c304c 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -3,7 +3,6 @@ bzip2, cbc, cmake, - DarwinTools, # sw_vers eigen, ensureNewerSourcesForZipFilesHook, fetchFromGitHub, @@ -13,7 +12,7 @@ lib, pkg-config, protobuf, - python, + python3, re2, stdenv, swig, @@ -21,14 +20,14 @@ 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="; }; @@ -62,18 +61,22 @@ stdenv.mkDerivation rec { 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; @@ -82,14 +85,11 @@ stdenv.mkDerivation rec { 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 @@ -100,14 +100,15 @@ stdenv.mkDerivation rec { 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 ]; @@ -115,14 +116,14 @@ stdenv.mkDerivation rec { abseil-cpp highs protobuf - (python.pkgs.protobuf.override { protobuf = protobuf; }) - python.pkgs.numpy - python.pkgs.pandas - python.pkgs.immutabledict + (python3.pkgs.protobuf.override { protobuf = 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 @@ -147,14 +148,14 @@ stdenv.mkDerivation rec { "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; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11f192274081..600fb95c219e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18156,8 +18156,6 @@ with pkgs; }; or-tools = callPackage ../by-name/or/or-tools/package.nix { - inherit (darwin) DarwinTools; - python = python3; protobuf = protobuf_29.override { abseil-cpp = abseil-cpp_202407; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bd03dc24f39..6f373e1d71d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10441,7 +10441,7 @@ self: super: with self; { 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 { }; From 05304f5bbb9d629836d284e22ff386438a86970f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 13:55:47 +0200 Subject: [PATCH 14/22] or-tools: unpin protobuf and abseil --- pkgs/by-name/or/or-tools/package.nix | 2 +- pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index 2443016c304c..7e01246887bd 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { abseil-cpp highs protobuf - (python3.pkgs.protobuf.override { protobuf = protobuf; }) + python3.pkgs.protobuf python3.pkgs.immutabledict python3.pkgs.numpy python3.pkgs.pandas diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 600fb95c219e..92a60a68aa97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18155,13 +18155,6 @@ with pkgs; nodejs = nodejs_20; }; - or-tools = callPackage ../by-name/or/or-tools/package.nix { - 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; }; From 5bf7fe9dd333ea6e9220b92fdb12b03185279be2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 12:38:50 +0000 Subject: [PATCH 15/22] buildbox: 1.3.7 -> 1.3.11 --- pkgs/by-name/bu/buildbox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index eae793cf4599..40b5f2212c14 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -21,13 +21,13 @@ }: 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 = [ From e0b60c362b133fe316c678a26a58b1ac364fcf12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 12:39:57 +0000 Subject: [PATCH 16/22] openstackclient-full: 7.4.0 -> 8.0.0 --- .../python-modules/python-openstackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 84b5c86f627a..1119f6e896fc 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -33,13 +33,13 @@ 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 = [ From 8f16c0955ec3918f2b68ec9081633952e9155a5c Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 10 Apr 2025 16:16:58 +0200 Subject: [PATCH 17/22] chromium: make warnObsoleteVersionConditional conditional Prior to this, an obsolete version conditional would trigger an eval warning telling you that it can be safely removed now. In an attempt to make electron-source EOL removals a bit easier for the electron maintainers, mute those warnings by default. This way, electron maintainers can remove their EOL version on their own and aren't required to also touch the chromium derivation for cleanup. Chromium maintainers (or anyone, really) are able to opt-into those warnings by changing the value of enabled to true locally and act accordingly. Hope this clears a hurdle for the electron maintainers. --- pkgs/applications/networking/browsers/chromium/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index b31c31a7b829..d8c3cf2e3780 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -46,8 +46,10 @@ let 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 = From 0f8763657980721d000f72631d3d91159d9da489 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 10 Apr 2025 15:56:51 +0200 Subject: [PATCH 18/22] python312Packages.mkdocs-drawio-file: init at 1.5.2 --- .../mkdocs-drawio-file/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-drawio-file/default.nix diff --git a/pkgs/development/python-modules/mkdocs-drawio-file/default.nix b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix new file mode 100644 index 000000000000..5746e7601df3 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-drawio-file/default.nix @@ -0,0 +1,53 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd9b64f66fbd..2b2af8277fcf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8789,6 +8789,8 @@ self: super: with self; { 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 { }; From 25672c5fd7ebe5706799030e1758fb18981f2973 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 10 Apr 2025 16:00:36 +0200 Subject: [PATCH 19/22] python312Packages.mkdocs-markmap: init at 2.5.2 --- .../python-modules/mkdocs-markmap/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-markmap/default.nix diff --git a/pkgs/development/python-modules/mkdocs-markmap/default.nix b/pkgs/development/python-modules/mkdocs-markmap/default.nix new file mode 100644 index 000000000000..115eb1767908 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-markmap/default.nix @@ -0,0 +1,49 @@ +{ + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b2af8277fcf..401cb7e6d970 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8815,6 +8815,8 @@ self: super: with self; { mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; + mkdocs-markmap = callPackage ../development/python-modules/mkdocs-markmap { }; + mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; mkdocs-material-extensions = From dca49661f6c15f9ff9a0bce4053da49515f47a43 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 10 Apr 2025 16:33:49 +0200 Subject: [PATCH 20/22] python312Packages.libknot: 3.4.5 -> 3.4.6 --- pkgs/development/python-modules/libknot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 3ae79aee2c7a..731319b7e44d 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ 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 = '' From 313f061c8a2d661d106eb684e454742f23c2fa10 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 10 Apr 2025 17:30:20 +0200 Subject: [PATCH 21/22] typstyle: 0.13.2 -> 0.13.3 Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.13.2...refs/tags/v0.13.3 Changelog: https://github.com/Enter-tainer/typstyle/blob/v0.13.3/CHANGELOG.md --- pkgs/by-name/ty/typstyle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix index a41582f87d85..8eeaf3f2cd73 100644 --- a/pkgs/by-name/ty/typstyle/package.nix +++ b/pkgs/by-name/ty/typstyle/package.nix @@ -8,17 +8,17 @@ 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 = [ From 5231d45b6abc4e0ac54f7812fc0c4cf9549c072c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 15:32:53 +0000 Subject: [PATCH 22/22] basedpyright: 1.28.4 -> 1.28.5 --- pkgs/by-name/ba/basedpyright/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 66e4927c255b..baf6ce4713c9 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -16,13 +16,13 @@ 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=";