From 507816dca57e4b52350c8f246cedb65e629471db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jun 2026 16:05:29 +0000 Subject: [PATCH 01/10] colima: 0.10.1 -> 0.10.3 --- pkgs/by-name/co/colima/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix index c03ab54dd7df..b3532a64a7ca 100644 --- a/pkgs/by-name/co/colima/package.nix +++ b/pkgs/by-name/co/colima/package.nix @@ -16,13 +16,13 @@ buildGoModule (finalAttrs: { pname = "colima"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "abiosoft"; repo = "colima"; tag = "v${finalAttrs.version}"; - hash = "sha256-WYwHqMPHRF17j7EfZzxHAMV0JPGZKLfJCn0axpuh5sc="; + hash = "sha256-FBFL3VO6t7SaGnZBT2qBD1DbRg14klBpiPiaELbRfIY="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-UAnQZyZ4EcIZz55jXUjkJDjq3s0uLPBnwUPyNcBV6aE="; + vendorHash = "sha256-j1RuG3CTGfVNfT/v+C2pZgb58c9cxa2op3LA/F5rNWo="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log From c8d9891922cf94c6835c57f9db7ed00f507b840c Mon Sep 17 00:00:00 2001 From: Quinn Edenfield Date: Thu, 2 Jul 2026 14:57:40 -0700 Subject: [PATCH 02/10] krunkit: 1.2.2 -> 1.3.2 changelog: https://github.com/libkrun/krunkit/compare/v1.2.2...v1.3.2 --- pkgs/by-name/kr/krunkit/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix index 7ee265aa97bc..8048432093ba 100644 --- a/pkgs/by-name/kr/krunkit/package.nix +++ b/pkgs/by-name/kr/krunkit/package.nix @@ -14,18 +14,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "krunkit"; - version = "1.2.2"; + version = "1.3.2"; src = fetchFromGitHub { owner = "libkrun"; repo = "krunkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-43XqNofzKi310nhxTNo/Gj5didVa/u/gV05hglecLtk="; + hash = "sha256-aC/p+MoCG05hyADZaz+bbONLXTcR7uJIcMrZOn4Rjbg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-Yb2jyK4UBJCeVXSKl4UABnlMj+7SKpOIi49tD/itHYo="; + hash = "sha256-ptMqyCiIJsQfjFyislyc3pR0BGpwnu8Ba3OcQYLJPtM="; }; nativeBuildInputs = [ @@ -52,15 +52,15 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = true; passthru = { - tests.boot = callPackage ./boot-test.nix { - krunkit = finalAttrs.finalPackage; - }; + tests.boot = lib.optional stdenv.isDarwin ( + callPackage ./boot-test.nix { krunkit = finalAttrs.finalPackage; } + ); updateScript = nix-update-script { }; }; meta = { description = "Launch configurable virtual machines with libkrun"; - homepage = "https://github.com/containers/krunkit"; + homepage = "https://github.com/libkrun/krunkit"; license = lib.licenses.asl20; platforms = [ "aarch64-darwin" ]; maintainers = with lib.maintainers; [ quinneden ]; From 2788763b478ee792202f46fc14d515545ee40ac8 Mon Sep 17 00:00:00 2001 From: FlashOnFire_ Date: Wed, 24 Jun 2026 10:43:11 +0200 Subject: [PATCH 03/10] oxicloud: 0.6.0 -> 0.8.1 --- pkgs/by-name/ox/oxicloud/package.nix | 39 +++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ox/oxicloud/package.nix b/pkgs/by-name/ox/oxicloud/package.nix index 11a83e473327..31027047f7cf 100644 --- a/pkgs/by-name/ox/oxicloud/package.nix +++ b/pkgs/by-name/ox/oxicloud/package.nix @@ -5,10 +5,12 @@ openssl, pkg-config, rustPlatform, + buildNpmPackage, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "oxicloud"; - version = "0.6.0"; + version = "0.8.1"; __structuredAttrs = true; @@ -16,14 +18,14 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "AtalayaLabs"; repo = "OxiCloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-7alpcK0KYg+ZusK2K7FPdQMLdPrawvL5wsfB6NpSXQw="; + hash = "sha256-vfVh1yqVYQD43RsTqUn2gVR6MldYG0MC0cdRWPZ6rRk="; }; - cargoHash = "sha256-4gxpTCsS1W2CmRzdnRcsuRe+kr+TgG4hjkzdgihop5I="; + cargoHash = "sha256-sEO8Q980S/jXR8SoI1hTPA+gvV7pNZ8ZD7re5qlSJwY="; nativeBuildInputs = [ - makeBinaryWrapper pkg-config + makeBinaryWrapper ]; buildInputs = [ openssl ]; @@ -35,16 +37,41 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -f .cargo/config.toml ''; + oxicloud-front = buildNpmPackage (frontFinalAttrs: { + pname = "oxicloud-front"; + inherit (finalAttrs) version src; + sourceRoot = "${frontFinalAttrs.src.name}/frontend"; + + npmDepsHash = "sha256-dn9vEk84AYaqfhBhf2obsfQBYUPkE5qyjXalFNNziXw="; + + postPatch = '' + substituteInPlace svelte.config.js \ + --replace "'../static-dist'" "'static-dist'" + ''; + + installPhase = '' + runHook preInstall + cp -r static-dist $out + runHook postInstall + ''; + }); + postInstall = '' mkdir -p $out/share/oxicloud - cp -r static-dist $out/share/oxicloud/static ''; postFixup = '' wrapProgram $out/bin/oxicloud \ - --set-default OXICLOUD_STATIC_PATH $out/share/oxicloud/static + --set-default OXICLOUD_STATIC_PATH ${finalAttrs.oxicloud-front} ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "oxicloud-front" + ]; + }; + meta = { description = "Ultra-fast, secure & lightweight self-hosted cloud storage"; homepage = "https://github.com/AtalayaLabs/OxiCloud"; From bfd204f1536e28ac79f00cb53f4a14a4c5131116 Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Sun, 5 Jul 2026 23:02:38 +0200 Subject: [PATCH 04/10] memento: 2.0.1 -> 2.0.2 --- pkgs/by-name/me/memento/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/memento/package.nix b/pkgs/by-name/me/memento/package.nix index f8bc216c135a..365e4e6836c3 100644 --- a/pkgs/by-name/me/memento/package.nix +++ b/pkgs/by-name/me/memento/package.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; tag = "v${finalAttrs.version}"; - hash = "sha256-A3moOjXubXSggaWaSpuYzp9mKIZYcgMehMG/qkUAtas="; + hash = "sha256-PVGzPd9t8FNZ3kLLueDIzIKAgagW7avDMFp6NKtSCD0="; }; postPatch = '' From 5ee9618378131cddda2f598503c93e589346c9c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jul 2026 01:00:21 +0000 Subject: [PATCH 05/10] yubihsm-shell: 2.7.3 -> 2.8.0 --- pkgs/by-name/yu/yubihsm-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index 578fd54785ce..41811e2240fb 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yubihsm-shell"; - version = "2.7.3"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = finalAttrs.version; - hash = "sha256-0Y2Dj/MAg5Nb6etxF164/7gvytjKYROVIkhqE6Lr2p8="; + hash = "sha256-yb3dy6dZiADDVaybvIBSV3x9qAjh7qWgLHKxP4WrlCc="; }; postPatch = '' From 45ecf43c516fb899d639be0b73c85b013be0ba9c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 3 Jul 2026 14:09:30 -0700 Subject: [PATCH 06/10] lib.meta-types: add binary either/both combinators Every in-tree union/intersection use has exactly two members, and the binary form verifies without allocating a closure or calling the any/all primop per check. check-meta.nix switches to either/both; union and intersection are kept for potential future use. Assisted-by: Claude Code (Claude Fable 5) --- lib/meta-types.nix | 26 ++++++++++++++++++++++++ pkgs/stdenv/generic/check-meta.nix | 32 +++++++----------------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/lib/meta-types.nix b/lib/meta-types.nix index 1d67f5f063e8..264c921eb54e 100644 --- a/lib/meta-types.nix +++ b/lib/meta-types.nix @@ -160,6 +160,32 @@ lib.fix (self: { verify = v: all (func: func v) funcs; }; + either = + t1: t2: + assert isTypeDef t1 && isTypeDef t2; + let + # Store the functions directly so we don't have to pay the cost of attrset lookups at runtime. + v1 = t1.verify; + v2 = t2.verify; + in + { + name = "either<${t1.name},${t2.name}>"; + verify = v: v1 v || v2 v; + }; + + both = + t1: t2: + assert isTypeDef t1 && isTypeDef t2; + let + # Store the functions directly so we don't have to pay the cost of attrset lookups at runtime. + v1 = t1.verify; + v2 = t2.verify; + in + { + name = "both<${t1.name},${t2.name}>"; + verify = v: v1 v && v2 v; + }; + not = t: assert isTypeDef t; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 049be19b4e6a..f834ebcb37c6 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -304,21 +304,18 @@ let types = import ../../../lib/meta-types.nix { inherit lib; }; inherit (types) str - union + either int attrs any listOf bool record - intersection + both not derivation ; - platforms = listOf (union [ - str - attrs - ]); # see lib.meta.platformMatch + platforms = listOf (either str attrs); # see lib.meta.platformMatch in record { # These keys are documented @@ -326,31 +323,16 @@ let mainProgram = str; longDescription = str; branch = str; - homepage = union [ - (listOf str) - str - ]; + homepage = either str (listOf str); donationPage = str; downloadPage = str; - changelog = union [ - (listOf str) - str - ]; + changelog = either str (listOf str); license = let # TODO disallow `str` licenses, use a module - licenseType = union [ - (intersection [ - attrs - (not derivation) - ]) - str - ]; + licenseType = either (both attrs (not derivation)) str; in - union [ - (listOf licenseType) - licenseType - ]; + either licenseType (listOf licenseType); sourceProvenance = listOf attrs; maintainers = listOf attrs; # TODO use the maintainer type from lib/tests/maintainer-module.nix nonTeamMaintainers = listOf attrs; # TODO use the maintainer type from lib/tests/maintainer-module.nix From a3fa0aa9620b344ff5e43b2a63ea767286f531f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jul 2026 18:41:47 +0000 Subject: [PATCH 07/10] oxlint: 1.71.0 -> 1.73.0 --- pkgs/by-name/ox/oxlint/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 8ef3d7d0422f..b835d0848087 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -23,25 +23,25 @@ # runs without an external linter, which leaves `jsPlugins` configs inert. stdenv.mkDerivation (finalAttrs: { pname = "oxlint"; - version = "1.71.0"; + version = "1.73.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-6ED4/wSFOB22WN8lGnXTmfFKqZzklZKa/pfhUDIHF2Q="; + hash = "sha256-sENfR27kqr/S25+43NiFEJsQrwYLqmuvTC/AhJETGsk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-Q1NXa5dtYhVopRbBZoAlRLrOkDDmsObsG/xMlmTN4yY="; + hash = "sha256-RkZ6e07SnJArjL0CNo5Qfo/hYrw1HIM4g8bvMJm9ypE="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-KtKWThLwWSROr7JJXpGBK/MC/GlrrLhdkENq3orrMyI="; + hash = "sha256-eSPMGwkgpNgyPS4eebGoGi+gu9xqw8OWGvK7DK2goMk="; }; dontUseCmakeConfigure = true; From 6a1f844d16a95cc9d6bf294acb0841a7b04c130c Mon Sep 17 00:00:00 2001 From: Darren Rambaud <225436867+debtquity@users.noreply.github.com> Date: Tue, 7 Jul 2026 17:23:44 -0500 Subject: [PATCH 08/10] stalwart_0_16: 0.16.11 -> 0.16.12 * diff: https://github.com/stalwartlabs/stalwart/compare/v0.16.11...v0.16.12 * changelog: https://github.com/stalwartlabs/stalwart/releases/tag/v0.16.12 --- pkgs/by-name/st/stalwart_0_16/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart_0_16/package.nix b/pkgs/by-name/st/stalwart_0_16/package.nix index 608ae1d9a6ab..be84df21f1b1 100644 --- a/pkgs/by-name/st/stalwart_0_16/package.nix +++ b/pkgs/by-name/st/stalwart_0_16/package.nix @@ -50,7 +50,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.16.11"; + version = "0.16.12"; __structuredAttrs = true; @@ -58,10 +58,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "stalwartlabs"; repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-0A8IjetGV4h4qdpm44eZb0sNQ4abulb2+VUAeYWItT0="; + hash = "sha256-IAwD4zW8UEIMQ+Z0y7Qfvo7+o2W2FVySldPA3+IGowE="; }; - cargoHash = "sha256-OpoQzNNm5JUrnk1tRZL9JUpDQnGH73Lj6SW52gSthl0="; + cargoHash = "sha256-O/14/jqLXmlmGYfU1x0B1ZRBCGEeREJaOkicaAM7aeU="; env = { # https://docs.rs/openssl/latest/openssl/#manual From 5a5d820b209e84532d6c49287c9141cb5f1bdd31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jul 2026 03:14:27 +0000 Subject: [PATCH 09/10] terraform-providers.ibm-cloud_ibm: 2.3.0 -> 2.4.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index da861cee185e..bbd24e2dd89a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -733,13 +733,13 @@ "vendorHash": null }, "ibm-cloud_ibm": { - "hash": "sha256-b498lI4JF5DktGXS5SqCBlDB0rsqDWTE/5GHmgHX3Y4=", + "hash": "sha256-hDLD3h+640IRIL5lDegn4W2tOuSef6Bi5JWdlLbtqoM=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v2.3.0", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0eKD6fIrpOQzD/ILd+6y4GR2EX4UNOioMdSCfu+F5OU=" + "vendorHash": "sha256-/UNr2OiDlq0gX3D77mbruDj9WMnS/0AxkoEaBcWlFHU=" }, "icinga_icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", From 0a9aa1e9779773468bfa73ebd9a827208518a116 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jul 2026 03:50:29 +0000 Subject: [PATCH 10/10] azure-cli-extensions.azure-devops: 1.0.5 -> 1.0.6 --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index 873ceb30bbed..b19475fac5dd 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -125,9 +125,9 @@ azure-devops = mkAzExtension rec { pname = "azure-devops"; - version = "1.0.5"; + version = "1.0.6"; url = "https://github.com/Azure/azure-cli-extensions/releases/download/azure-devops-${version}/azure_devops-${version}-py2.py3-none-any.whl"; - hash = "sha256-uzgGU9/EJ7eaQ3HYajEuKRKGcMGW/jQPxGSt/Zgo2rQ="; + hash = "sha256-+neeH9bm4bcmw2VrahloU3wggEHGr1TSp0dnctiWs0s="; description = "Tools for managing Azure DevOps"; propagatedBuildInputs = with python3Packages; [ distro ]; meta.maintainers = with lib.maintainers; [ katexochen ];