From b333e1832e2a091df0d015565c2785f9fe8a858c Mon Sep 17 00:00:00 2001 From: toyboot4e Date: Thu, 26 Jun 2025 21:39:52 +0900 Subject: [PATCH 01/22] maintainers: add toyboot4e --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b518ec9136c..14b8141676b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -25613,6 +25613,12 @@ githubId = 90456; name = "Rebecca (Bex) Kelly"; }; + toyboot4e = { + email = "toyboot4e@gmail.com"; + github = "toyboot4e"; + githubId = 47905926; + name = "toyboot4e"; + }; tpw_rules = { name = "Thomas Watson"; email = "twatson52@icloud.com"; From 4f441fc808ffa2161f83da6b015065ab74d0e055 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 13:33:19 +0000 Subject: [PATCH 02/22] nebula: 1.9.5 -> 1.9.6 --- pkgs/by-name/ne/nebula/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nebula/package.nix b/pkgs/by-name/ne/nebula/package.nix index e9a0013e3d04..6da695d75156 100644 --- a/pkgs/by-name/ne/nebula/package.nix +++ b/pkgs/by-name/ne/nebula/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nebula"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "slackhq"; repo = "nebula"; tag = "v${version}"; - hash = "sha256-IJMmVKdgYCXCaRndlcoozFBr+RsUhzC1Eqo427K1k+o="; + hash = "sha256-klVbLseqIaibcXL83BVjRgY1ziZlxf+w4bRkkPlUnlU="; }; vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA="; From 4e0a5c2b25f1f83747ececf7935e1aabfffc2d7d Mon Sep 17 00:00:00 2001 From: toyboot4e Date: Fri, 27 Jun 2025 19:14:59 +0900 Subject: [PATCH 03/22] online-judge-verify-helper: init at 5.6.0 --- .../on/online-judge-verify-helper/package.nix | 4 ++ .../online-judge-verify-helper/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 77 insertions(+) create mode 100644 pkgs/by-name/on/online-judge-verify-helper/package.nix create mode 100644 pkgs/development/python-modules/online-judge-verify-helper/default.nix diff --git a/pkgs/by-name/on/online-judge-verify-helper/package.nix b/pkgs/by-name/on/online-judge-verify-helper/package.nix new file mode 100644 index 000000000000..f3a0b05d370d --- /dev/null +++ b/pkgs/by-name/on/online-judge-verify-helper/package.nix @@ -0,0 +1,4 @@ +{ + python3Packages, +}: +python3Packages.toPythonApplication python3Packages.online-judge-verify-helper diff --git a/pkgs/development/python-modules/online-judge-verify-helper/default.nix b/pkgs/development/python-modules/online-judge-verify-helper/default.nix new file mode 100644 index 000000000000..b457ebf2e38a --- /dev/null +++ b/pkgs/development/python-modules/online-judge-verify-helper/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + + colorlog, + importlab, + online-judge-tools, + pyyaml, + setuptools, + toml, + + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "online-judge-verify-helper"; + version = "5.6.0"; + pyproject = true; + disabled = pythonOlder "3.12"; + + src = fetchFromGitHub { + owner = "online-judge-tools"; + repo = "verification-helper"; + tag = "v${version}"; + hash = "sha256-sBR9/rf8vpDRbRD8HO2VNmxVckXPmPjUih7ogLRFaW8="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + colorlog + importlab + online-judge-tools + pyyaml + setuptools + toml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # No additional dependencies or network access + disabledTestPaths = [ + "tests/test_docs.py" + "tests/test_python.py" + "tests/test_rust.py" + "tests/test_stats.py" + "tests/test_verify.py" + ]; + + pythonImportsCheck = [ + "onlinejudge" + "onlinejudge_bundle" + "onlinejudge_verify" + "onlinejudge_verify_resources" + ]; + + meta = { + description = "Testing framework for snippet libraries used in competitive programming"; + mainProgram = "oj-verify"; + homepage = "https://github.com/online-judge-tools/verification-helper"; + changelog = "https://github.com/online-judge-tools/verification-helper/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ toyboot4e ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 660922c1f2f8..bedbb46cffe6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10551,6 +10551,10 @@ self: super: with self; { online-judge-tools = callPackage ../development/python-modules/online-judge-tools { }; + online-judge-verify-helper = + callPackage ../development/python-modules/online-judge-verify-helper + { }; + onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { }; From c4d6c7a446169a930e3183977534b29f4547ae6b Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 26 Jul 2025 11:28:56 -0700 Subject: [PATCH 04/22] duckdb: disable known failing test on linux https://github.com/NixOS/nixpkgs/pull/409698\#issuecomment-3092630328 --- pkgs/by-name/du/duckdb/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 9c267cf93cae..4eceacaa4a63 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -113,6 +113,8 @@ stdenv.mkDerivation (finalAttrs: { # fails with incorrect result # Upstream issue https://github.com/duckdb/duckdb/issues/14294 "test/sql/copy/file_size_bytes.test" + # https://github.com/duckdb/duckdb/issues/17757#issuecomment-3032080432 + "test/issues/general/test_17757.test" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" From 76f7114f70054cc8b1fc1b42f195f81d3efed9ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 08:24:16 +0000 Subject: [PATCH 05/22] zeek: 7.2.1 -> 7.2.2 --- pkgs/by-name/ze/zeek/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zeek/package.nix b/pkgs/by-name/ze/zeek/package.nix index 249a2e9000a0..8a1c77247324 100644 --- a/pkgs/by-name/ze/zeek/package.nix +++ b/pkgs/by-name/ze/zeek/package.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "zeek"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { url = "https://download.zeek.org/zeek-${finalAttrs.version}.tar.gz"; - hash = "sha256-nbq25TGq/HubTfAysxuVHU34xp3AkJp8yBHB20FlUC0="; + hash = "sha256-Kx3ySPlBmaFoThxGDWTPHF5J10ccK1YvlCrF++mAWJM="; }; strictDeps = true; From b8be189950104629b19ead24b9a58ec38e896793 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 09:10:54 +0000 Subject: [PATCH 06/22] bruno: 2.8.0 -> 2.8.1 --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index cdec05af23cd..adeaa60a8119 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -19,13 +19,13 @@ buildNpmPackage rec { pname = "bruno"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-1Xg3AaEmg4mAcK2EytQdWqkLoYWPQMZzLWDjceXcnSA="; + hash = "sha256-+Ce9jjOZH0kFj4EfRgAabUDA9iRmHq7umVD9pOqGBbw="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json From fa9dec157bd27c810c31c311c89f35e024fc9833 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 10:28:24 +0000 Subject: [PATCH 07/22] python3Packages.langchain-deepseek: 0.1.3 -> 0.1.4 --- .../development/python-modules/langchain-deepseek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain-deepseek/default.nix b/pkgs/development/python-modules/langchain-deepseek/default.nix index 8f82cbfb84a5..9830a391d323 100644 --- a/pkgs/development/python-modules/langchain-deepseek/default.nix +++ b/pkgs/development/python-modules/langchain-deepseek/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "langchain-deepseek"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; tag = "langchain-deepseek==${version}"; - hash = "sha256-nkL8QO1H29sA6g61Hgt7QrRAfwD3t+0m5JEHyPx8B7Y="; + hash = "sha256-lIlThVpyZF5osiCyYMO8kQUNtG5eUjXGZLdgRraj4Yc="; }; sourceRoot = "${src.name}/libs/partners/deepseek"; From dedf852ccd920c9ea2f8efc879d2fb504c19a325 Mon Sep 17 00:00:00 2001 From: jack Date: Wed, 2 Jul 2025 12:06:06 +0200 Subject: [PATCH 08/22] nixos/systemd-boot: refactor json.load() logic for better error message --- .../boot/loader/systemd-boot/systemd-boot-builder.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index bd2a6d43301d..aeb833a546f3 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -116,10 +116,15 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str def get_bootspec(profile: str | None, generation: int) -> BootSpec: system_directory = system_dir(profile, generation, None) - boot_json_path = os.path.realpath("%s/%s" % (system_directory, "boot.json")) + boot_json_path = os.path.join(system_directory, "boot.json") if os.path.isfile(boot_json_path): - boot_json_f = open(boot_json_path, 'r') - bootspec_json = json.load(boot_json_f) + with open(boot_json_path, 'r') as boot_json_f: + # check if json is well-formed, else throw error with filepath + try: + bootspec_json = json.load(boot_json_f) + except ValueError as e: + print(f"error: Malformed Json: {e}, in {boot_json_path}", file=sys.stderr) + sys.exit(1) else: boot_json_str = run( [ From b5ccf171ae55c250f51ab063ca971806c5e493ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 13:34:18 +0000 Subject: [PATCH 09/22] affine: 0.22.4 -> 0.23.2 --- pkgs/by-name/af/affine/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index ef3c0a7c1458..5921732aa4bc 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -43,17 +43,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.22.4"; + version = "0.23.2"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-IvVNnh8EDRSnIGeomLkO+I9fpbzrxC8jOStCh//RF8A="; + hash = "sha256-4WPnS+ZaiNgtib70ii/XfWkn2tNg2OsSAglD+mpnDvg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-kAhT2yXFbUuV34ukdUmLQbO00LSaYk7gpsp0nmO138o="; + hash = "sha256-OdzjT6ktxvQNIk0Um9iru7Wm5LcBE3f5vrO4rsksf5U="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-6Co65RkzLnk4U9ibiN0cO0bWRvbUHECzd+GQ8pwIxBE="; + outputHash = "sha256-tpn+TlSrGIABmSM9B3iQc39nZmGEf5MliKyaKOsM7yM="; }; buildInputs = lib.optionals hostPlatform.isDarwin [ From 57a143d29e8ab8043c0116c632e5a1f36f0dd5ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 14:22:46 +0000 Subject: [PATCH 10/22] rustical: 0.6.0 -> 0.8.1 --- pkgs/by-name/ru/rustical/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix index 40f3f31400d1..44805d96bafa 100644 --- a/pkgs/by-name/ru/rustical/package.nix +++ b/pkgs/by-name/ru/rustical/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rustical"; - version = "0.6.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lennart-k"; repo = "rustical"; tag = "v${finalAttrs.version}"; - hash = "sha256-0QpzJt5Jz1s4Ax9p4AyCwkrqi0HGf65VPbYy17WdYh8="; + hash = "sha256-TkgkgPQEj0SA9MjfWtOUu6rHKYCIs5jVieYL1N+XLk8="; }; - cargoHash = "sha256-Iylek8vY4lvKRQ/4LTalg0WMgopnvNKO7splZDrSjHE="; + cargoHash = "sha256-X+8G2H3wszKJmn7p8n0b6z3xZ/ylGzwc99oUnIGKpTA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; From 4ae348e2d1bcead0263669bad85451fac22401ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 16:37:11 +0000 Subject: [PATCH 11/22] tigerbeetle: 0.16.50 -> 0.16.51 --- pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index f7e45c23af18..48c983be8210 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-DLFAjkAkRemVOo9ZbKimKBpvVy/n/qzD+/dgWN3AfDg="; - "x86_64-linux" = "sha256-d+Y5OEHvS1wLDVkddX3r7y8iSLNCCXkzrn/T0lyMxNM="; - "aarch64-linux" = "sha256-sLvmm1liXOczLqUIlypu/nClPnQSmf4WkkxNem5vdkw="; + "universal-macos" = "sha256-BNcfAJMFE+4xUxRwQ6J3mmOsAHWGXZ+X6XygjirIA8o="; + "x86_64-linux" = "sha256-pQNNSWQSbG06sdpoloNXFFOwRNHT/6gIlETiQnLGcko="; + "aarch64-linux" = "sha256-BZlRtoBnsNePmmtu56te7rMG5mVjDugsog8+rWYHeZg="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.16.50"; + version = "0.16.51"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; From 42d7d8f51b443f4fd18ea2f4b33168a44047b1cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 17:05:36 +0000 Subject: [PATCH 12/22] mmctl: 10.5.8 -> 10.5.9 --- pkgs/by-name/ma/mattermost/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 40eabefa83c9..bb850553b072 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -19,8 +19,8 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(10\\.5\\.[0-9]+)$"; - version = "10.5.8"; - srcHash = "sha256-yzC+QyGs8bynEOyZejMElh/gRKakUhw21eiqiah0K5s="; + version = "10.5.9"; + srcHash = "sha256-Jnm6M9d5vkYGX357QiOvCRDPGFpvRrsWqk8+SV0PtBs="; vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk="; npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0="; lockfileOverlay = '' From afb0e9ea0e970ff032b816ad27aadabe6e7c36d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Jul 2025 18:00:38 +0000 Subject: [PATCH 13/22] files-cli: 2.15.51 -> 2.15.61 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 89d20c32e5af..5f5c18960433 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.51"; + version = "2.15.61"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-BvBbC/okSti4rL886+P6Kh8vAwI1TN688oyrgTch9e8="; + hash = "sha256-QYfZ9xRz9KtoXMkUlmLjYGTMNzBM7MZr/v8yjT/urLw="; }; - vendorHash = "sha256-dCujq1drJ8wgzo7hV4kJ8k5EXzXu3k6Oc6TuOLRsqrY="; + vendorHash = "sha256-Uw+69gRSSnFSFSgaw97vzzdQuX5W4qnKSDHPZM3ipmA="; ldflags = [ "-s" From 9303e05a44fb60a6ac06437fd909f44b220aee1b Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Sun, 27 Jul 2025 14:57:53 -0400 Subject: [PATCH 14/22] jikken: add version-regex to updateScript --- pkgs/by-name/ji/jikken/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ji/jikken/package.nix b/pkgs/by-name/ji/jikken/package.nix index 5c8c0723d45a..2ee17b4831d1 100644 --- a/pkgs/by-name/ji/jikken/package.nix +++ b/pkgs/by-name/ji/jikken/package.nix @@ -25,7 +25,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(v\\d+\\.\\d+\\.\\d+)$" + ]; + }; meta = with lib; { description = "Powerful, source control friendly REST API testing toolkit"; From edec20fa2638533e645161a5b07c632f8c5c63d5 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 27 Jul 2025 21:13:15 +0200 Subject: [PATCH 15/22] usbguard: unpin protobuf_29 Since release 1.1.4 usbguard is protobuf 30 compatible. --- pkgs/by-name/us/usbguard/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/us/usbguard/package.nix b/pkgs/by-name/us/usbguard/package.nix index baa057785a9b..5a6e5976de3a 100644 --- a/pkgs/by-name/us/usbguard/package.nix +++ b/pkgs/by-name/us/usbguard/package.nix @@ -16,14 +16,11 @@ libqb, libseccomp, polkit, - protobuf_29, + protobuf, audit, libsodium, }: -let - protobuf = protobuf_29; -in stdenv.mkDerivation rec { version = "1.1.4"; pname = "usbguard"; From ea5608d8251637569ceeae1645e1c7ce7eb9f19e Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 27 Jul 2025 21:21:31 +0200 Subject: [PATCH 16/22] usbguard: cleanup --- pkgs/by-name/us/usbguard/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/us/usbguard/package.nix b/pkgs/by-name/us/usbguard/package.nix index 5a6e5976de3a..5f575755a7fb 100644 --- a/pkgs/by-name/us/usbguard/package.nix +++ b/pkgs/by-name/us/usbguard/package.nix @@ -21,14 +21,14 @@ libsodium, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.1.4"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = "usbguard"; - rev = "usbguard-${version}"; + tag = "usbguard-${finalAttrs.version}"; hash = "sha256-PDuYszdG6BK4fkAHWWBct1d7tnwwe+5XOw+xmSPoPCY="; fetchSubmodules = true; }; @@ -74,17 +74,17 @@ stdenv.mkDerivation rec { passthru.tests = nixosTests.usbguard; - meta = with lib; { - description = "USBGuard software framework helps to protect your computer against BadUSB"; + meta = { + description = "Protect your computer against rogue USB devices (a.k.a. BadUSB)"; longDescription = '' USBGuard is a software framework for implementing USB device authorization policies (what kind of USB devices are authorized) as well as method of use policies (how a USB device may interact with the system). Simply put, - it is a USB device whitelisting tool. + it is a USB device allowlisting tool. ''; homepage = "https://usbguard.github.io/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.tnias ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.tnias ]; }; -} +}) From 6d4764d3c053c7d4527d842a04ff12b7665add56 Mon Sep 17 00:00:00 2001 From: Joris Guyonvarch <> Date: Sat, 10 May 2025 13:57:05 +0200 Subject: [PATCH 17/22] maintainers: update guyonvarch --- maintainers/maintainer-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 39f8ece163fa..6ab976966d52 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9684,7 +9684,6 @@ name = "guserav"; }; guyonvarch = { - email = "joris@guyonvarch.me"; github = "guyonvarch"; githubId = 6768842; name = "Joris Guyonvarch"; From 8f66a11cc1d84d221e9d0f9d719352b05a35b1f3 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sun, 27 Jul 2025 22:01:41 +0000 Subject: [PATCH 18/22] miniflux: 2.2.10 -> 2.2.11 https://miniflux.app/releases/2.2.11.html --- pkgs/by-name/mi/miniflux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index de3e053a1596..4a9ea40bd4cf 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.2.10"; + version = "2.2.11"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; tag = version; - hash = "sha256-hCRtopJ+PN9bjnImPXKuQRq2Sk62By2+T6z17yISfds="; + hash = "sha256-0gheLIwokJWanCOU1gWFyY6KBLqX+02plSp+iLHxd/Y="; }; - vendorHash = "sha256-jKtlIDPOElp37NlOIbT6IXn2s59NqNTRNK0LbTlxWsM="; + vendorHash = "sha256-hBvMAPmoGbxz3bV1NCA5nuNC7yv8v8h19pWCispLV3c="; nativeBuildInputs = [ installShellFiles ]; From 726e82341c45f28bbf84bc788daf51910b72d67c Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 26 Jul 2025 11:31:50 -0700 Subject: [PATCH 19/22] duckdb: fix 'with lib;' --- pkgs/by-name/du/duckdb/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 4eceacaa4a63..3cfd451a4681 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -136,16 +136,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = ./update.sh; - meta = with lib; { + meta = { changelog = "https://github.com/duckdb/duckdb/releases/tag/v${finalAttrs.version}"; description = "Embeddable SQL OLAP Database Management System"; homepage = "https://duckdb.org/"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "duckdb"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ costrouc cpcloud ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) From ad914f55dce51c7b8c982e9c0f3d98282595f823 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 27 Jul 2025 18:22:27 -0700 Subject: [PATCH 20/22] mattermost: disable another S3 test This new test requires S3, so get rid of it. --- pkgs/by-name/ma/mattermost/tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix index 77563b6210ed..98e296f74546 100644 --- a/pkgs/by-name/ma/mattermost/tests.nix +++ b/pkgs/by-name/ma/mattermost/tests.nix @@ -89,6 +89,7 @@ mattermost.overrideAttrs ( "TestS3TestConnection" "TestS3FileBackendTestSuite" "TestS3FileBackendTestSuiteWithEncryption" + "TestWriteFileVideoMimeTypes" # Mail tests (needs a SMTP server) "TestSendMailUsingConfig" From 932607871a90c813c2e72d9eb29af6782f71d3eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 02:20:20 +0000 Subject: [PATCH 21/22] github-mcp-server: 0.8.0 -> 0.9.0 --- pkgs/by-name/gi/github-mcp-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 05a6938b9ced..cac1727ac5e9 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-4OdDTis4vRPqzAVYm8TuFHlW1+1FdQbIdjNNeTVuuMw="; + hash = "sha256-Eqo3ZUfELSXzRQOcz0JGMhve6drznZv17XmpP0e5HtI="; }; vendorHash = "sha256-DeojCgMBwVclvoiEs462FoxIf3700XUjXvPbvRZE3CI="; From a2da4cab4b59677d82cb6ba9312e939f6c058c4f Mon Sep 17 00:00:00 2001 From: lxl66566 Date: Sun, 27 Jul 2025 12:50:05 +0800 Subject: [PATCH 22/22] xmrig: patch modprobe path Signed-off-by: lxl66566 --- pkgs/by-name/xm/xmrig/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/xm/xmrig/package.nix b/pkgs/by-name/xm/xmrig/package.nix index 0f9fc4a67236..4215d3c3e345 100644 --- a/pkgs/by-name/xm/xmrig/package.nix +++ b/pkgs/by-name/xm/xmrig/package.nix @@ -7,6 +7,7 @@ libmicrohttpd, openssl, hwloc, + kmod, donateLevel ? 0, }: @@ -29,6 +30,10 @@ stdenv.mkDerivation rec { substituteAllInPlace src/donate.h substituteInPlace cmake/OpenSSL.cmake \ --replace "set(OPENSSL_USE_STATIC_LIBS TRUE)" "set(OPENSSL_USE_STATIC_LIBS FALSE)" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace src/hw/msr/Msr_linux.cpp \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" ''; nativeBuildInputs = [