From 8e53c647e1eaa8165e03dcdae0504d013c3727a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 May 2025 18:24:32 +0000 Subject: [PATCH 1/8] featherpad: 1.6.1 -> 1.6.2 --- pkgs/by-name/fe/featherpad/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/featherpad/package.nix b/pkgs/by-name/fe/featherpad/package.nix index 76bb4b510fc1..08b23e25ee54 100644 --- a/pkgs/by-name/fe/featherpad/package.nix +++ b/pkgs/by-name/fe/featherpad/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "featherpad"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; tag = "V${finalAttrs.version}"; - hash = "sha256-uI/XKBBoKsbABQWvTQbqFLStXFeiJI2u0DA+Injxon0="; + hash = "sha256-G47ltOiyNEk/NrFWoXpft/rCJ18t0FTZrc5ReEJL6TU="; }; nativeBuildInputs = [ From 1903a6fc0ffad5caff4df073511c650ef5310f06 Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 26 May 2025 22:14:19 +0800 Subject: [PATCH 2/8] kassert: init at 0.2.2 --- pkgs/by-name/ka/kassert/package.nix | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/ka/kassert/package.nix diff --git a/pkgs/by-name/ka/kassert/package.nix b/pkgs/by-name/ka/kassert/package.nix new file mode 100644 index 000000000000..dd796b047373 --- /dev/null +++ b/pkgs/by-name/ka/kassert/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kassert"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "kamping-site"; + repo = "kassert"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5UndFUhKtHPFPLfYP0EI/r+eoAptcQBheznALfxh27s="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # doc generation require git clone doxygen-awesome-css + (lib.cmakeBool "KASSERT_BUILD_DOCS" false) + (lib.cmakeBool "KASSERT_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "KASSERT_USE_BUNDLED_GTEST" false) + ]; + + doCheck = true; + + nativeCheckInputs = [ gtest ]; + + meta = { + description = "Karlsruhe assertion library for C++"; + homepage = "https://kamping-site.github.io/kassert/"; + downloadPage = "https://github.com/kamping-site/kassert"; + changelog = "https://github.com/kamping-site/kasser/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ mit ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ qbisi ]; + }; +}) From ae818a13d55fed703969612087a9e84f4da3e1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 29 May 2025 19:50:04 -0700 Subject: [PATCH 3/8] python3Packages.vllm: unpin torch --- .../python-modules/vllm/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 67f1b7cacdac..7cbfb50fce01 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -9,15 +9,16 @@ autoAddDriverRunpath, # build system + cmake, + jinja2, + ninja, packaging, setuptools, + setuptools-scm, wheel, # dependencies which, - ninja, - cmake, - setuptools-scm, torch, outlines, psutil, @@ -246,10 +247,14 @@ buildPythonPackage rec { ./0004-drop-lsmod.patch ]; - # Ignore the python version check because it hard-codes minor versions and - # lags behind `ray`'s python interpreter support postPatch = '' + # pythonRelaxDeps does not cover build-system + substituteInPlace pyproject.toml \ + --replace-fail "torch ==" "torch >=" + + # Ignore the python version check because it hard-codes minor versions and + # lags behind `ray`'s python interpreter support substituteInPlace CMakeLists.txt \ --replace-fail \ 'set(PYTHON_SUPPORTED_VERSIONS' \ @@ -263,9 +268,6 @@ buildPythonPackage rec { nativeBuildInputs = [ - cmake - ninja - pythonRelaxDepsHook which ] ++ lib.optionals rocmSupport [ @@ -280,17 +282,17 @@ buildPythonPackage rec { ]; build-system = [ + cmake + jinja2 + ninja packaging setuptools - wheel + setuptools-scm + torch ]; buildInputs = - [ - setuptools-scm - torch - ] - ++ lib.optionals cpuSupport [ + lib.optionals cpuSupport [ oneDNN ] ++ lib.optionals (cpuSupport && stdenv.isLinux) [ From ebe0310901d8ceaf9ff9f5cd3fd6939c404e8bbc Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 30 May 2025 16:05:36 +0000 Subject: [PATCH 4/8] openbao: 2.2.1 -> 2.2.2 --- pkgs/by-name/op/openbao/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 6d0f3262cf10..63a76c91cba1 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "openbao"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "openbao"; repo = "openbao"; tag = "v${finalAttrs.version}"; - hash = "sha256-qbLaa7EUQywPRTIgUclTomDDBxzdQnyVAqCGD+iOlpg="; + hash = "sha256-r/CPxrVPn0s0qWqdsymqZLSEY0JMilPiWfxmOUvYvnM="; }; - vendorHash = "sha256-Upvv3dxS6HIFxR6T+2/dqnFsUtemjOGUaiICgPlepJ8="; + vendorHash = "sha256-zT/cLL34G93b62VTowwgs8ZZ41wmJ//lzooxVaN7p9Q="; proxyVendor = true; From 51ecd580473bbd095f42438481cac69cf23a6120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 30 May 2025 18:48:07 +0200 Subject: [PATCH 5/8] system.etc.overlay: build erofs also locally images in etc tends to be small in size (mostly contains symlinks) so it's not worth it to reach out to a remote builder for that. --- nixos/modules/system/etc/etc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 0be5a3b9ae82..15387f261b2b 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -390,11 +390,11 @@ in system.build.etcMetadataImage = let etcJson = pkgs.writeText "etc-json" (builtins.toJSON etc'); - etcDump = pkgs.runCommand "etc-dump" { } '' + etcDump = pkgs.runCommandLocal "etc-dump" { } '' ${lib.getExe pkgs.buildPackages.python3} ${./build-composefs-dump.py} ${etcJson} > $out ''; in - pkgs.runCommand "etc-metadata.erofs" + pkgs.runCommandLocal "etc-metadata.erofs" { nativeBuildInputs = with pkgs.buildPackages; [ composefs From 9fee7e36882d8b1b6202452890cbf53694c8b491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 May 2025 20:00:37 +0000 Subject: [PATCH 6/8] eza: 0.21.3 -> 0.21.4 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index ef41d71f4472..87c02bcacc9c 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.21.3"; + version = "0.21.4"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-6SGGeZVQe3uuyEt6TJn5cBqnI/BdDGRiPHugKrgQNhs="; + hash = "sha256-lwCZj4EHzgZSAQTnJZizonh4FmKoX3dkYKbIcn1WBHs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-QCy9lLOSB+64DPTc/SVSCrD2nfJswGcR2P9AdN6CqZw="; + cargoHash = "sha256-8XkkClXyTT2+py57rSTMNpnuesTujNgHTz6K2gmDHYM="; nativeBuildInputs = [ cmake From aac0debe621f5e6116da84a7e18f871175e64c9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 May 2025 22:51:08 +0000 Subject: [PATCH 7/8] firefox-beta-unwrapped: 140.0b2 -> 140.0b3 --- .../networking/browsers/firefox/packages/firefox-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index 8a69a594d02f..3dd7f5a0cceb 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = pname; - version = "140.0b2"; + version = "140.0b3"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "c8010b6cdf90f52d5105971d726139460a0194ca7e84ed57184897f4f258957ff64117ef14a38a6dba4cab3074f3a92aee0eaf221ecf22218f6408636ab9c960"; + sha512 = "282b30284e9efa3909e1c1e8b01fd3c8ce5083668a01dea53487aa00d89734889e033051de3ce9aa66d7a84f4d4ac1c6e558fa4e3efe1e51077fc0831e989129"; }; meta = { From e96913f2a38b459026f78780063d446223233e7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 May 2025 00:04:03 +0000 Subject: [PATCH 8/8] codebook: 0.2.13 -> 0.3.0 --- pkgs/by-name/co/codebook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index d0895cc0ef49..dcb5a14ad247 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.2.13"; + version = "0.3.0"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-8cbXdK0QbUVtqWvKSDRk3ejJrWo2lgykJG3O57e1ik8="; + hash = "sha256-s8DcWAmyp2RPNrq0wZE51YYJb1uzFnwA2r5ADybN9Bs="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-NsPdNjqVFa3bbDu/VZk++lsh5NW01+eVOGe1BlgHDiQ="; + cargoHash = "sha256-MOgt0fia7FTz3qmbnxg+xwVNA1h6gsry0GmbSgBK+Hk="; # Integration tests require internet access for dictionaries doCheck = false;