azure-cli-extensions.azure-devops: 1.0.5 -> 1.0.6 (#539460)

* diff: https://github.com/stalwartlabs/stalwart/compare/v0.16.11...v0.16.12
* changelog: https://github.com/stalwartlabs/stalwart/releases/tag/v0.16.12

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;

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=",

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 ];

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

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 ];

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 = ''

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";

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;

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

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 = ''

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