diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index b60e9d5c2ed6..6366f666de13 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -7,9 +7,9 @@ name: Bot on: schedule: - # Run every 5m + # Run every 10m # i.e., at each of the listed minutes, every hour - - cron: '02,07,12,17,22,27,32,37,42,47,52,57 * * * *' + - cron: '05,15,25,35,45,55 * * * *' workflow_call: inputs: headBranch: diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index 783d59ab51f4..654ca84d2367 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -96,6 +96,47 @@ module.exports = async ({ github, context, core, dry }) => { return maintainerMaps[branch] } + // Caching the list of team members saves API requests when running the bot on the schedule and + // processing many PRs at once. + const members = {} + function getTeamMembers(team_slug) { + if (context.eventName === 'pull_request') { + // We have no chance of getting a token in the pull_request context with the right + // permissions to access the members endpoint below. Thus, we're pretending to have + // no members. This is OK; because this is only for the Test workflow, not for + // real use. + return [] + } + + if (!members[team_slug]) { + members[team_slug] = github.paginate(github.rest.teams.listMembersInOrg, { + org: context.repo.owner, + team_slug, + per_page: 100, + }) + } + + return members[team_slug] + } + + // Caching users saves API requests when running the bot on the schedule and processing + // many PRs at once. It also helps to encapsulate the special logic we need, because + // actions/github doesn't support that endpoint fully, yet. + const users = {} + function getUser(id) { + if (!users[id]) { + users[id] = github + .request({ + method: 'GET', + url: '/user/{id}', + id, + }) + .then((resp) => resp.data) + } + + return users[id] + } + async function handlePullRequest({ item, stats, events }) { const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`) @@ -121,6 +162,8 @@ module.exports = async ({ github, context, core, dry }) => { pull_request, events, maintainers, + getTeamMembers, + getUser, }) // When the same change has already been merged to the target branch, a PR will still be @@ -587,7 +630,7 @@ module.exports = async ({ github, context, core, dry }) => { state: 'open', sort: 'created', direction: 'asc', - per_page: 50, + per_page: 100, after: cursor, }) diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js index 5f536579f22c..688a7928fe97 100644 --- a/ci/github-script/merge.js +++ b/ci/github-script/merge.js @@ -80,6 +80,7 @@ function runChecklist({ return { checklist, + eligible, result, } } @@ -109,10 +110,6 @@ async function handleMergeComment({ github, body, node_id, reaction }) { ) } -// Caching the list of team members saves API requests when running the bot on the schedule and -// processing many PRs at once. -const members = {} - async function handleMerge({ github, context, @@ -122,31 +119,14 @@ async function handleMerge({ pull_request, events, maintainers, + getTeamMembers, + getUser, }) { const pull_number = pull_request.number - function getTeamMembers(team_slug) { - if (context.eventName === 'pull_request') { - // We have no chance of getting a token in the pull_request context with the right - // permissions to access the members endpoint below. Thus, we're pretending to have - // no members. This is OK; because this is only for the Test workflow, not for - // real use. - return new Set() - } - - if (!members[team_slug]) { - members[team_slug] = github - .paginate(github.rest.teams.listMembersInOrg, { - org: context.repo.owner, - team_slug, - per_page: 100, - }) - .then((members) => new Set(members.map(({ id }) => id))) - } - - return members[team_slug] - } - const committers = await getTeamMembers('nixpkgs-committers') + const committers = new Set( + (await getTeamMembers('nixpkgs-committers')).map(({ id }) => id), + ) const files = await github.paginate(github.rest.pulls.listFiles, { ...context.repo, @@ -168,14 +148,15 @@ async function handleMerge({ // Ignore comments where the user has been deleted already. user && // Ignore comments which had already been responded to by the bot. - !events.some( - ({ event, body }) => - ['commented'].includes(event) && - // We're only testing this hidden reference, but not the author of the comment. - // We'll just assume that nobody creates comments with this marker on purpose. - // Additionally checking the author is quite annoying for local debugging. - body.match(new RegExp(`^$`, 'm')), - ), + (dry || + !events.some( + ({ event, body }) => + ['commented'].includes(event) && + // We're only testing this hidden reference, but not the author of the comment. + // We'll just assume that nobody creates comments with this marker on purpose. + // Additionally checking the author is quite annoying for local debugging. + body.match(new RegExp(`^$`, 'm')), + )), ) async function merge() { @@ -184,32 +165,9 @@ async function handleMerge({ return 'Merge completed (dry)' } - // Using GraphQL's enablePullRequestAutoMerge mutation instead of the REST - // /merge endpoint, because the latter doesn't work with Merge Queues. - // This mutation works both with and without Merge Queues. - // It doesn't work when there are no required status checks for the target branch. - // All development branches have these enabled, so this is a non-issue. - try { - await github.graphql( - `mutation($node_id: ID!, $sha: GitObjectID) { - enablePullRequestAutoMerge(input: { - expectedHeadOid: $sha, - pullRequestId: $node_id - }) - { clientMutationId } - }`, - { node_id: pull_request.node_id, sha: pull_request.head.sha }, - ) - return 'Enabled Auto Merge' - } catch (e) { - log('Auto Merge failed', e.response.errors[0].message) - } - - // TODO: Observe whether the below is true and whether manual enqueue is actually needed. - // Auto-merge doesn't work if the target branch has already run all CI, in which - // case the PR must be enqueued explicitly. - // We now have merge queues enabled on all development branches, thus don't need a - // fallback after this. + // Using GraphQL mutations instead of the REST /merge endpoint, because the latter + // doesn't work with Merge Queues. We now have merge queues enabled on all development + // branches, so we don't need a fallback for regular merges. try { const resp = await github.graphql( `mutation($node_id: ID!, $sha: GitObjectID) { @@ -227,6 +185,25 @@ async function handleMerge({ return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge` } catch (e) { log('Enqueing failed', e.response.errors[0].message) + } + + // If required status checks are not satisfied, yet, the above will fail. In this case + // we can enable auto-merge. We could also only use auto-merge, but this often gets + // stuck for no apparent reason. + try { + await github.graphql( + `mutation($node_id: ID!, $sha: GitObjectID) { + enablePullRequestAutoMerge(input: { + expectedHeadOid: $sha, + pullRequestId: $node_id + }) + { clientMutationId } + }`, + { node_id: pull_request.node_id, sha: pull_request.head.sha }, + ) + return 'Enabled Auto Merge' + } catch (e) { + log('Auto Merge failed', e.response.errors[0].message) throw new Error(e.response.errors[0].message) } } @@ -265,7 +242,7 @@ async function handleMerge({ } } - const { result, checklist } = runChecklist({ + const { result, eligible, checklist } = runChecklist({ committers, events, files, @@ -295,6 +272,18 @@ async function handleMerge({ '', ] + if (eligible.size > 0 && !eligible.has(comment.user.id)) { + const users = await Promise.all( + Array.from(eligible, async (id) => (await getUser(id)).login), + ) + body.push( + '> [!TIP]', + '> Maintainers eligible to merge are:', + ...users.map((login) => `> - ${login}`), + '', + ) + } + if (result) { await react('ROCKET') try { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b955f0b08460..e1872cc3e4b3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -587,7 +587,7 @@ }; adamperkowski = { name = "Adam Perkowski"; - email = "adas1per@protonmail.com"; + email = "me@adamperkowski.dev"; matrix = "@xx0a_q:matrix.org"; github = "adamperkowski"; githubId = 75480869; diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index a39e81a5a5ec..ba2c1be37c52 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -231,6 +231,14 @@ in ''; }; + openInternalFirewall = mkOption { + type = bool; + default = true; + description = '' + Opens up internal firewall ports for the NetBird's network interface. + ''; + }; + hardened = mkOption { type = bool; default = true; @@ -502,8 +510,11 @@ in interfaces = listToAttrs ( toClientList (client: { name = client.interface; - value.allowedUDPPorts = optionals client.openFirewall [ - 5353 # required for the DNS forwarding/routing to work + value.allowedUDPPorts = optionals client.openInternalFirewall [ + # note: those should be opened up by NetBird itself, but it needs additional + # NixOS -specific debugging and tweaking before it works + 5353 # <0.59.0 DNS forwarder port, kept for compatibility with those clients + 22054 # >=0.59.0 DNS forwarder port ]; }) ); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 69bedeaef989..1a5b850fe551 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4514,8 +4514,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.320.4"; - hash = "sha256-ZuJX2ybmBDya0eCvIYx90JcGweHLiWanr72xItQpSXY="; + version = "3.321.0"; + hash = "sha256-GIszVwrS0brC+3jT+48zUa0E2Q+DUau/WuoOfRDobb8="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 073dfde6be65..5b6bdc7566e4 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.32.0"; - hash = "sha256-Lf7sg67i0FFvHSZ9Cw6RT+ECzFF+lNYH2hxzrss1+fg="; + version = "1.32.1"; + hash = "sha256-nipb8ilZ43V/7WnDO0Lo7ctFdjAmHtH0WUkupFUSlMQ="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index f6708469edda..ce0d83ce9482 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "144.0-1", + "packageVersion": "144.0.2-1", "source": { - "rev": "144.0-1", - "hash": "sha256-5LE8VUKQUua8l/mZN8a7MQCr3uPWJuFZ2WfhJyt14bE=" + "rev": "144.0.2-1", + "hash": "sha256-cSuLUia4hlpSKrl+smWiDg1MUKOwymhizkAwc9ReEXs=" }, "firefox": { - "version": "144.0", - "hash": "sha512-4fkk7QBqMfUzPqavIZwfuQ1IZuWImsY0wySj6AsEKn4LK5rreYZy6hpDT7+Bf8C4KhLsD7QFpI46LKIcw5REXg==" + "version": "144.0.2", + "hash": "sha512-h+66urLIXrMrLRFh5SD1bicaSJPIzU2CJfx7SYqYg0ljFYVKdYR4+07dBhZ0qffAUD6bnw60UDsfiSA3dNAvlw==" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d4479da25c77..d1fc79a3f23b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1246,13 +1246,13 @@ "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320=" }, "spotinst_spotinst": { - "hash": "sha256-h1GtNFwf5zVM3/0AJHpyF9GpMm1pbPbNkEconmrthpk=", + "hash": "sha256-IcphMRvrv762wF1GxPAOyv/z6M+Cor9BEL0llKdr5n8=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.229.0", + "rev": "v1.230.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-45cgtu5LzP3ydkHl3RpB0tw0Lz101bL1TpTKl0pnyKc=" + "vendorHash": "sha256-mcsiXXueAETbv3KIJiAw7xtGAWiaXAXPo1JTNhLao5s=" }, "statuscakedev_statuscake": { "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", @@ -1264,11 +1264,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic_sumologic": { - "hash": "sha256-0vWAKROcci1v9QRnBEyN5o9kD3c3YYAKimixRbC3mpk=", + "hash": "sha256-5b+hCWXyafLeCA7F5RlUj2GpO7Ipy8UVAQxjQaoYnJA=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.1.6", + "rev": "v3.1.7", "spdx": "MPL-2.0", "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, @@ -1417,13 +1417,13 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-99pSx2zKOJDQwSlmPevekEtqIadjHcOfG6txvAiXKWc=", + "hash": "sha256-I3x6oiyM29xAvvsrDF8WfZLvgA5bmdta8yDAxeNjTvM=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.37.0", + "rev": "v2.38.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-l+tyBusD3aN1bHNSlHbBZtxr+lA0HAqAXYg/fT0z0iE=" + "vendorHash": "sha256-6kRbFB8KCvh8kbSy557AJn5BvYs2e0iBqbWvtVFXPrI=" }, "venafi_venafi": { "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", @@ -1489,13 +1489,13 @@ "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8=" }, "wgebis_mailgun": { - "hash": "sha256-fuJnzloJa0S1r3/22Wecbq1oF8oRQP2nrrmwCONHITA=", + "hash": "sha256-/AYzQgMWo2cPjEMlrOSZLn4IVq4At09KFXkIpc7L5p0=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.7.7", + "rev": "v0.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Y6zsbhLNehO3i/BRjKggVhcM15Qesbd6HbARFH/arM8=" + "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { "hash": "sha256-jzACS+vNAiUp7GJt3jO8lTbQZpSj5vUhB1aD0iRi6Gk=", diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh index 53503194cfa4..83dda99f33cd 100644 --- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh +++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh @@ -10,9 +10,9 @@ declare -g composerNoPlugins declare -g composerNoScripts declare -ga composerFlags=() -[[ -n "$composerNoDev" ]] && composerFlags+=(--no-dev) -[[ -n "$composerNoPlugins" ]] && composerFlags+=(--no-plugins) -[[ -n "$composerNoScripts" ]] && composerFlags+=(--no-scripts) +[[ -n "${composerNoDev-}" ]] && composerFlags+=(--no-dev) +[[ -n "${composerNoPlugins-}" ]] && composerFlags+=(--no-plugins) +[[ -n "${composerNoScripts-}" ]] && composerFlags+=(--no-scripts) preConfigureHooks+=(composerVendorConfigureHook) preBuildHooks+=(composerVendorBuildHook) diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix index 42bca9f7bb98..91a4425ffda5 100644 --- a/pkgs/by-name/ak/aks-mcp-server/package.nix +++ b/pkgs/by-name/ak/aks-mcp-server/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "aks-mcp-server"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "Azure"; repo = "aks-mcp"; rev = "v${finalAttrs.version}"; - hash = "sha256-RWBZevNiWbG4luw70gXIvyk+IQkH6xIDBd7uD8eq3r8="; + hash = "sha256-VkX9zqR10h5bvFAfnNpei3f89dv7RQoZysjSRvxkdHQ="; }; - vendorHash = "sha256-8EV8cqta0DVrRFtig+Rx8SWxgAl6qu9wVVLWRhtl6N4="; + vendorHash = "sha256-qN7qqzMnl3l3Z40Mfv9jNWP7Ux7bgDCxKm+QocoruRk="; subPackages = [ "cmd/aks-mcp" ]; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 86feba867250..5be8284b0124 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "automatic-timezoned"; - version = "2.0.96"; + version = "2.0.101"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y2dx0Y5wfYXewJkf7W2YgupdTfwsJg7MTPsFpLmJ9k8="; + sha256 = "sha256-OiBFFXdaBYBSToEzWafxNLBC12J1f3mO7DMzKESRxSY="; }; - cargoHash = "sha256-c5KDy767GxZwTwrcjsnfEQVlFiYxmjSdpFx07ymMtBE="; + cargoHash = "sha256-vX7QGLPuU08KhAJUujgqtPmzW3Ji38W1YiEZ4KbI2mE="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 7a20ab396ca6..1fc98aaabd9b 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-RfXX6LZrxQmWtjnMVIpCj9KVn5fnvQRGgEeH+gTR0Vk="; + hash = "sha256-M7OO2yO5BvNTqJLI50g25M5aupdOxmlZ3eealmP51Kc="; }; - cargoHash = "sha256-0N2JLENHG6QUcEtw237Oe/fwdgo87DVJ+Gx6wtpP9BU="; + cargoHash = "sha256-DwQGmdSzEjzqfsvqczAMJfi9gJjK2b9FAGmMi7rGKuw="; meta = with lib; { description = "Cross compile Cargo project to Windows MSVC target with ease"; diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 80d267e35b8b..bd243df7ba47 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -37,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.489"; + version = "3.2.490"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-uh6yp3hPRv9+EtJbsN6cnOQeDNzlJNJOHeJeGmKP8rQ="; + hash = "sha256-QK4dPF+3F53chmN2WSDkVkrnB+XFSAKWuxqQe1M8nu8="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index 53ad8758f507..57dcb3ee9407 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -1,8 +1,8 @@ { lts ? false, version, + rev, hash, - nixUpdateExtraArgs ? [ ], }: { @@ -34,6 +34,7 @@ in llvmStdenv.mkDerivation (finalAttrs: { pname = "clickhouse"; inherit version; + inherit rev; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -127,6 +128,36 @@ llvmStdenv.mkDerivation (finalAttrs: { cargoSetupPostPatchHook() { true; } ''; + # Set the version the same way as ClickHouse CI does. + # + # https://github.com/clickhouse/clickhouse/blob/31127f21f8bb7ff21f737c4822de10ef5859c702/ci/jobs/scripts/clickhouse_version.py#L11-L20 + # https://github.com/clickhouse/clickhouse/blob/31127f21f8bb7ff21f737c4822de10ef5859c702/ci/jobs/build_clickhouse.py#L179 + preConfigure = + let + gitTagName = finalAttrs.version; + versionStr = builtins.elemAt (lib.splitString "-" gitTagName) 0; + + parts = lib.splitVersion versionStr; + + major = builtins.elemAt parts 0; + minor = builtins.elemAt parts 1; + patch = builtins.elemAt parts 2; + + # The full commit hash is already available here: + gitHash = rev; + in + '' + cat <<'EOF' > cmake/autogenerated_versions.txt + SET(VERSION_REVISION 0) + SET(VERSION_MAJOR ${major}) + SET(VERSION_MINOR ${minor}) + SET(VERSION_PATCH ${patch}) + SET(VERSION_GITHASH ${gitHash}) + SET(VERSION_DESCRIBE ${gitTagName}) + SET(VERSION_STRING ${versionStr}) + EOF + ''; + cmakeFlags = [ "-DENABLE_CHDIG=OFF" "-DENABLE_TESTS=OFF" @@ -176,9 +207,11 @@ llvmStdenv.mkDerivation (finalAttrs: { passthru = { tests = if lts then nixosTests.clickhouse-lts else nixosTests.clickhouse; - updateScript = nix-update-script { - extraArgs = nixUpdateExtraArgs; - }; + updateScript = [ + ./update.sh + + (if lts then ./lts.nix else ./package.nix) + ]; }; meta = with lib; { @@ -186,8 +219,6 @@ llvmStdenv.mkDerivation (finalAttrs: { description = "Column-oriented database management system"; license = licenses.asl20; maintainers = with maintainers; [ - orivej - mbalatsko thevar1able ]; diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index 01b70a91dda8..ed949f77f551 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,11 +1,6 @@ import ./generic.nix { version = "25.8.10.7-lts"; + rev = "02ec3a1ea1e08fb18d2d9638f00b2b557fa1cc1c"; hash = "sha256-EOZ2AfeBeXAWQqa25eQX3loE+xegt03lsCU1aQt/Ebs="; lts = true; - nixUpdateExtraArgs = [ - "--version-regex" - "^v?(.*-lts)$" - "--override-filename" - "pkgs/by-name/cl/clickhouse/lts.nix" - ]; } diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index 50f05896dd39..6752d05e2f9f 100644 --- a/pkgs/by-name/cl/clickhouse/package.nix +++ b/pkgs/by-name/cl/clickhouse/package.nix @@ -1,11 +1,6 @@ import ./generic.nix { version = "25.9.4.58-stable"; + rev = "08afb4f28eefe01513442c3647a2e00b703d5922"; hash = "sha256-HRbqVSyDuvhkv0+PSgps9AXKdLlukrLA65OLx5gZ3c0="; lts = false; - nixUpdateExtraArgs = [ - "--version-regex" - "^v?(.*-stable|.*-lts)$" - "--override-filename" - "pkgs/by-name/cl/clickhouse/package.nix" - ]; } diff --git a/pkgs/by-name/cl/clickhouse/update.sh b/pkgs/by-name/cl/clickhouse/update.sh new file mode 100755 index 000000000000..7ca2b419d322 --- /dev/null +++ b/pkgs/by-name/cl/clickhouse/update.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fetchgithub() { + set +eo pipefail + nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g' + set -eo pipefail +} + +fname="$1" +echoerr "Working on $fname" +shift + +# Fetch latest tags from the repo, leave only stable and lts, use version sort in reverse order. +all_tags=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} https://api.github.com/repos/ClickHouse/ClickHouse/tags \ + | jq -r '.[].name | select(test("-(stable|lts)$"))' \ + | sort -Vr) + +# Fail if no tags found +if [[ -z "$all_tags" ]]; then + echoerr "Error: no suitable tag found in ClickHouse repo" + exit 1 +fi + +pname="clickhouse" +if [[ "$fname" == *lts.nix ]]; then + all_tags=$(echo "$all_tags" | grep -- "-lts$") + pname="clickhouse-lts" +fi + +latest_tag=$(echo "$all_tags" | head -n1) +version=${latest_tag##v} + +# Do nothing if latest version is already there. +if grep -q "version = \"$version\"" "$fname"; then + echoerr "Version $version is already the latest in $fname" + exit 0 +fi + +echoerr "Latest tag for $fname: $latest_tag (version $version)" + +# Get the annotated tag commit SHA. +rev=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/clickhouse/clickhouse/git/ref/tags/$latest_tag" \ + | jq -r '.object.sha') +rev=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/clickhouse/clickhouse/git/tags/$rev" \ + | jq -r '.object.sha') +echoerr "Resolved commit hash for tag $latest_tag: $rev" + +# Update version. +sed -i -E "s@(version = \").*(\";)@\1$version\2@" "$fname" +grep -q "$version" "$fname" + +# Update Git hash. +sed -i -E "s@(rev = \").*(\";)@\1$rev\2@" "$fname" +grep -q "$rev" "$fname" + +# Update source hash. +# First, put lib.fakeHash value. +tmp_src_hash="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" +sed -i -E "s@(hash = \").*(\";)@\1$tmp_src_hash\2@" "$fname" +grep -q "$tmp_src_hash" "$fname" + +# Next, we need to run actual build due to presence of postFetch script. +echoerr "Running fetchFromGitHub on $pname to get new sources hash" + +src_hash=$(fetchgithub "$pname.src") +if [[ -z "$src_hash" ]]; then + echoerr "Error: failed to get source hash from nix-build" + exit 1 +fi + +# Finally, update the source hash. +echoerr "New src hash: $src_hash" +sed -i -E "s@(hash = \").*(\";)@\1$src_hash\2@" "$fname" +grep -q "$src_hash" "$fname" diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix index b81deb83009f..8c62003995aa 100644 --- a/pkgs/by-name/co/codecrafters-cli/package.nix +++ b/pkgs/by-name/co/codecrafters-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "codecrafters-cli"; - version = "43"; + version = "44"; src = fetchFromGitHub { owner = "codecrafters-io"; repo = "cli"; tag = "v${version}"; - hash = "sha256-B7vxBl4y2gS4iEmER4Cq1D7yDGFW3Q4DRL+aJESMOMs="; + hash = "sha256-eyKQMMF9EEF55r+Q1QcqiswctXCqetgnAKQJTwaC60s="; # A shortened git commit hash is part of the version output, and is # needed at build time. Use the `.git` directory to retrieve the # commit SHA, and remove the directory afterwards since it is not needed diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 3ad40692ed3e..2adaac5b209d 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2025-10"; + version = "2025-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-jn3ogitAoSYSa4tQQFewQ7+wj1Z8/j/XJ9lvF4D+LSs="; + hash = "sha256-1Je/L9NFN83Suzl+qvbJE5gzUitx6Iin5O0VqqjgecI="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index 74955e0b5afb..5185ee6f7c34 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2025-10"; + version = "2025-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-3DTgkx2UJ46Si6r30kNAbkQtgf9tT8ViDiW9b6u1YLU="; + hash = "sha256-CG29ARDYz1PU5JoIvybLUWuckufMk16/vzPj5H0h7V0="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index e5a52d2b1d60..1c484c2f8224 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2025-10"; + version = "2025-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-pGhn+UAyzhLWG5k1O3MyJ6EEDeGt4v38bt73e6HoPz0="; + hash = "sha256-oOLvy3Le+ybHa3z2AGcmXdjUrfOxhguq8bRkyQh7MnI="; }; dontUnpack = true; @@ -29,7 +29,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Free IP to Country Lite database by DB-IP"; homepage = "https://db-ip.com/db/download/ip-to-country-lite"; license = lib.licenses.cc-by-40; - maintainers = with lib.maintainers; [ nickcao ]; + maintainers = with lib.maintainers; [ + nickcao + Guanran928 + ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix index 74e9cba939ec..2c659c4cfe88 100644 --- a/pkgs/by-name/dd/ddns-go/package.nix +++ b/pkgs/by-name/dd/ddns-go/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.13.0"; + version = "6.13.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = "ddns-go"; rev = "v${version}"; - hash = "sha256-JGwTYvV0ZyT6gKAaoVPxyIPQzfFBWKkzTdwtMk/bSPc="; + hash = "sha256-Jko5cVcCMrBsfcOOSh6ETlk1jdTCbSj1zOgTwhXnxzQ="; }; vendorHash = "sha256-URPCqItQ/xg8p0EdkMS6z8vuSJ1YaCicsvyb+Jvj2CU="; diff --git a/pkgs/by-name/di/dinish/package.nix b/pkgs/by-name/di/dinish/package.nix index 93ecb7c364bc..15d04fb41e95 100644 --- a/pkgs/by-name/di/dinish/package.nix +++ b/pkgs/by-name/di/dinish/package.nix @@ -7,12 +7,12 @@ stdenvNoCC.mkDerivation rec { pname = "dinish"; - version = "4.006"; + version = "4.007"; src = fetchzip { url = "https://github.com/playbeing/dinish/releases/download/v${version}/dinish-ttf.zip"; stripRoot = false; - hash = "sha256-IWguCiDSeQ+f/saNoyk2pUF/k0pEiFweXinoqOEVWEI="; + hash = "sha256-u/AYA9/8piZ6hz4XD3uSruOM0deeXQ5Gb0N/8rlDiP0="; }; installPhase = '' diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index f6f0c720a8ff..5e77de59c0b9 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.51.0"; + version = "1.51.1"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${version}"; - hash = "sha256-vRvcsh4b/QlU+f7646t8O5F8VT/K6zBxbUpos+hh0fw="; + hash = "sha256-oXq3OfMPmfbBr5wfumiql8uX+tkCtJJ5W0CT6M3cBp8="; }; - npmDepsHash = "sha256-AT9ZE7ip63t6vK/GBVM9JCmir68jrxMN54RoREmjSIk="; + npmDepsHash = "sha256-scRpNiBwZBtaYTpepNw+OsMS6Dy1uUq/hkH++cr2qRQ="; dontNpmBuild = true; diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix index 277747f7f846..d9b31f7d4fb6 100644 --- a/pkgs/by-name/fa/famistudio/package.nix +++ b/pkgs/by-name/fa/famistudio/package.nix @@ -29,13 +29,13 @@ let in buildDotnetModule (finalAttrs: { pname = "famistudio"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "BleuBleu"; repo = "FamiStudio"; tag = finalAttrs.version; - hash = "sha256-A4tC1khtCLTfacdEq5z8ulRzhoItNgBe438TAaPdyLA="; + hash = "sha256-DUXIQIZa0Ppr4EtvDKN5T3XZoc8rBILn+mVnjFGxlxA="; }; postPatch = diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix index 114470ea490b..ed0e0eb80b57 100644 --- a/pkgs/by-name/fn/fn-cli/package.nix +++ b/pkgs/by-name/fn/fn-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.44"; + version = "0.6.45"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-UfvBkUZ09mKM+84e89VFE+KZr0ora8eUWiJlYO11USQ="; + hash = "sha256-iW59tennUgDfYhMGbzdLizo3u+bROWOGbeAl319lsHk="; }; vendorHash = null; diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index 9f3881dfdcca..0565b0c2b251 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gh"; - version = "2.82.1"; + version = "2.83.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${version}"; - hash = "sha256-WoxPqrh8SLptoG3qRvJbNRSYJE3GMJE7KufwSLGSvtA="; + hash = "sha256-WcD2q7Lnqmz8frFjZKAgN55Khgc1uVMzEbVBGoQc3Mc="; }; - vendorHash = "sha256-vO/r74h4GJB1q3u429Gto9B621EHZ9rhzHJWtWK6Xh0="; + vendorHash = "sha256-sLCqUqo/0qsLpHjH81tJ/M2LD0X/kr8hToDFgZ8/wP8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix index a0b24a86b2fa..007f8d564c82 100644 --- a/pkgs/by-name/gr/grml-zsh-config/package.nix +++ b/pkgs/by-name/gr/grml-zsh-config/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.24"; + version = "0.19.25"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-DUkj/5LD85h3J+PIVAfsGY0fkktAgWn93Y3hnRrn/wk="; + sha256 = "sha256-jUdgigqK6j7Tn/Gl737iNSitUyp7uWrXfRyCBxUSD/0="; }; strictDeps = true; diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 3e8338697784..62e5b0e9f53d 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -45,27 +45,26 @@ makeBinaryWrapper, autoSignDarwinBinariesHook, cairo, - fetchpatch, }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.43.1"; + version = "0.44.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-Wd61Q1sG55oDxPuHJpmvSWuptwJIuzgn2sB/dzNRc1c="; + hash = "sha256-5MBYj1d/KhTFcijLMLXpmHPeuSAXuOjzjganUpWnVF4="; }; goModules = (buildGo124Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-bjtzvEQmpsrwD0BArw9N6/HqMB3T5xeqxpx89FV7p2A="; + vendorHash = "sha256-Afk/I/+4KHcFJ4r3/RSs+G5V6aTa+muwERoMD0wi6Io="; }).goModules; buildInputs = [ diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix index fadb4f0bff61..ee4303e2a6a0 100644 --- a/pkgs/by-name/lg/lgogdownloader/package.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lgogdownloader"; - version = "3.17"; + version = "3.18"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; tag = "v${finalAttrs.version}"; - hash = "sha256-rERcwPVuioZT4lqw4SUaM0TQIks6ggA5x8fuI+1GAsk="; + hash = "sha256-dVEV2smZxB6+Utm9FApiFydAS3hLm4y9YZja1B/PiEk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 182dc31997ef..85a103157e1a 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-a0WaF9myP0xjTjfum+K7Wk86HOZP00kvjOYLmeEQdxk="; + hash = "sha256-saqxH7SyDpdfwC+69oBXQGSXowqpSnbQXsPgPGeVvHI="; }; - vendorHash = "sha256-hYetTszLS/zYQ39wOv+sP8HlIiyBoKI3Z7XpOrffHa8="; + vendorHash = "sha256-U+epe3zEq28UNJkcABlOg9URfxl1hlRWrcqwYnn78uE="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/lz/lzham/package.nix b/pkgs/by-name/lz/lzham/package.nix index 025ac6ab6144..3daa1a6307ec 100644 --- a/pkgs/by-name/lz/lzham/package.nix +++ b/pkgs/by-name/lz/lzham/package.nix @@ -5,29 +5,38 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lzham"; - version = "1.0"; + version = "1.0-unstable-2023-05-14"; src = fetchFromGitHub { owner = "richgel999"; - repo = "lzham_codec"; - rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}_release"; - sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v"; + repo = "lzham_codec_devel"; + rev = "d09fc6676a0313c3814457fbc76351a68f653092"; + hash = "sha256-zKzz4gEB2dkIIAuDhKGWeV1hn8tCMVILsiQ/gu6aAEE="; }; nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir -p $out/bin - cp ../bin_linux/lzhamtest $out/bin + cmakeFlags = [ + "-DCMAKE_SKIP_RPATH=ON" + ]; + + postPatch = '' + substituteInPlace {./,lzhamcomp/,lzhamdecomp/,lzhamdll/,lzhamtest/}CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" ''; - meta = with lib; { + postInstall = '' + mkdir -p $out/bin + cp lzhamtest/lzhamtest $out/bin/ + ''; + + meta = { description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed"; mainProgram = "lzhamtest"; homepage = "https://github.com/richgel999/lzham_codec"; - license = with licenses; [ mit ]; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix index 7b8af54e3148..14a0477cf157 100644 --- a/pkgs/by-name/md/mdns-scanner/package.nix +++ b/pkgs/by-name/md/mdns-scanner/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdns-scanner"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "CramBL"; repo = "mdns-scanner"; tag = "v${finalAttrs.version}"; - hash = "sha256-0MHt/kSR6JvfCk08WIDPz6R9YYzDJ9RRTM6MU6sEwHk="; + hash = "sha256-twEzu9GpyhmFFA1vo7fufROku0ZJE+K8g5lHOJn7/VA="; }; - cargoHash = "sha256-oJSsuU1vkisDISnp+/jFs1cWEVxr586l8yHbG6fkPjQ="; + cargoHash = "sha256-bqAhhdy4ekgYc5PCrfQtr3PirMxY44BnIP/JVsNW1S0="; meta = { homepage = "https://github.com/CramBL/mdns-scanner"; diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index b1f6d2d8e615..04b15ca9bdb6 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.14.9"; + version = "1.14.14"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; tag = "v${version}"; - hash = "sha256-4d7/RxL8+ZJXnoU2zOl6W6f5/KsuqrS95IYttC81zVA="; + hash = "sha256-5tugmwr1TyBa89a/yrch+cshyoiJ3uj4EoweltN5d/0="; }; - vendorHash = "sha256-2DlhNr1P6NEeV5IIum19LWufFlOcXxfLH93k3jkwnDA="; + vendorHash = "sha256-pLhc3Lc8Mp5ZRmNvac3qdQcw1rPQs7bbn4K0UHp04Qs="; ldflags = [ "-s" diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index b412839c20ee..984e77fe6d98 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "0-unstable-2025-10-31"; + version = "0-unstable-2025-11-03"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "91a03818a6eb45508d042c91cb4cf21a331296f1"; - hash = "sha256-cjyGeTLfv8CpW8OuyPDG3KKYJ6N7u2EUhMFTGTGOIPM="; + rev = "0e56ea3ccab064118f42687772368bc66f03f85e"; + hash = "sha256-D7W0HSiHk5LpZ+y1pZCrEsfYEQPVD9qrrbu+3MhjEYo="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix index ea3bd25ef941..63ec93ce6da5 100644 --- a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix +++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt + # This directly resolves the 'The dependency target "mt32emu" ... does not exist' error. + sed -i -e '/add_dependencies(mt32emu-smf2wav mt32emu)/d' CMakeLists.txt + + substituteInPlace {./,mt32emu_smf2wav/,mt32emu_smf2wav/libsmf/}CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 23ab00db9754..15efa3d48212 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.11.4"; + version = "0.11.5"; __structuredAttrs = true; @@ -103,7 +103,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-IpMHxIDpldg4FXiXPEY2E51DfO/Z5XieKdtesLna9Xw="; + hash = "sha256-OsvLB9kynCbQ8PDQ2VQ+L56iy7pZ0ZP69J2cEG8Ad8A="; }; patches = [ diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix index daa817849c9d..4e1db4155390 100644 --- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix +++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix @@ -9,13 +9,13 @@ }: python3Packages.buildPythonPackage rec { pname = "nix-heuristic-gc"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "risicle"; repo = "nix-heuristic-gc"; tag = "v${version}"; - hash = "sha256-FHA1/zlBUr81wSWL0Cd5DVsxUDuUpD3UuLde8UgxOzQ="; + hash = "sha256-xyenFPMwlDbkWohw+BX84gdLLR3A1/T7E9aH4MwBwXQ="; }; # NIX_SYSTEM suggested at diff --git a/pkgs/by-name/no/nova/package.nix b/pkgs/by-name/no/nova/package.nix index ccc56a7a1cc2..20ceb28d574c 100644 --- a/pkgs/by-name/no/nova/package.nix +++ b/pkgs/by-name/no/nova/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nova"; - version = "3.11.8"; + version = "3.11.9"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "nova"; rev = "v${version}"; - hash = "sha256-2iFDTCjBnMf0FglHTZq9v+yyzCqvrT1vhDkpAL6yG6Y="; + hash = "sha256-5ZZbuWHvPgdpJstYXbDWo3KQkbzMd+a7ttzCg2bJ67o="; }; - vendorHash = "sha256-+cw2NclPLT9S1iakK2S5uc+nFE84MIl6QOH/L0kgoHE="; + vendorHash = "sha256-Q8mYIX5lIFtEOQPaUL0zCEzKAHoCiyt1bRaSb2o+vpI="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 7a986ab99229..2f1ab6fca927 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.10.3"; + version = "1.10.4"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-iP4VzQDScLAiRArVKh9n0AcPXZHPs+xRi4K9S0Z7n48="; + hash = "sha256-4Mi+fjOBwzL3iq57iz4SAESNRCm75gKnZCIsOwTQeAc="; }; - vendorHash = "sha256-421jf8XSCBteKQ7cr7ln/oBJgWxFsIqY+ccwW2R4/ro="; + vendorHash = "sha256-KK/6CNq824PBgAHnPoGza0yvLQ/paa1hznfp5p2GKyY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 3f98171435bf..69d22ea9e841 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.49.0"; + version = "2.50.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-P3tCYmqLnskuBJBgeEvdjkNAqVCFtDUes1CTHoj/k5M="; + sha256 = "sha256-FXoejKKbykNKcWN+4hf3PRdhyZaiZef6c2NsMQK/saQ="; }; - vendorHash = "sha256-VFJfpMVMHUkfH04hBpeoH5lUeW+5eG8V03W0DgcVpDM="; + vendorHash = "sha256-uJR5RjBjSZmoYJNsbbvAabYfRhd9APNHwR8SP+44fC0="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index 9e0cf2aeba9c..f3594c4de5d6 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule (finalAttrs: { pname = "process-compose"; - version = "1.75.2"; + version = "1.76.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = "process-compose"; tag = "v${finalAttrs.version}"; - hash = "sha256-BKf8FrgpGhYzuukAFP+OCjvp5bMCQL6BmZ+Tk/E8RIY="; + hash = "sha256-DYWMtW2JLUbt2Bk/dSBjRc4GHpav0dr8sQOYeBkL/3c="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index e21c24425717..5c32d6d8d4a1 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2025-10-24"; + version = "0-unstable-2025-10-31"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "84e0ab4e3eaebfde0debffd15c925c9c4d06d9f6"; - hash = "sha256-1pOAeXaFna5rBCn2R+nVBUdZdpwAl4/1G+kE9tuXqII="; + rev = "fc98e35232d4698f4947037c5b17a6bb9966a43c"; + hash = "sha256-4Mbm+Oc3qkdUXPbqPmnKzuSBS0BtRk3Yw56lDTCZeik="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix index 04c5650d3dca..739df02ab46d 100644 --- a/pkgs/by-name/re/reth/package.nix +++ b/pkgs/by-name/re/reth/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "reth"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "paradigmxyz"; repo = "reth"; rev = "v${version}"; - hash = "sha256-Z84zCt/v6e++Et6a2hBcHfrzQvtzBEn+Zx1bBRJfiqM="; + hash = "sha256-jyStSIVTQeBJGwNelxHItIjHPQyvg3luGRj0qziZ8u0="; }; - cargoHash = "sha256-KxUiiOTlMNlPw4pHjEcqXsMF3RCA0KVO66WKpz1YoT0="; + cargoHash = "sha256-v7B2W9SSQvUlJQzP/AAffsJq+fP4Ghxr4C5+gB1LE9k="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix index a48dce995f98..ff338d4480df 100644 --- a/pkgs/by-name/ru/rundeck/package.nix +++ b/pkgs/by-name/ru/rundeck/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "rundeck"; - version = "5.16.0-20251006"; + version = "5.17.0-20251103"; src = fetchurl { url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167"; - hash = "sha256-ws84HDqowYz2ouvN7E3SlouGZdZUDVDK4LUmzKXOyec="; + hash = "sha256-Bw/aLsJ65BSr1NDmOWanOm6lsClaYpKdmeGpYiO0KNc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix index d5f5cd9df9df..629b14eac6e2 100644 --- a/pkgs/by-name/sm/smpmgr/package.nix +++ b/pkgs/by-name/sm/smpmgr/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "smpmgr"; - version = "0.14.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "intercreate"; repo = "smpmgr"; tag = version; - hash = "sha256-u69gREyOjQEh5C9XncEXZHvt/wU+WKeGA9/kC0hw4Q0="; + hash = "sha256-PhsJa0Z1EnpFyoI6fEN5opG23xB+JTI1uB2sstuOcTw="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix index 30f173f23310..6da62da38bc4 100644 --- a/pkgs/by-name/sn/sniffnet/package.nix +++ b/pkgs/by-name/sn/sniffnet/package.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sniffnet"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "gyulyvgc"; repo = "sniffnet"; tag = "v${finalAttrs.version}"; - hash = "sha256-EgnFDF+K8qGjunWB20VA8bXLzNvyGzcIaim+smhW5fU="; + hash = "sha256-LqEEh+YqFJkseLdFRfCTIK7Q3Xs0M1u+vVcxpNJntCA="; }; - cargoHash = "sha256-22P1EeZ2FqwIHjr23oJCKvg3ggT1Me93goELwZ/B9S4="; + cargoHash = "sha256-iSQZxZTuSCNIB/725TO9UcvzKyA49DARoYcZh87y1Xs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 54391a206bc9..920059c2e686 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.26"; + version = "3.16.29"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-KQx4CWPfKBJwuBONYSE7AIKa7UBXBvtNVcrOmkPrjkY="; + hash = "sha256-y4JK99EDlDdRgOJj6NkiafVDab6umWJCjupKm9Leekk="; }; outputs = [ diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix index 10f0c8c68cde..3b8e4a2a246a 100644 --- a/pkgs/by-name/sv/svlint/package.nix +++ b/pkgs/by-name/sv/svlint/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.9.4"; + version = "0.9.5"; src = fetchCrate { inherit pname version; - hash = "sha256-YtBI2AnwSyeirHAXRavRKayfAmgXyyCMNhfEbUMXPgk="; + hash = "sha256-RjdhXp9Dm6ZrRfJKsjnzAFgXTIQB3DJmDMwwtQD4Uzw="; }; - cargoHash = "sha256-78v28MEW06AIMZa2lNmql3/3t6bI+HCW48vKzRTDjFQ="; + cargoHash = "sha256-in8DObo5QENl1N36lI16DpEXepFU3Y0BYkJOXinmUjE="; cargoBuildFlags = [ "--bin" diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix index 5cc621dcb9df..ff0671cada78 100644 --- a/pkgs/by-name/sv/svtplay-dl/package.nix +++ b/pkgs/by-name/sv/svtplay-dl/package.nix @@ -22,7 +22,7 @@ let requests-mock ; - version = "4.151"; + version = "4.163"; in @@ -35,7 +35,7 @@ buildPythonApplication { owner = "spaam"; repo = "svtplay-dl"; rev = version; - hash = "sha256-MqV49Xi0pwP8kVXPPmOOYvZpQ6ZtWbeWZc+Qo0i30/g="; + hash = "sha256-2Qge6jmmymIBPWVwaY43h/njlqGzQWPD718gsaIAYx0="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix index eddaf47fa17a..0a2ffe98f742 100644 --- a/pkgs/by-name/to/tokio-console/package.nix +++ b/pkgs/by-name/to/tokio-console/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "tokio-console"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "tokio-rs"; repo = "console"; rev = "tokio-console-v${version}"; - hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA="; + hash = "sha256-mZCYdz0AQhCBqbvcjXNp2bXSKf7tJ/01fz2W4wpjVX8="; }; - cargoHash = "sha256-9jnBgrfB0nWOq2+hfDq3/2Wo4z7WSfBKxoGrQ888lKw="; + cargoHash = "sha256-aF9bylDYeTZOldAK9rl+19xTv0y9AdxCjRfaVRNfR3E="; buildAndTestSubdir = "tokio-console"; diff --git a/pkgs/by-name/ub/ubports-pdk/package.nix b/pkgs/by-name/ub/ubports-pdk/package.nix index a22e26a14fe6..838d63264de8 100644 --- a/pkgs/by-name/ub/ubports-pdk/package.nix +++ b/pkgs/by-name/ub/ubports-pdk/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "ubports-pdk"; - version = "0-unstable-2025-06-23"; + version = "0-unstable-2025-10-29"; src = fetchFromGitHub { owner = "ubports"; repo = "ubports-pdk"; - rev = "f97daec1a96f9427b23e35c8cc12e7c21fe893fd"; - hash = "sha256-s9GC5TiIQSn5JGRy3TU5COdbcW9cDZZ8eQpflSffyOw="; + rev = "10d9e3c09fedefd990c13f7202accef30e59e7ab"; + hash = "sha256-Vb82029iDzHKLgAjUINJHYZRzTWKoJ5+XhcHm4z0k1Y="; }; strictDeps = true; diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 86ed9eb77f8f..43a9ddc37869 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.128.0"; + version = "1.129.1"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-X1TkE0lJNu68iETf8M8U5IZvRadtIPR6LqP61uzhD3Y="; + hash = "sha256-LLiiA+A3s3WcJcwyqRYKFn+VwaEbbufiawZsyG+ibGU="; }; vendorHash = null; diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix index 04f5b615b985..dc3c5e323b53 100644 --- a/pkgs/by-name/vu/vuls/package.nix +++ b/pkgs/by-name/vu/vuls/package.nix @@ -6,17 +6,17 @@ buildGo124Module rec { pname = "vuls"; - version = "0.35.1"; + version = "0.36.2"; src = fetchFromGitHub { owner = "future-architect"; repo = "vuls"; tag = "v${version}"; - hash = "sha256-bgeg5y1wFYDXr2M4yNNWbgKJhtdoUZJRPxpniAXCyRU="; + hash = "sha256-z6hNC8VDsz5gzzA6VP9PFAJAE7dzrZnxHD/TlBu/uxI="; fetchSubmodules = true; }; - vendorHash = "sha256-DUkF1iqofgO9o34owkvQRkV+e7fA0VmeUz1VOPMiZIs="; + vendorHash = "sha256-JO3W8VUQiypQ8AGXTtCIHTNu6PO0kJCPp7LDu+xDqOk="; ldflags = [ "-s" diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 282d07125868..896e588ed300 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "webdav"; - version = "5.8.1"; + version = "5.9.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-byAfcJTzbt2o0vwxKHks6FgrBBlIZY1iKeaWFir5hMU="; + hash = "sha256-W0l9VVgZJujJpxK97wsdMKAp3zAX5GJVwEaOA/SYRW4="; }; vendorHash = "sha256-BHSkSGgL6Ns4kjQV5OaiViIVhnOg1qpdvv4LPhkeAnw="; diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index bb5cde3b09f1..ee7901d6c84c 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zashboard"; - version = "1.107.0"; + version = "1.108.0"; src = fetchFromGitHub { owner = "Zephyruso"; repo = "zashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-VcRMy05vgdJC1eCfHFyxlLB1yR/gRmZv7gvlhC62KjE="; + hash = "sha256-+CSih7AoP9rOkxVBtX+GkEWrpo6mpPy6d/zF5iyVCt4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch index 475655f94a56..bb4bb976df25 100644 --- a/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch +++ b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch @@ -1,7 +1,7 @@ -From f71d88a15f537cbc5ea80ad2922c013553a5caab Mon Sep 17 00:00:00 2001 +From 1bc576196d82b801df4e52548808068c4cb9ab9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Jun 2024 14:43:03 +0200 -Subject: [PATCH 2/2] darwin: disable link-time optimization +Subject: [PATCH 1/2] darwin: disable link-time optimization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -15,18 +15,18 @@ Signed-off-by: Jörg Thalheim 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-mac.mk b/make-mac.mk -index 7af200ad..b388c05a 100644 +index e63fb7f88..3cf0be175 100644 --- a/make-mac.mk +++ b/make-mac.mk -@@ -84,7 +84,7 @@ ifeq ($(ZT_DEBUG),1) +@@ -89,7 +89,7 @@ ifeq ($(ZT_DEBUG),1) node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS) else - CFLAGS?=-Ofast -fstack-protector-strong + CFLAGS?=-O3 -fstack-protector-strong - CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) + CFLAGS+=$(ARCH_FLAGS) -Wall -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) STRIP=strip EXTRA_CARGO_FLAGS=--release RUST_VARIANT=release -- -2.44.1 +2.51.0 diff --git a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch b/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch deleted file mode 100644 index 0db2b4d26fa2..000000000000 --- a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b83e6354de099860bcb1ca3876c222c57de89f0c Mon Sep 17 00:00:00 2001 -From: Michael Hoang -Date: Mon, 10 Feb 2025 18:03:12 +0700 -Subject: [PATCH] rustfsm: remove unsupported `lints.workspace` - -This patch will no longer be necessary when -https://github.com/NixOS/nixpkgs/pull/300532 is merged ---- - fsm/Cargo.toml | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/fsm/Cargo.toml b/fsm/Cargo.toml -index 5e9e1c9..3fda704 100644 ---- a/fsm/Cargo.toml -+++ b/fsm/Cargo.toml -@@ -17,5 +17,3 @@ rustfsm_trait = { version = "0.1", path = "rustfsm_trait" } - [package.metadata.workspaces] - independent = true - --[lints] --workspace = true --- -2.46.0 - diff --git a/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch b/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch new file mode 100644 index 000000000000..2b2c67023b25 --- /dev/null +++ b/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch @@ -0,0 +1,52 @@ +From 5c6f3e6c8c33e23b8bb3fe39b9ce26495724af09 Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer +Date: Sat, 4 Oct 2025 19:27:19 -0700 +Subject: [PATCH 2/2] Support single arch builds on macOS + +Co-Authored-By: Michael Hoang +--- + make-mac.mk | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/make-mac.mk b/make-mac.mk +index 3cf0be175..8da630e90 100644 +--- a/make-mac.mk ++++ b/make-mac.mk +@@ -5,7 +5,8 @@ TOPDIR=$(shell pwd) + INCLUDES=-I$(shell pwd)/rustybits/target -isystem $(TOPDIR)/ext -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/core/include -I$(TOPDIR)/ext-prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/simpleapi/include + DEFS= + LIBS= +-ARCH_FLAGS=-arch x86_64 -arch arm64 ++ARCH := x86_64 arm64 ++ARCH_FLAGS=$(addprefix -arch ,$(ARCH)) + + CODESIGN=echo + PRODUCTSIGN=echo +@@ -79,6 +80,7 @@ endif + # Debug mode -- dump trace output, build binary with -g + ifeq ($(ZT_DEBUG),1) + ZT_TRACE=1 ++ ARCH= + ARCH_FLAGS= + CFLAGS+=-Wall -g $(INCLUDES) $(DEFS) $(ARCH_FLAGS) + STRIP=echo +@@ -156,12 +158,12 @@ rustybits/target/libsmeeclient.a: FORCE + endif + + rustybits/target/libzeroidc.a: FORCE +- cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS) +- cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS) +- cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a ++ if [[ "$(ARCH)" == *"x86_64"* ]]; then cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS); fi ++ if [[ "$(ARCH)" == *"arm64"* ]]; then cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS); fi ++ cd rustybits && lipo -create target/*/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a + + central-controller: +- make ARCH_FLAGS="-arch x86_64" ZT_CONTROLLER=1 one ++ make ARCH=x86_64 ZT_CONTROLLER=1 one + + zerotier-idtool: one + +-- +2.51.0 + diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix index 6b258b96a046..1969a933aef6 100644 --- a/pkgs/by-name/ze/zerotierone/package.nix +++ b/pkgs/by-name/ze/zerotierone/package.nix @@ -12,18 +12,20 @@ rustc, zlib, libiconv, - fetchpatch, + # enableUnfree enables building the zerotier controller, which is subject to + # a source-available license that permits non-commercial use + enableUnfree ? false, }: let pname = "zerotierone"; - version = "1.14.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; tag = version; - hash = "sha256-D+7/ja5uYzH1iNd+Ti3k+dWOf5GvN4U+GuVBA9gxtTc="; + hash = "sha256-bFfRz695sbdZJd5DIfF7j8lbEqWHSaIqHq/AfXZgZ4s="; }; in @@ -33,23 +35,13 @@ stdenv.mkDerivation { cargoDeps = rustPlatform.fetchCargoVendor { inherit src; sourceRoot = "${src.name}/rustybits"; - hash = "sha256-CSpm4zBWKhcrM/KXGU6/51NSQ6hzpT44D2J+QETBtpQ="; - - # REMOVEME when https://github.com/NixOS/nixpkgs/pull/300532 is merged - postBuild = '' - pushd $out/git/730aadcc02767ae630e88f8f8c788a85d6bc81e6 - patch --verbose -p1 <${./0001-rustfsm-remove-unsupported-lints.workspace.patch} - popd - ''; + hash = "sha256-u3gqETbn4I+mtUeSkSym4s+qhA3eDb4Qaq7bl58M+AY="; }; patches = [ ./0001-darwin-disable-link-time-optimization.patch # https://github.com/zerotier/ZeroTierOne/pull/2435 - (fetchpatch { - url = "https://github.com/zerotier/ZeroTierOne/commit/8f56d484b681ea30cd28e19cab34499acfa6e64d.patch"; - hash = "sha256-UplkX2O4o8XKKTlR3ZsSG9E0y5gVhAagyepqwyGEYmA="; - }) + ./0002-Support-single-arch-builds-on-macOS.patch ]; postPatch = '' @@ -112,9 +104,12 @@ stdenv.mkDerivation { buildFlags = [ "all" "selftest" - ]; + ] + ++ lib.optional enableUnfree "ZT_NONFREE=1"; + + # darwin: disabled due to a test which fails to bind to 127.0.0.1 in a sandbox. + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin; - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck ./zerotier-selftest @@ -147,7 +142,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = "https://www.zerotier.com"; - license = licenses.bsl11; + license = if enableUnfree then licenses.unfree else licenses.mpl20; maintainers = with maintainers; [ sjmackenzie zimbatm diff --git a/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix b/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix index 33b817420035..307a7061bc57 100644 --- a/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix +++ b/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: { mkdir ../../build cd ../../build configureScript=../$sourceRoot/configure + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # GNU debuglink is not supported on macOS (Mach-O format) + # Skip the gnudebuglink tests which fail on Darwin + export libbacktrace_cv_objcopy_debuglink=no ''; installPhase = '' diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix index 4a7528a10356..e94c03e658d0 100644 --- a/pkgs/development/cuda-modules/packages/nccl-tests.nix +++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix @@ -20,7 +20,7 @@ let inherit (_cuda.lib) _mkMetaBroken; inherit (lib) licenses maintainers teams; - inherit (lib.attrsets) getBin; + inherit (lib.attrsets) getBin getInclude getLib; inherit (lib.lists) optionals; in backendStdenv.mkDerivation (finalAttrs: { @@ -30,27 +30,21 @@ backendStdenv.mkDerivation (finalAttrs: { # NOTE: Depends on the CUDA package set, so use cudaNamePrefix. name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}"; pname = "nccl-tests"; - version = "2.14.1"; + version = "2.17.6"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl-tests"; rev = "v${finalAttrs.version}"; - hash = "sha256-OgffbW9Vx/sm1I1tpaPGdAhIpV4jbB4hJa9UcEAWkdE="; + hash = "sha256-F7F8UcBCX7nsuCNCzWHNY12QFtmYV10Jf785P39SHkM="; }; postPatch = '' - nixLog "patching $PWD/src/Makefile to remove NVIDIA's ccbin declaration" - substituteInPlace ./src/Makefile \ + nixLog "patching $PWD/src/common.mk to remove NVIDIA's ccbin declaration" + substituteInPlace ./src/common.mk \ --replace-fail \ '-ccbin $(CXX)' \ "" - - nixLog "patching $PWD/src/Makefile to replace -std=c++11 with -std=c++14" - substituteInPlace ./src/Makefile \ - --replace-fail \ - '-std=c++11' \ - '-std=c++14' ''; nativeBuildInputs = [ @@ -65,12 +59,15 @@ backendStdenv.mkDerivation (finalAttrs: { ] ++ optionals mpiSupport [ mpi ]; + # NOTE: CUDA_HOME is expected to have the bin directory + # TODO: This won't work with cross-compilation since cuda_nvcc will come from hostPackages by default (aka pkgs). makeFlags = [ - # NOTE: CUDA_HOME is expected to have the bin directory - # TODO: This won't work with cross-compilation since cuda_nvcc will come from hostPackages by default (aka pkgs). + "CXXSTD=-std=c++17" "CUDA_HOME=${getBin cuda_nvcc}" - "NCCL_HOME=${nccl}" + "CUDA_INC=${getInclude cuda_cudart}/include" + "CUDA_LIB=${getLib cuda_cudart}/lib" "NVCC_GENCODE=${flags.gencodeString}" + "PREFIX=$(out)" ] ++ optionals mpiSupport [ "MPI=1" ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 7ce9c2a95abc..87cb745ee6ec 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202511021"; + version = "0.1.202511041"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-iB5ke9vOdW/OHemITGC7t1i8iQKm5TjytVxRyUjb0Gk="; + hash = "sha256-AHiQzGC+++C60EfP1RRAecHYlmJuziub09kOtIxSQoU="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix index d8de9bfa92b9..769b9ceaa20c 100644 --- a/pkgs/development/python-modules/magika/default.nix +++ b/pkgs/development/python-modules/magika/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "magika"; - version = "0.6.2"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-N+tq6AIPbmjyMbwGBSwKDL6Ob6J0kts0Xo3IZ9vOsGc="; + hash = "sha256-MT+Mv83Jp+VcJChicyMKJzK4mCXlipPeK1dlMTk7g5g="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix index dfc4b6ff41e4..25e4253730c1 100644 --- a/pkgs/development/python-modules/pymitsubishi/default.nix +++ b/pkgs/development/python-modules/pymitsubishi/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pymitsubishi"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "pymitsubishi"; repo = "pymitsubishi"; tag = "v${version}"; - hash = "sha256-oMv+GKdl1H1S5mYUYfTUHuLM5yvkvD44dy9DEsQVAyg="; + hash = "sha256-Uh3hlgXYgGDZDpEJInLX323fftVciwh9fLEKF2Kozq0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index ec3f38b0638d..f865d3d28184 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.44"; + version = "0.0.45"; pyproject = true; src = fetchFromGitHub { owner = "mdz"; repo = "python-smarttub"; tag = "v${version}"; - hash = "sha256-ozOnCJXv99gne59HQEdQfCKZe8HhK2q9vShMuBlSWE8="; + hash = "sha256-r9Ww3isCbgKSWkQPKWzLagPK8+OFeb+zr8Wydft0jJU="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index af6f7942ea0c..e9368b223391 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -6,7 +6,6 @@ numpy, pillow, pooch, - pythonAtLeast, scooby, setuptools, typing-extensions, @@ -15,19 +14,16 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.46.3"; + version = "0.46.4"; pyproject = true; src = fetchFromGitHub { owner = "pyvista"; repo = "pyvista"; tag = "v${version}"; - hash = "sha256-RpgrsNMZmIfx3bb7W9xU6u4gJoAuDQ8Xx9C25TLp6PI="; + hash = "sha256-FFrnLiGiP6LSwaoEHx4tih6XPdKCZ/9tjvz00NQDU0Q="; }; - # remove this line once pyvista 0.46 is released - pythonRelaxDeps = [ "vtk" ]; - build-system = [ setuptools ]; dependencies = [ diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 2ed4e83d2da3..672408051747 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.16.3"; + version = "0.16.4"; pyproject = true; src = fetchFromGitHub { owner = "starkillerOG"; repo = "reolink_aio"; tag = version; - hash = "sha256-lfkQtVnaEge6Upvd73fqBtXf5NQIq7vhTP4IOwWjNBw="; + hash = "sha256-YRawVisHVDW4hm/oqxVNscC/99v02+mTqvmBwLC4l40="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 202e9a2f2917..bc1bddb0e021 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -9,22 +9,19 @@ cryptography, fetchFromGitHub, protobuf, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "1.2.4"; + version = "1.2.5"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-h6MGYzDNzEss5FIf+2J5oROQw/7OVLpkXuheYKd4BrQ="; + hash = "sha256-7Diq7xT8tPO4fXp7qsFXWtWExqm2vctoOtPvlCuWOKg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index 82b27593cd0a..25eab703270c 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.25.0"; + version = "2.25.1"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-fl6WVok11SVQlbX4qu3AwbJldwomCiq27X1Mfqf+gig="; + hash = "sha256-Ez09uRNW5T5LIs33RaOS2MBSc4MnPwTUxr0LCkQyDMo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix index a0ec0df2277b..3e983d5dacfb 100644 --- a/pkgs/development/python-modules/ucsmsdk/default.nix +++ b/pkgs/development/python-modules/ucsmsdk/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ucsmsdk"; - version = "0.9.23"; + version = "0.9.24"; pyproject = true; src = fetchFromGitHub { owner = "CiscoUcs"; repo = "ucsmsdk"; tag = "v${version}"; - hash = "sha256-UVOEJl+oSjf6gaVaa6QWBfEViUPmhgUiSm6rerkZ+EM="; + hash = "sha256-c2Tvm4xMyda9PoL7VWMCo7/RjSVcHBJQMh4GeTzgz5I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index a7556309236e..431813221fe8 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.21.0"; + version = "0.22.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "vt-py"; tag = version; - hash = "sha256-hp9MjFSakFezlT/rTHa70KrL3VShhpayXaK88LxY7I4="; + hash = "sha256-CReFwX/7UCyFWVG/3hXwTVt92x+n+eu3FhvrKtDrgNU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 2c1524627516..fca0c12f9ad0 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.18.0"; + version = "1.19.0"; pyproject = true; src = fetchFromGitHub { owner = "lyz-code"; repo = "yamlfix"; tag = version; - hash = "sha256-g2X9fBUS5wbQJbP29V5pWwrQ1+P/Y8euK4Rv7C6r3WM="; + hash = "sha256-c8vspcouS3r0S/4S210QGYT2XdU3aR0FvUoKaC2WLUM="; }; build-system = [ diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 789639040d18..582b4288f10b 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,352 +1,352 @@ { "aurorae": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/aurorae-6.5.1.tar.xz", - "hash": "sha256-nDDvI4iVQ19V93RNHlQYwQqO7xt52XNBQmJ+VZeKG+w=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/aurorae-6.5.2.tar.xz", + "hash": "sha256-841YVc/6nXop+oA5NLunyKaEckPvdztV8iPoZLedmNM=" }, "bluedevil": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/bluedevil-6.5.1.tar.xz", - "hash": "sha256-MJXnrL4UCeni/hgN1ZFWiPwqJGqvIf/WiL55E+rPug8=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/bluedevil-6.5.2.tar.xz", + "hash": "sha256-SMO0a3mQpM+F+p0HAx5uZkIZA4hml3ki7khkt+fcQ7A=" }, "breeze": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/breeze-6.5.1.tar.xz", - "hash": "sha256-ibmXbCrjdnezbJyIaG7pXsUOpPbtm1d8R7WnEixqUvM=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/breeze-6.5.2.tar.xz", + "hash": "sha256-kHtfBYrKkT7INTeZ332c4MiNzaLRvLv0pTn4iGzweos=" }, "breeze-grub": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/breeze-grub-6.5.1.tar.xz", - "hash": "sha256-3u4ntMB5fL5i2lgcg0yc/Ec7mTuv2bUeLLJNhEVKAvI=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/breeze-grub-6.5.2.tar.xz", + "hash": "sha256-cPqZ3+g1S8xo9Jdy/Yp2HEU8L444vocqSrxc0IQM6GA=" }, "breeze-gtk": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/breeze-gtk-6.5.1.tar.xz", - "hash": "sha256-Gx3ok+uS4cnA/x3WFp1Vw8BipJvSy6spNsFv6PoGAJY=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/breeze-gtk-6.5.2.tar.xz", + "hash": "sha256-xoLa9fYW0D24VleXiSeKocNjLy1U+xCPBOLMgamu/bk=" }, "breeze-plymouth": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/breeze-plymouth-6.5.1.tar.xz", - "hash": "sha256-WSKhstRDkYOMlI84ckkUUI5nUHTksY0BozemblJYHbk=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/breeze-plymouth-6.5.2.tar.xz", + "hash": "sha256-l8x40alOENpET+Ne04RBucOIdER6RNy5z1NbQveJo3A=" }, "discover": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/discover-6.5.1.tar.xz", - "hash": "sha256-euUVqa013W21aOwj3F7GwkwcVV3fQS8EHt5L6dzz88w=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/discover-6.5.2.tar.xz", + "hash": "sha256-GYgdD1yXUdlZ8uzvS09opwswSmyXy1V5+kqsl8uvJEo=" }, "drkonqi": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/drkonqi-6.5.1.tar.xz", - "hash": "sha256-pSYFVQEOV2KB0wQXZCctUSX110+N8/cX/CzRmaH2nH0=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/drkonqi-6.5.2.tar.xz", + "hash": "sha256-G5Gd4KutbzSMKCB6qfpGy6WZL1Gx00lNke6WukdVT+g=" }, "flatpak-kcm": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/flatpak-kcm-6.5.1.tar.xz", - "hash": "sha256-o6y3kVVzyUJb+qdcENrroNxMgU2ecY7XVq1D12ZtlbY=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/flatpak-kcm-6.5.2.tar.xz", + "hash": "sha256-HwsfFZ0kD1Cq+hs3xnZ4ukSrMI1gJAhKUEswyGIMrIU=" }, "kactivitymanagerd": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kactivitymanagerd-6.5.1.tar.xz", - "hash": "sha256-Skge3EiRK1XeNk8WirpbXNICJjpMn9aOYz5QADaleCk=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kactivitymanagerd-6.5.2.tar.xz", + "hash": "sha256-kzK18PyG+AakgLtFESaTqD35BtuOrdwkF0Wemm18320=" }, "kde-cli-tools": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kde-cli-tools-6.5.1.tar.xz", - "hash": "sha256-dGYdjccaNFuQZRd1mAsK06+yiBlK8GqjOrxpjgGD4sM=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kde-cli-tools-6.5.2.tar.xz", + "hash": "sha256-g08dpx7G+estBWAhgICg8CoAzWYJye1UZAEXAMKKChw=" }, "kde-gtk-config": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kde-gtk-config-6.5.1.tar.xz", - "hash": "sha256-dqJ+aMXb0z8XavtJ21DwnBElIf0lqAUx9EdZUz4I2U0=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kde-gtk-config-6.5.2.tar.xz", + "hash": "sha256-zDfNNAG+DOZ2ZjyLohQT96P7Msc7aE8i0XKmKt5OjSk=" }, "kdecoration": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kdecoration-6.5.1.tar.xz", - "hash": "sha256-tZQC0jv8mWpXWvU/aTl3hGyX9sGpyTSvqVrCzv01jCQ=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kdecoration-6.5.2.tar.xz", + "hash": "sha256-KWPcRP8rHMfqRMuzgA01xNC86teDcoF5r9pQTMBhFXY=" }, "kdeplasma-addons": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kdeplasma-addons-6.5.1.tar.xz", - "hash": "sha256-pLGc1rKKulcxWOh4yUm6qSfrp3/raZH0N9R9Q5KQ/58=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kdeplasma-addons-6.5.2.tar.xz", + "hash": "sha256-k1scookMqwPvm/DKzI+1pgRPpohIfUtg+XqyOaO5VoQ=" }, "kgamma": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kgamma-6.5.1.tar.xz", - "hash": "sha256-A90ydZsEziJamA8GB4+ze5WDivDLiDplFC+nUxpKcOw=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kgamma-6.5.2.tar.xz", + "hash": "sha256-U4NT/837fm1m4WsaP6//pHiyk8fVdlbKcQFvKut4Lu4=" }, "kglobalacceld": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kglobalacceld-6.5.1.tar.xz", - "hash": "sha256-X3pmjbrldu7w0WBYGDsAiadiO+wAg8XKWjcJrJe6yeM=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kglobalacceld-6.5.2.tar.xz", + "hash": "sha256-iVTHt1TiKv/X9570Bh9a4McXmPe8VTHqyMd4k2uk9fY=" }, "kinfocenter": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kinfocenter-6.5.1.tar.xz", - "hash": "sha256-GcL1WJrBF+B9Kdz6PaBlcXdKYHdEhy7WNcgius9Itiw=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kinfocenter-6.5.2.tar.xz", + "hash": "sha256-/+CaFpx2x5zlUe8rTu6XpuHYcm0LGi/CR/eNoYhgRkk=" }, "kmenuedit": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kmenuedit-6.5.1.tar.xz", - "hash": "sha256-buDijgNUeHpyAplToypkwLYDngDBArk4RxF4qNt8zKA=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kmenuedit-6.5.2.tar.xz", + "hash": "sha256-jmHvx08nPw2UwejXgN/kqi9Qpr6a3qaJpDZ+DyLMy1U=" }, "knighttime": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/knighttime-6.5.1.tar.xz", - "hash": "sha256-Xlzj5SWZRSDm8Hni2m3wBNnk1yu1GcYAMTUF7+Q4Qgw=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/knighttime-6.5.2.tar.xz", + "hash": "sha256-z/zPpFuzAU5eAn3aqflUnIhAhHoGU5Qs7EIRS8XPnw0=" }, "kpipewire": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kpipewire-6.5.1.tar.xz", - "hash": "sha256-Tm4RImeWUA6P2bc5J06WCQ6HT43rKUxXDPMJkQd42a0=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kpipewire-6.5.2.tar.xz", + "hash": "sha256-Wq9FfQj8Ut6iVOqlt+Bc8OkVABQR9P3W8vSqCxKQ/ok=" }, "krdp": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/krdp-6.5.1.tar.xz", - "hash": "sha256-mO/GHKT8GAevIsqcUlEEd0PCe+hHDEPJZROsXi8LtDw=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/krdp-6.5.2.tar.xz", + "hash": "sha256-IKsnIvIpcQZpIAw9/DWIjOxuKzw43OEguwW5nKN9WP8=" }, "kscreen": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kscreen-6.5.1.tar.xz", - "hash": "sha256-2dMEroOMQEyHKkL7/ahyikXvQyPX4QcU0VcEZqk1OEs=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kscreen-6.5.2.tar.xz", + "hash": "sha256-nIFP1C+XMBlvwMnmIwqFv8gATA5XMrBIedNdtNe5xGg=" }, "kscreenlocker": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kscreenlocker-6.5.1.tar.xz", - "hash": "sha256-N9+IanbW/wlKQk5YJ1/okxQDjW7CHGilunPar1fM8sc=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kscreenlocker-6.5.2.tar.xz", + "hash": "sha256-0AmJSoiWSgxENw3dWoO3qV5k9qrS9Hsm/vfMiB0NBLY=" }, "ksshaskpass": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/ksshaskpass-6.5.1.tar.xz", - "hash": "sha256-aobW64ouchh1cAv+cmT936e973HRJavYoPzRYXQIdM4=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/ksshaskpass-6.5.2.tar.xz", + "hash": "sha256-4c2svd5GS3crwpvVIN3iUDtU9+JPasnKPv1+ycqdjGI=" }, "ksystemstats": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/ksystemstats-6.5.1.tar.xz", - "hash": "sha256-KJX6eX/mTBrlhvoe/R9uLuEQIG5Kc6bdreadHL0BMjQ=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/ksystemstats-6.5.2.tar.xz", + "hash": "sha256-2MJyoyQv5dCTe54wUbMCM1sw68MijoLWVJwSpOWIb8o=" }, "kwallet-pam": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kwallet-pam-6.5.1.tar.xz", - "hash": "sha256-NGCI2FVg/rhxSmxmyOeuXjC1gJYMv8aIEvJ9gFKoj7w=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kwallet-pam-6.5.2.tar.xz", + "hash": "sha256-X8P6pZQR7tdCg9aqVMLev8fmorMIjXBRrmL99iaK6HY=" }, "kwayland": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kwayland-6.5.1.tar.xz", - "hash": "sha256-ViLuJRfsgOncYCA+BLWtur0M6t380oLES4VCZEuAh2c=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kwayland-6.5.2.tar.xz", + "hash": "sha256-qmPjdT4kHzlV64Bq6Rrx85Y+QuxzHyuKIzARm2XLVXo=" }, "kwayland-integration": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kwayland-integration-6.5.1.tar.xz", - "hash": "sha256-XOSNwGHrx5r/P0WBZcat7NNFFxFnkWv9Nf4Rn5klYro=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kwayland-integration-6.5.2.tar.xz", + "hash": "sha256-TRCULpmoY3aEoT4b5HIeIFdEgrUr8b6yXRf99QG9XQY=" }, "kwin": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kwin-6.5.1.tar.xz", - "hash": "sha256-xDagByiELpL2W+tlWOBXdUhF9GNOW+wpFKLRsbOLyvs=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kwin-6.5.2.tar.xz", + "hash": "sha256-O+DVaf40La3e6Fm6tq79oy1wVrYB6EA46K+SWT8UB3Q=" }, "kwin-x11": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kwin-x11-6.5.1.tar.xz", - "hash": "sha256-8X78YWnPFB99DG+ocb1j+mn+PunXDxxRVFDwol3OShI=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kwin-x11-6.5.2.tar.xz", + "hash": "sha256-Yy5rFMfTArbv7GKrCEJqkkynIMtvsgfw+SLln39oklY=" }, "kwrited": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/kwrited-6.5.1.tar.xz", - "hash": "sha256-CuPbsbWjuk4EkOrv1OJOZbcDvQv9cn5hNSgOXqTOSBY=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/kwrited-6.5.2.tar.xz", + "hash": "sha256-AJVfKaxwbM6qYDhz80NHQ5VtrERNHJDYUnqj87MrCYk=" }, "layer-shell-qt": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/layer-shell-qt-6.5.1.tar.xz", - "hash": "sha256-9zZ9afjRMy3X3GMpUhQl/ru4E/qn8Jp6bhA9Qb+3CsI=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/layer-shell-qt-6.5.2.tar.xz", + "hash": "sha256-RTC7iOP7K2NYuoFpoMg5ItnbwzIQ+NjSt9BHndRJYz0=" }, "libkscreen": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/libkscreen-6.5.1.tar.xz", - "hash": "sha256-k4wPRsM3OGc/drZKb3Unh3eGkfpOHRTHAh5uTO+Cbco=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/libkscreen-6.5.2.tar.xz", + "hash": "sha256-KAmXVDSKfTr3TXm0Q9f96OaisyxuVJG1IBgNZdHhumE=" }, "libksysguard": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/libksysguard-6.5.1.tar.xz", - "hash": "sha256-xO4fo0qS1TIUAUE5hBbV9yUmfIrutg+7mWmJbMzIHC8=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/libksysguard-6.5.2.tar.xz", + "hash": "sha256-TSOiKHHKlHz2/Loh47xNGr0WqrsvchGZ36NP0z+JRfs=" }, "libplasma": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/libplasma-6.5.1.tar.xz", - "hash": "sha256-UvIXUqOUfPVCvsO30+WXnXzcFSt7R/5kk7itsFHVihg=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/libplasma-6.5.2.tar.xz", + "hash": "sha256-GU/P2XK3wIguiFKGA9iu9pqgpe8ZlzC/Wx4zAi8h5uE=" }, "milou": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/milou-6.5.1.tar.xz", - "hash": "sha256-vtlXntxcvjcCqNZkGSD07ANgXx6NTyPHixg18HzncTQ=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/milou-6.5.2.tar.xz", + "hash": "sha256-hLN5xBoVTqJMAiPEbLf5HqVBDyejz/AStK7cOEHnm70=" }, "ocean-sound-theme": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/ocean-sound-theme-6.5.1.tar.xz", - "hash": "sha256-vncLjtOad9ZES6XwpkA3IDOOiu5DjRGnDMfwh73Ixqg=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/ocean-sound-theme-6.5.2.tar.xz", + "hash": "sha256-fju1kwnlT4qj5jA6cNrA66kWYuCgcJ0EH9Bzci8G7pE=" }, "oxygen": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/oxygen-6.5.1.tar.xz", - "hash": "sha256-vxV5odEM/ncTMS5f8hvK6fk5i5CFIolmrGqmlmq+rwo=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/oxygen-6.5.2.tar.xz", + "hash": "sha256-00nHko8GiYIze7RUgewZ2UKmj0fg8KJeuDnqL/NYVWo=" }, "oxygen-sounds": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/oxygen-sounds-6.5.1.tar.xz", - "hash": "sha256-pkqkMjSSrgn+le8TSjtKrXKg68RD7L5uI5W6q/awmK8=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/oxygen-sounds-6.5.2.tar.xz", + "hash": "sha256-EPWqgfxNIUhCKu6OBpKI1SJnISPjEId90hBUN7ai5hc=" }, "plasma-activities": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-activities-6.5.1.tar.xz", - "hash": "sha256-Hz46eBr0UQAVTIT7jIuv8FVo5ApMFGvyDSwAoW/iQdE=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-activities-6.5.2.tar.xz", + "hash": "sha256-OXg9Mk88A0BFIbSSZNNBNXVtALzq1GF3pLmJ+L6nRJo=" }, "plasma-activities-stats": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-activities-stats-6.5.1.tar.xz", - "hash": "sha256-H2vfj9mXTAq4aM42fk9rm/EO1IzWak5bgusJ2xKQcBc=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-activities-stats-6.5.2.tar.xz", + "hash": "sha256-uaZbFk7XowEhGOCJFnDKXoKHssuPQvVi3H9kmFL0kAA=" }, "plasma-browser-integration": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-browser-integration-6.5.1.tar.xz", - "hash": "sha256-bjrq5mwWJ9SSHPBtpNs7/b6F+hq/wgx7xTg20M6uIi4=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-browser-integration-6.5.2.tar.xz", + "hash": "sha256-gVtIMUrwSqvnghJe+eut59UIedqe471+2yOEnNpmAqs=" }, "plasma-desktop": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-desktop-6.5.1.tar.xz", - "hash": "sha256-VU3r3ENWYUUNIrv+EqlBwL/4IjqmYpIL9fAb4MKvPx8=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-desktop-6.5.2.tar.xz", + "hash": "sha256-sLKzNR/I5vU/BnPnu04HctnfYg6dPeZeZR09cDBselg=" }, "plasma-dialer": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-dialer-6.5.1.tar.xz", - "hash": "sha256-ohwRgQIIxSw9iCW1cr1xPWaXsctP6xQG/LkNOBR/jhQ=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-dialer-6.5.2.tar.xz", + "hash": "sha256-Sr/LxXutBI5pAv6s2uDtCGnLBr6fkgTQ89Mq4TrWeHg=" }, "plasma-disks": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-disks-6.5.1.tar.xz", - "hash": "sha256-/g6LsGG+wiXYs0gNFsnYvunwYG8HT6UWV1f0jnIOQUM=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-disks-6.5.2.tar.xz", + "hash": "sha256-msmFPznZ1Npyt/sP2FimSvmSuWprwl6BtVEZiN31HXs=" }, "plasma-firewall": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-firewall-6.5.1.tar.xz", - "hash": "sha256-61e9xjoyYWfJohxfM8yyXrB+1Kd0ODU+7zpfCC+EKoY=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-firewall-6.5.2.tar.xz", + "hash": "sha256-2hMkTe+ntKtu+1kHIQmo0zJ6fshR0V5Ho7wauhVaQd8=" }, "plasma-integration": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-integration-6.5.1.tar.xz", - "hash": "sha256-YnEY51CVNdtBYN1LCUcA+V3PI5ILGPDVFOW0YwMzVDM=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-integration-6.5.2.tar.xz", + "hash": "sha256-ihP8/Vphz5/2g3VP5wE+JPIoW4859nmbod97ye5ffuQ=" }, "plasma-mobile": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-mobile-6.5.1.tar.xz", - "hash": "sha256-BC7NnyvgMr1b+Ui4QYu0D0w9ysaN78Kvq+iHGnj7TI4=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-mobile-6.5.2.tar.xz", + "hash": "sha256-bspdBG7Uas2u3GShUIwG6BzJogWgyhYJ6IqU6QeLgGc=" }, "plasma-nano": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-nano-6.5.1.tar.xz", - "hash": "sha256-KCeNaa09wjkpZTbej+5CJTHvan8emzZwsAAqWAZEyYg=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-nano-6.5.2.tar.xz", + "hash": "sha256-wjzWhBCqU7CAmWhPDCg4RH24FhX79o2pN95uW4VUsgM=" }, "plasma-nm": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-nm-6.5.1.tar.xz", - "hash": "sha256-xPZUtUc62W8xGeylc6Gk7F7eCl9hKbLIt+sCMP3rPpw=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-nm-6.5.2.tar.xz", + "hash": "sha256-58Ppw4m45tjerF2eOhA74JIRH8/o3sVxg1agf7p4f9w=" }, "plasma-pa": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-pa-6.5.1.tar.xz", - "hash": "sha256-oNip/KNERP6jRqHcIWYjNf+CrLn9Ba9FfeBun6bUB80=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-pa-6.5.2.tar.xz", + "hash": "sha256-hReGSd+zf2XYON5UFRsT8KFFxBesyHm1P2L0ptLwQaE=" }, "plasma-sdk": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-sdk-6.5.1.tar.xz", - "hash": "sha256-MImo+N0mvSI7zRxj9GNPLr9lVH1M7QIxYTeodUxWQ4c=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-sdk-6.5.2.tar.xz", + "hash": "sha256-EgWo57nBxQ7LKjBWLEU6Mge9e/rmhufrzyCrkZOvIj0=" }, "plasma-systemmonitor": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-systemmonitor-6.5.1.tar.xz", - "hash": "sha256-ZwiX9A8NxkcL6Hya3zbnFPpTavMy28Rmzax9+ce0Yp8=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-systemmonitor-6.5.2.tar.xz", + "hash": "sha256-CjMpu9ex9MunQ000eJXH7hgUuwZD0SALv+D/HPi8yiE=" }, "plasma-thunderbolt": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-thunderbolt-6.5.1.tar.xz", - "hash": "sha256-pdfEjdQ5b4rnp89BCLs7GB6RD60hHIQogjMzOBTJtlY=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-thunderbolt-6.5.2.tar.xz", + "hash": "sha256-V23b746OP6RNCQwj3DvT5eclgkr5Ih/dU1rUj6J/l7A=" }, "plasma-vault": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-vault-6.5.1.tar.xz", - "hash": "sha256-k08VPD0hieSjU4YqWXF4Zszw/fOsvkdWyEruCGEuhUg=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-vault-6.5.2.tar.xz", + "hash": "sha256-wFX4WGh+tvYibTjPhFW99VEG6e+mvbPXsDuQqf+mzmk=" }, "plasma-welcome": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-welcome-6.5.1.tar.xz", - "hash": "sha256-KgG52Y2NBPnFqOcDT+Tuq+FRuvrZP3Eym2psD4hwLnM=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-welcome-6.5.2.tar.xz", + "hash": "sha256-gJhnSo+0yycl3DwHDol9hHBHaVk2FZsASNXV0aA2lWM=" }, "plasma-workspace": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-workspace-6.5.1.tar.xz", - "hash": "sha256-e+2icLSptdmoAWvw43MimvD+4CQkIxiuL5RcwyuAfKI=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-workspace-6.5.2.tar.xz", + "hash": "sha256-i/f6U7M+J0SOKxUfX8CGzsxdf1FjxKnY8Th15WduC6Y=" }, "plasma-workspace-wallpapers": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma-workspace-wallpapers-6.5.1.tar.xz", - "hash": "sha256-AlkQ+7dpRilxTxfgfc4niA2dozqPPQHAuq5mPpQVals=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma-workspace-wallpapers-6.5.2.tar.xz", + "hash": "sha256-BawdOsYHVjvxjeXOxJ9sClv1HILmuL9EZohuDRnTWTs=" }, "plasma5support": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plasma5support-6.5.1.tar.xz", - "hash": "sha256-cLn5YSLxnO+kyl77aZC5aJ4onphq9snj7KTnTPVZ0nk=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plasma5support-6.5.2.tar.xz", + "hash": "sha256-gRVRyYxL8EK3keJjWpAP52qvKw3HG1TeyA+cOH90uO8=" }, "plymouth-kcm": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/plymouth-kcm-6.5.1.tar.xz", - "hash": "sha256-LN0hfUkMIzLHXdhS3+WnZ+JNXc4Ot55HsDsp+kjYpmM=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/plymouth-kcm-6.5.2.tar.xz", + "hash": "sha256-CdRfq03ykcO/58b8FC4uomReON/UWZZ1zRpOzBRmOPA=" }, "polkit-kde-agent-1": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/polkit-kde-agent-1-6.5.1.tar.xz", - "hash": "sha256-D+hTTQ/yazWUlIM3Qi3yAavAhwSD3bEOifatuZJMbWI=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/polkit-kde-agent-1-6.5.2.tar.xz", + "hash": "sha256-NRzNYj/uhzwdenD0DgoFv5hOrRR5HNkleyt73S3cBMw=" }, "powerdevil": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/powerdevil-6.5.1.tar.xz", - "hash": "sha256-UZnkM1StUkGaH1PmoVsWcjuPf3N2ouR2bjqSC337dD8=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/powerdevil-6.5.2.tar.xz", + "hash": "sha256-fP6wi+s8xErGrlJWE830CFXdETcIOwUNxeZdN2TL9Ms=" }, "print-manager": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/print-manager-6.5.1.tar.xz", - "hash": "sha256-anMpNCJBDNqHE/sIQQJrJxjY0pWHAKW+WtK8zHaGQRI=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/print-manager-6.5.2.tar.xz", + "hash": "sha256-Ti90yOpXgYRlJqQOwyE0UvRq+S0vsrL1vYel0OR/Eu0=" }, "qqc2-breeze-style": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/qqc2-breeze-style-6.5.1.tar.xz", - "hash": "sha256-jKOgmWpNzgbJphmYr+FAIB9gwBGaA3rrvAf8PXoo0KA=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/qqc2-breeze-style-6.5.2.tar.xz", + "hash": "sha256-1Ug9q2fFeCMMfnjJ+lS7kA2eGTVvkVBY5IKoTZGVbIE=" }, "sddm-kcm": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/sddm-kcm-6.5.1.tar.xz", - "hash": "sha256-HYgzqCLhg7vq2Z7HaECsLU7RMZ6CNeiocZ8xxwNEk9E=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/sddm-kcm-6.5.2.tar.xz", + "hash": "sha256-w5E/2Z+vRLwdKKDmQxbHvfwBmzjNfrgIABRuDH811yk=" }, "spacebar": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/spacebar-6.5.1.tar.xz", - "hash": "sha256-rBx6xeWY24v1IESCv7osWY+p4jxhSLJVjdqfHeZHCbw=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/spacebar-6.5.2.tar.xz", + "hash": "sha256-IxRtwvvg2AVzsVilWZOKiObVpEBdOVgrM2V6guMnUso=" }, "spectacle": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/spectacle-6.5.1.tar.xz", - "hash": "sha256-pG0uZ/ujsSnCUScbxsJGMyOAHKVWajyFRVMH0fP78Lo=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/spectacle-6.5.2.tar.xz", + "hash": "sha256-RkH7Fk3bPP3vd1l9jbdSGODIt6tjwL38IMoMeiQgmS4=" }, "systemsettings": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/systemsettings-6.5.1.tar.xz", - "hash": "sha256-SPlwgXloDwJ08RlFedkUsWXcIcM7BY3h0hAkCgdhxjY=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/systemsettings-6.5.2.tar.xz", + "hash": "sha256-9vOyGSFg8IyCnAD+TAMV+cBiiNTE2vKHFB4R6D2KS84=" }, "wacomtablet": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/wacomtablet-6.5.1.tar.xz", - "hash": "sha256-lCG21PeqOcwosg0Rh+w9mN4ChfhYHo4VwQfHIjSCaIs=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/wacomtablet-6.5.2.tar.xz", + "hash": "sha256-wA1Zo3rYbWim9fESCwm02Ub6HNjEjFddZnH4VmR5vGM=" }, "xdg-desktop-portal-kde": { - "version": "6.5.1", - "url": "mirror://kde/stable/plasma/6.5.1/xdg-desktop-portal-kde-6.5.1.tar.xz", - "hash": "sha256-+qFye0L1+XGNz+3C+5lgaG+NkznZlXXABnkymP2Zrlo=" + "version": "6.5.2", + "url": "mirror://kde/stable/plasma/6.5.2/xdg-desktop-portal-kde-6.5.2.tar.xz", + "hash": "sha256-ai6dwu0QV9+DaAI+o2mKzzCS5N7jHf/zC5X6gb16skk=" } } \ No newline at end of file diff --git a/pkgs/os-specific/windows/msvcSdk/default.nix b/pkgs/os-specific/windows/msvcSdk/default.nix index f57d2bf90de9..05a728dee6e7 100644 --- a/pkgs/os-specific/windows/msvcSdk/default.nix +++ b/pkgs/os-specific/windows/msvcSdk/default.nix @@ -1,71 +1,54 @@ { lib, - config, stdenvNoCC, xwin, testers, llvmPackages, + callPackage, }: let version = (builtins.fromJSON (builtins.readFile ./manifest.json)).info.buildVersion; hashes = (builtins.fromJSON (builtins.readFile ./hashes.json)); - host = stdenvNoCC.hostPlatform; - arch = - if host.isx86_64 then - "x86_64" - else if host.isAarch64 then - "aarch64" - else if host.isx86_32 then - "x86" - else if host.isAarch32 then - "aarch" - else - throw "Unsupported system"; + fetchWinSdk = callPackage ./fetchWinSdk.nix { }; in stdenvNoCC.mkDerivation (finalAttrs: { inherit version; - pname = "msvc-sdk"; - dontUnpack = true; + pname = "win-sdk"; + + src = fetchWinSdk { + manifest = ./manifest.json; + hash = hashes.${finalAttrs.src.arch}; + }; strictDeps = true; - nativeBuildInputs = [ xwin ]; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = - if !config.microsoftVisualStudioLicenseAccepted then - throw '' - Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted. - Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your - config to indicate so. - '' - else - hashes.${arch}; + nativeBuildInputs = [ + xwin + ]; __structuredAttrs = true; xwinArgs = [ "--accept-license" - "--cache-dir=xwin-out" + "--cache-dir=." "--manifest=${./manifest.json}" - "--arch=${arch}" + "--arch=${finalAttrs.src.arch}" "splat" "--preserve-ms-arch-notation" ]; - buildPhase = '' - runHook preBuild + installPhase = '' + runHook preInstall xwin "''${xwinArgs[@]}" - mkdir "$out" - mv xwin-out/splat/* "$out" - runHook postBuild + mkdir -p "$out" + cp -r splat/* "$out" + + runHook postInstall ''; dontFixup = true; - dontInstall = true; passthru = { updateScript = ./update.nu; diff --git a/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix b/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix new file mode 100644 index 000000000000..3c498df81b74 --- /dev/null +++ b/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix @@ -0,0 +1,91 @@ +{ + lib, + config, + stdenvNoCC, + xwin, +}: +let + host = stdenvNoCC.hostPlatform; + + hostArch = + if host.isx86_64 then + "x86_64" + else if host.isAarch64 then + "aarch64" + else if host.isx86_32 then + "x86" + else if host.isAarch32 then + "aarch" + else + throw "Unsupported system"; +in +lib.extendMkDerivation { + constructDrv = stdenvNoCC.mkDerivation; + + excludeDrvArgNames = [ + "manifest" + "arch" + ]; + + extendDrvArgs = + finalAttrs: + { + name ? "xwin-fetch-msvc", + hash ? lib.fakeHash, + manifest ? null, + arch ? hostArch, + ... + }@args: + { + inherit name; + __structuredAttrs = true; + dontUnpack = true; + dontFixup = true; + dontInstall = true; + + strictDeps = true; + + nativeBuildInputs = [ xwin ]; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = + if !config.microsoftVisualStudioLicenseAccepted then + throw '' + Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted. + Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your + config to indicate so. + '' + else + hash; + + xwinArgs = lib.optionals (manifest != null) [ "--manifest=${manifest}" ] ++ [ + "--accept-license" + "--cache-dir=${placeholder "out"}" + "--arch=${arch}" + "download" + ]; + + buildPhase = + args.buildPhase or '' + runHook preBuild + + xwin "''${xwinArgs[@]}" + + runHook postBuild + ''; + + passthru = { + inherit arch; + }; + + meta.license = { + deprecated = false; + fullName = "Microsoft Software License Terms"; + shortName = "msvc"; + spdxId = "unknown"; + free = false; + url = "https://www.visualstudio.com/license-terms/mt644918/"; + }; + }; +} diff --git a/pkgs/os-specific/windows/msvcSdk/hashes.json b/pkgs/os-specific/windows/msvcSdk/hashes.json index 6df8b21c9516..02bd7c5ca0de 100644 --- a/pkgs/os-specific/windows/msvcSdk/hashes.json +++ b/pkgs/os-specific/windows/msvcSdk/hashes.json @@ -1,5 +1,5 @@ { - "x86_64": "sha256-kp+xePTRZgqdAV3/BYhqKke3dXIkLWLM+IWFXtN2rHM=", - "x86": "sha256-xEXV+XBNoXpAO8R/oDj8gfGb5tICr9ps4DN8Q4lqK2k=", - "aarch64": "sha256-r0tTQUq3CePJ/7Vuzf4Zsy3Ebu0KiXNBwRHmrO3d15E=" + "x86_64": "sha256-rEHwc09hLh3dKvA2TYHJKeFDycajPe8Ewfcdw85QY48=", + "x86": "sha256-yibiyIwGe9kSJzTFpDc8ilF65aKQ9qMLrx2k14uM4Zk=", + "aarch64": "sha256-RB/Hubhm+73kPUiKOKtm6vwf2ldm1raezNmmGEdQf9w=" } diff --git a/pkgs/os-specific/windows/msvcSdk/manifest.json b/pkgs/os-specific/windows/msvcSdk/manifest.json index bb4ee81c35f2..4abcbbffa00f 100644 --- a/pkgs/os-specific/windows/msvcSdk/manifest.json +++ b/pkgs/os-specific/windows/msvcSdk/manifest.json @@ -1,51 +1,50 @@ { "manifestVersion": "1.1", "info": { - "id": "VisualStudio.17.Release/17.14.13+36414.22.-august.2025-", + "id": "VisualStudio.17.Release/17.14.19+36623.8", "buildBranch": "d17.14", - "buildVersion": "17.14.36414.22", - "commitId": "1481a1f5e0b5858ec46c868f91b27039ed0d233d", - "communityOrLowerFlightId": "1f9f81a7bb554db", + "buildVersion": "17.14.36623.8", + "commitId": "8a9fda4969482fc6fc5ced0d2d47b928d1b82678", + "communityOrLowerFlightId": "4e87ee4468fd451", "localBuild": "build-lab", "manifestName": "VisualStudio.17.Release", "manifestType": "channel", - "productDisplayVersion": "17.14.13 (August 2025)", + "productDisplayVersion": "17.14.19", "productLine": "Dev17", "productLineVersion": "2022", "productMilestone": "RTW", "productMilestoneIsPreRelease": "False", "productName": "Visual Studio", - "productPatchVersion": "13", + "productPatchVersion": "19", "productPreReleaseMilestoneSuffix": "1.0", - "productReleaseNameSuffix": "(August 2025)", - "productSemanticVersion": "17.14.13+36414.22.-august.2025-", - "professionalOrGreaterFlightId": "39d353be42bf474", - "qBuildSessionId": "e533c3b6-eb6e-a0b2-8734-a13c66345cb8" + "productSemanticVersion": "17.14.19+36623.8", + "professionalOrGreaterFlightId": "4bb63b1960eb466", + "qBuildSessionId": "32622f7c-25ab-329b-fa1e-eebd68dbf0a2" }, "channelItems": [ { "id": "Microsoft.VisualStudio.Manifests.VisualStudio", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "Manifest", "payloads": [ { "fileName": "VisualStudio.vsman", - "sha256": "0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46", - "size": 30484157, - "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46/VisualStudio.vsman" + "sha256": "b674dd46f83a684142689b3a86c73ba5f2e2477018087e4df218516214bbad58", + "size": 30425509, + "url": "https://download.visualstudio.microsoft.com/download/pr/5011a9cc-e8ef-42cb-ad72-87de1031accc/b674dd46f83a684142689b3a86c73ba5f2e2477018087e4df218516214bbad58/VisualStudio.vsman" } ] }, { "id": "Microsoft.VisualStudio.Product.BuildTools", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "icon": { "mimeType": "image/svg+xml", "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, "isHidden": true, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "localizedResources": [ { "language": "en-us", @@ -135,7 +134,7 @@ }, { "id": "Microsoft.VisualStudio.Product.Community", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "chip": "x64", "productArch": "arm64", @@ -143,7 +142,7 @@ "mimeType": "image/svg+xml", "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "supportsDownloadThenUpdate": true, "localizedResources": [ { @@ -240,7 +239,7 @@ }, { "id": "Microsoft.VisualStudio.Product.Community", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "chip": "x64", "productArch": "x64", @@ -248,7 +247,7 @@ "mimeType": "image/svg+xml", "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "supportsDownloadThenUpdate": true, "localizedResources": [ { @@ -356,7 +355,7 @@ }, { "id": "Microsoft.VisualStudio.Product.Enterprise", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "chip": "x64", "productArch": "arm64", @@ -364,7 +363,7 @@ "mimeType": "image/svg+xml", "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "supportsDownloadThenUpdate": true, "localizedResources": [ { @@ -461,7 +460,7 @@ }, { "id": "Microsoft.VisualStudio.Product.Enterprise", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "chip": "x64", "productArch": "x64", @@ -469,7 +468,7 @@ "mimeType": "image/svg+xml", "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "supportsDownloadThenUpdate": true, "localizedResources": [ { @@ -577,7 +576,7 @@ }, { "id": "Microsoft.VisualStudio.Product.Professional", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "chip": "x64", "productArch": "arm64", @@ -585,7 +584,7 @@ "mimeType": "image/svg+xml", "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "supportsDownloadThenUpdate": true, "localizedResources": [ { @@ -682,7 +681,7 @@ }, { "id": "Microsoft.VisualStudio.Product.Professional", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "chip": "x64", "productArch": "x64", @@ -690,7 +689,7 @@ "mimeType": "image/svg+xml", "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "supportsDownloadThenUpdate": true, "localizedResources": [ { @@ -798,7 +797,7 @@ }, { "id": "Microsoft.VisualStudio.Product.TeamExplorer", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "chip": "x64", "productArch": "x64", @@ -807,7 +806,7 @@ "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4=" }, "isHidden": true, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "localizedResources": [ { "language": "en-us", @@ -914,14 +913,14 @@ }, { "id": "Microsoft.VisualStudio.Product.TestAgent", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "icon": { "mimeType": "image/svg+xml", "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+" }, "isHidden": true, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "localizedResources": [ { "language": "en-us", @@ -1011,14 +1010,14 @@ }, { "id": "Microsoft.VisualStudio.Product.TestController", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "ChannelProduct", "icon": { "mimeType": "image/svg+xml", "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+" }, "isHidden": true, - "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13", + "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19", "localizedResources": [ { "language": "en-us", @@ -1108,7 +1107,7 @@ }, { "id": "VisualStudio.17.Release", - "version": "17.14.36414.22", + "version": "17.14.36623.8", "type": "Channel", "localizedResources": [ { @@ -1120,61 +1119,61 @@ { "language": "zh-cn", "title": "Current", - "description": "当前频道包括已可供生产使用的最新功能和修补程序。", + "description": "Current 频道包括已可供生产使用的最新功能和修补程序。", "channelSuffix": "" }, { "language": "zh-tw", "title": "Current", - "description": "目前通道包含可供生產環境使用的最新功能和修正程式。", + "description": "Current 通道包含可供生產環境使用的最新功能和修正程式。", "channelSuffix": "" }, { "language": "cs-cz", "title": "Current", - "description": "Aktuální kanál zahrnuje nejnovější funkce a opravy, které jsou připravené k použití v produkčním prostředí.", + "description": "Kanál Current zahrnuje nejnovější funkce a opravy, které jsou připravené k použití v produkčním prostředí.", "channelSuffix": "" }, { "language": "de-de", "title": "Current", - "description": "Der aktuelle Kanal enthält die neuesten Features und Fixes, die für die Produktion bereit sind.", + "description": "Der Current-Kanal enthält die neuesten Features und Fixes, die zur Nutzung in der Produktion bereit sind.", "channelSuffix": "" }, { "language": "es-es", "title": "Current", - "description": "El canal actual incluye las características y correcciones más recientes que están listas para el uso de producción.", + "description": "El canal Current incluye las características y correcciones más recientes que están listas para el uso de producción.", "channelSuffix": "" }, { "language": "fr-fr", "title": "Current", - "description": "Le canal actuel inclut les dernières fonctionnalités et correctifs prêts pour une utilisation en production.", + "description": "Le canal Current inclut les dernières fonctionnalités et correctifs prêts pour une utilisation en production.", "channelSuffix": "" }, { "language": "it-it", "title": "Current", - "description": "Il Canale corrente include le funzionalità e le correzioni più recenti pronte per l'uso in produzione.", + "description": "Il canale Current include le funzionalità e le correzioni più recenti pronte per l'uso in produzione.", "channelSuffix": "" }, { "language": "ja-jp", "title": "Current", - "description": "現在のチャネルには、運用環境で使用する準備が整っている最新の機能と修正が含まれています。", + "description": "Current チャネルには、運用環境で使用する準備が整っている最新の機能と修正が含まれています。", "channelSuffix": "" }, { "language": "ko-kr", "title": "Current", - "description": "현재 채널에는 프로덕션용으로 사용할 준비가 된 최신 기능과 수정 사항이 포함되어 있습니다.", + "description": "Current 채널에는 프로덕션용으로 사용할 준비가 된 최신 기능과 수정 사항이 포함되어 있습니다.", "channelSuffix": "" }, { "language": "pl-pl", "title": "Current", - "description": "Bieżący kanał obejmuje najnowsze funkcje i poprawki, które są gotowe do użycia w środowisku produkcyjnym.", + "description": "Kanał Current obejmuje najnowsze funkcje i poprawki, które są gotowe do użycia w środowisku produkcyjnym.", "channelSuffix": "" }, { @@ -1186,28 +1185,28 @@ { "language": "ru-ru", "title": "Current", - "description": "Актуальный канал включает последние функции и исправления, готовые к использованию в рабочей среде.", + "description": "Канал Current включает последние функции и исправления, готовые к использованию в рабочей среде.", "channelSuffix": "" }, { "language": "tr-tr", "title": "Current", - "description": "Geçerli kanal, üretim kullanımı için hazır olan en son özellikleri ve düzeltmeleri içerir.", + "description": "Güncel kanal, üretim kullanımı için hazır olan en son özellikleri ve düzeltmeleri içerir.", "channelSuffix": "" } ] }, { "id": "VisualStudio.17.Release.Bootstrappers.Setup", - "version": "3.14.2084.286130193", + "version": "3.14.2086.286130193", "type": "Bootstrapper", - "installerVersion": "3.14.2084.208", + "installerVersion": "3.14.2086.54749", "payloads": [ { "fileName": "vs_Setup.exe", - "sha256": "1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db", - "size": 4464984, - "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db/vs_Setup.exe" + "sha256": "bf287d4f6e9ac7c97ec40c7a145d17da9c0af8c6178066205302e56d1840da66", + "size": 4459056, + "url": "https://download.visualstudio.microsoft.com/download/pr/5011a9cc-e8ef-42cb-ad72-87de1031accc/bf287d4f6e9ac7c97ec40c7a145d17da9c0af8c6178066205302e56d1840da66/vs_Setup.exe" } ] } @@ -1216,32 +1215,32 @@ "signInfo": { "signatureMethod": "sha256RSA_cng", "digestMethod": "sha256", - "digestValue": "lbYNxXS9fhWwdYlTA8367Q14VLuZk7VWROdUyhPwraI=", + "digestValue": "83F1SIxSq6LnHvmLy16/R1NTdTwucODN4ozLAdpmnZs=", "canonicalization": "" }, - "signatureValue": "Y5Ni1cH09prdAaftGTIdPVSXAEUfVJILWtNJJbdM59Y33c9uGb+jU9JTQA1dl4Fj4ubmYO+6uxp4wYkNMb8eJY3ZAu76PzabU3duyLe8bsBHAW+3t8qi4raMUP4UXfzawIBKnO0GLAcGLka4NcjNq3vA57pdN5e98TsUZKCwgezqBMEkCjOeBkl26uedWjlrv+HCqTYxFarFargd+elD3IPIB/9RhPwwkyJ+divdoUgqclcoNWV7dC9+TWkJrInCBGVAudOpJEBbotu/nyWYN6AFoB90TuhXpV+LLidY1/i5iA8w0V6y61TsK2ERhJNZoIMFqdYLNeqDEWg7eto0MQ==", + "signatureValue": "SNXykEZvJLICsFwUje0R3Z9HJ/jDRP1fO6f6OqiV0cBh5Jh3cM+cRXA1vlUaTT7h7Dfu7Dn2Xe5qUNHcgQZdnStSRWvOPnALj/OfTO8IkNgF3IFpkGadHINv9Gf2XPCjof6yn85bjVfniHNoLkQ8DB4pPOwi82cFL5Fo8bbiEe5IbGIjy3l7T3wLMTbj9PGsyBzKZSzg9Bzl2Xj2Yim9sIyDx5n7qHp9Cg+pcMig8hSJs7NzmhtralBABCUJCweB9gdHJSmhvwP8+sFu9++9Fhsrjqwa2sQdAhXhF+gPHM3wmQJFLrOvMRVIfN2ypCFrG9LwvERzVbbYIRlGJvajCw==", "keyInfo": { "keyValue": { "rsaKeyValue": { - "modulus": "7XpKjCg5837MnNU9UKR3xba/q5Iq/JXcyzypjF20Q6LlVwLLwX3ehPNrT4+GM2kpbhg0KF9zaTCqKCnlRY4zUat+8sk/4dUEyzAfHaZrGf+9FDPlP7GMb7dT1lsS4zDSF6swfD4xuoux9mBYJOGDoXxknpL581td3SwLX4w9MIsERD7wjZYpUc+16BXXuSjtNXhYlnrXoePKlDqlGgJCM5wuFwd7BXdS1lJrqVxytOUHyUpp3ovamSQWE7fGYQKxg4e50J/mNYzgN6AYglCeJ9QjGlnQ4a4HTLrtNuqFgG3wt6a6pFJ/C1qdvB/tki3rTRuSkGWcL8t2XJ+/j0BpeQ==", + "modulus": "wEpIdXKb7lKn26sXpXuywkhxGplTQXxROLmNRZBrAHVBf7546RNXZwA/bzDqsuWTuPSC4T+I4j/z9j5/WqPuUw7SpnEPqWXc2xu7eN8kVyQt5170xkK6KHT4vVEkIvayPtIMLl0SgSCOy/pN5DJCi5ha7FlI84F1Qi2GumR+wQgCwHCVmU8Fj6Ik+B6akISXGCwe6X3rQFQngRFWQ/IrSkOkAOfy0EfvV+nZUo+FcbWuCZ6cb4Eq5I1ws/rZSeuwAWeedZcNt0VlNbsn4AnxBYQX4sj0dlko7JD5fWqeqq3/HzUNbBmLp9qeCXV8XlACn9YVWv900F47z04kVwpyTw==", "exponent": "AQAB" } }, "x509Data": [ - "MIIGAzCCA+ugAwIBAgITMwAABISY4hLgeKMxXQAAAAAEhDANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMB4XDTI1MDYxOTE4MjEzNVoXDTI2MDYxNzE4MjEzNVowdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEeMBwGA1UEAxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7XpKjCg5837MnNU9UKR3xba/q5Iq/JXcyzypjF20Q6LlVwLLwX3ehPNrT4+GM2kpbhg0KF9zaTCqKCnlRY4zUat+8sk/4dUEyzAfHaZrGf+9FDPlP7GMb7dT1lsS4zDSF6swfD4xuoux9mBYJOGDoXxknpL581td3SwLX4w9MIsERD7wjZYpUc+16BXXuSjtNXhYlnrXoePKlDqlGgJCM5wuFwd7BXdS1lJrqVxytOUHyUpp3ovamSQWE7fGYQKxg4e50J/mNYzgN6AYglCeJ9QjGlnQ4a4HTLrtNuqFgG3wt6a6pFJ/C1qdvB/tki3rTRuSkGWcL8t2XJ+/j0BpeQIDAQABo4IBgjCCAX4wHwYDVR0lBBgwFgYKKwYBBAGCN0wIAQYIKwYBBQUHAwMwHQYDVR0OBBYEFATf9G+hYepzHROBQMWBvZFgqW2FMFQGA1UdEQRNMEukSTBHMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxFjAUBgNVBAUTDTIzMDAxMis1MDUzNjIwHwYDVR0jBBgwFoAUSG5k5VAF04KqFzc3IrVtqMp1ApUwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNybDBhBggrBgEFBQcBAQRVMFMwUQYIKwYBBQUHMAKGRWh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQBi0KbNV1OEU3KAyAyz+kBtzZ0RN6f1kjKetQrPGfiVL98SVhrQc2JgiDZh1Rb+ovKWBf3u/RTSuj9aCo3bsah0onAXYPDI9JPJAxQP9HlNumzwUUFCGolq4bAzq11nS5u2ZrudeqEKFFnCDbOIwX4wxFVeG5oEGH3vuPzFCcECfYepnxPpHAj+B5T+AoSEAVB6EspmpHEwb2cPkLLe7G3beSp0CpEhDdNQszxtWsApQiOsyyn/7yiMJ6h8P/lr3AK+4MCpVjZi8EzYvNO6/a1rF0HqdUPGDJCLhpmdGtagndxrjpEkc589v9KI3mVWIWcqIQkItQbPsX0ZL/38tB31d5jcjttnRVLx8wWYKhORWxo5lJ60q9cfJQqyvrOAPmzhqdiHozqYVqGRDxjnKPxxM52eS5OsOlvhNictzx6BRNGPE7ZEhOP/NGNpQSYS49u3fLnifCHUIUqS/1s04457mB+w8eaPaVnSBkmhTWLkqjmMa1VuzeABEFUQ2Xqg3H6jxtzuq+UjbMV23e9QwiEFEbVCrLOdzjfr65VdK44igSHcLzDS0PcytI8u+6MA8l16GJEMWpDdrhSATtVDQLwmF47OK8N0kZgV/aomeRDcXJ/6SzJIsm+vEHcB1F8/tXyOnmt/446TT8+g5XP0THFyFnjDJIbqf1xG8Lu91Prs/w==", + "MIIF9DCCA9ygAwIBAgITMwAABIVemewOWS/N1wAAAAAEhTANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMB4XDTI1MDYxOTE4MjEzN1oXDTI2MDYxNzE4MjEzN1owdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEeMBwGA1UEAxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwEpIdXKb7lKn26sXpXuywkhxGplTQXxROLmNRZBrAHVBf7546RNXZwA/bzDqsuWTuPSC4T+I4j/z9j5/WqPuUw7SpnEPqWXc2xu7eN8kVyQt5170xkK6KHT4vVEkIvayPtIMLl0SgSCOy/pN5DJCi5ha7FlI84F1Qi2GumR+wQgCwHCVmU8Fj6Ik+B6akISXGCwe6X3rQFQngRFWQ/IrSkOkAOfy0EfvV+nZUo+FcbWuCZ6cb4Eq5I1ws/rZSeuwAWeedZcNt0VlNbsn4AnxBYQX4sj0dlko7JD5fWqeqq3/HzUNbBmLp9qeCXV8XlACn9YVWv900F47z04kVwpyTwIDAQABo4IBczCCAW8wHwYDVR0lBBgwFgYKKwYBBAGCN0wIAQYIKwYBBQUHAwMwHQYDVR0OBBYEFLgmchogri2BNGlO4+UxamNOZJKNMEUGA1UdEQQ+MDykOjA4MR4wHAYDVQQLExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xFjAUBgNVBAUTDTIzMDAxMis1MDUzNTkwHwYDVR0jBBgwFoAUSG5k5VAF04KqFzc3IrVtqMp1ApUwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNybDBhBggrBgEFBQcBAQRVMFMwUQYIKwYBBQUHMAKGRWh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAo5qgKdgouLEx2XIvqpLRACrBZORzVRislkdqxRl7He3IIGdOB+VOEldHwC+nzhPXS77eCOxwRy4aRnROVIy8uDcS0xtmwwJHgFZsZndrillRisptWmqw8V379xgjeJkV/j5+HPqct0v+ipLeXkgwCCLK8ysNyodkltYQsF1/5Nb+G/jR9RY5fov8TybKVwhbmQeGguRS0+X4G0Sqp7FngHZ/A7K2EIU90Fy7ejb9/3TM7+xvwnaW3XKLpfBWJfrd3ZlzPkiApQt5dmntMDpTa0ONskBMnLj1OTqKi0/OY7Ge/uAmknHxSDZTu5e2O6/8Wrqh20j0Na96CAvnu9ebNhtwpWWt8vfWmMdpZ12HtbK3KyMfDQF01YosqV1Z/WRphJHzXHw4qhkMJJpec/Z5t6VogWevWnWgQWwBRI8iRuMtGu+m3pf+LAwlb2mcyzN0xW8VTvQUK42UbWyWW5At1wK6S6mUn8ed0rmHXXcT1/Kb3KhbhLvMHFHg9ObfcTWyeE7XQBAiZRItL7wcZZjObcxV8tqmXqjzFx0kGKj4GfY70nGejcM5xQ9Pt95G88oTks/1rhmwLuHB2RvICp5UFU+LgNg4nsfQzLNlh4qJDZJ2JS6FHll1tUKyS6ajvNky8ik2wTP6GRwHSHNJM6Ek66PW9/r459vNPQ9PkjjglWQ==", "MIIHejCCBWKgAwIBAgIKYQ6Q0gAAAAAAAzANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwNzA4MjA1OTA5WhcNMjYwNzA4MjEwOTA5WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq/D6chAcLq3YbqqCEE00uvK2WCGfQhsqa+laUKq4BjgaBEm6f8MMHt03a8YS2AvwOMKZBrDIOdUBFDFC04kNeWSHfpRgJGyvnkmc6Whe0t+bU7IKLMOv2akrrnoJr9eWWcpgGgXpZnboMlImEi/nqwhQz7NEt13YxC4Ddato88tt8zpcoRb0RrrgOGSsbmQ1eKagYw8t00CT+OPeBw3VXHmlSSnnDb6gE3e+lD3v++MrWhAfTVYoonpy4BI6t0le2O3tQ5GD2Xuye4Yb2T6xjF3oiU+EGvKhL1nkkDstrjNYxbc+/jLTswM9sbKvkjh+0p2ALPVOVpEhNSXDOW5kf1O6nA+tGSOEy/S6A4aN91/w0FK/jJSHvMAhdCVfGCi2zCcoOCWYOUo2z3yxkq4cI6epZuxhH2rhKEmdX4jiJV3TIUs+UsS1Vz8kA/DRelsv1SPjcF0PUUZ3s/gA4bysAoJf28AVs70b1FVL5zmhD+kjSbwYuER8ReTBw3J64HLnJN+/RpnF78IcV9uDjexNSTCnq47f7Fufr/zdsGbiwZeBe+3W7UvnSSmnEyimp31ngOaKYnhfsi+E11ecXL93KCjx7W3DKI8sj0A3T8HhhUSJxAlMxdSlQy90lfdu+HggWCwTXWCVmj5PM4TasIgX3p5O9JawvEagbJjS4NaIjAsCAwEAAaOCAe0wggHpMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBRIbmTlUAXTgqoXNzcitW2oynUClTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRyLToCMZBDuRQFTuHqp8cx0SOJNDBaBgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3JsMF4GCCsGAQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3J0MIGfBgNVHSAEgZcwgZQwgZEGCSsGAQQBgjcuAzCBgzA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9kb2NzL3ByaW1hcnljcHMuaHRtMEAGCCsGAQUFBwICMDQeMiAdAEwAZQBnAGEAbABfAHAAbwBsAGkAYwB5AF8AcwB0AGEAdABlAG0AZQBuAHQALiAdMA0GCSqGSIb3DQEBCwUAA4ICAQBn8oalmOBUeRou09h0ZyKbC5YR4WOSmUKWfdJ5DJDBZV8uLD74w3LRbYP+vj/oCso7v0epo/Np22O/IjWll11lhJB9i0ZQVdgMknzSGksc8zxCi1LQsP1r4z4HLimb5j0bpdS1HXeUOeLpZMlEPXh6I/MTfaaQdION9MsmAkYqwooQu6SpBQyb7Wj6aC6VoCo/KmtYSWMfCWluWpiW5IP0wI/zRive/DvQvTXvbiWu5a8n7dDd8w6vmSiXmE0OPQvyCInWH8MyGOLwxS3OW560STkKxgrCxq2u5bLZ2xWIUUVYODJxJxp/sfQn+N4sOiBpmLJZiWhub6e3dMNABQamASooPoI/E01mC8CzTfXhj38cbxV9Rad25UAqZaPDXVJihsMdYzaXht/a8/jyFqGaJ+HNpZfQ7l1jQeNbB5yHPgZ3BtEGsXUfFL5hYbXw3MYbBL7fQccOKO7eZS/sl/ahXJbYANahRr1Z85elCUtIEJmAH9AAKcWxm6U/RXceNcbSoqKfenoi+kiVH6v7RyOA9Z74v2u3S5fi63V4GuzqN5l5GEv/1rMjaHXmr/r8i+sLgOppO6/8MO0ETI7f33VtY5E90Z1WTk+/gFcioXgRMiF670EKsT/7qMykXcGhiJtXcVZOSEXAQsmbdlsKgEhr/Xmfwb1tbWrJUnMTDXpQzQ==", "MIIF7TCCA9WgAwIBAgIQP4vItfyfspZDtWnWbELhRDANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwMzIyMjIwNTI4WhcNMzYwMzIyMjIxMzA0WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCygEGqNThNE3IyaCJNuLLx/9VSvGzH9dJKjDbu0cJcfoyKrq8TKG/Ac+M6ztAlqFo6be+ouFmrEyNozQwph9FvgFyPRH9dkAFSWKxRxV8qh9zc2AodwQO5e7BW6KPeZGHCnvjzfLnsDbVU/ky2ZU+I8JxImQxCCwl8MVkXeQZ4KI2JOkwDJb5xalwL54RgpJki49KvhKSn+9GY7Qyp3pSJ4Q6g3MDOmT3qCFK7VnnkH4S6Hri0xElcTzFLh93dBWcmmYDgcRGjuKVB4qRTufcyKYMME782XgSzS0NHL2vikR7TmE/dQgfI6B0S/Jmpaz6SfsjWaTr8ZL22CZ3K/QwLopt3YEsDlKQwaRLWQi3BQUzK3Kr9j1uDRprZ/LHR47PJf0h6zSTwQY9cdNCssBAgBkm3xy0hyFfj0IbzA2j70M5xwYmZSmQBbP3sMJHPQTySx+W6hh1hhMdfgzlirrSSL0fzC/hV66AfWdC7dJse0Hbm8ukG1xDo+mTeacY1logC8Ea4PyeZb8txiSk190gWAjWP1Xl8TQLPX+uKg09FcYj5qQ1OcunCnAfPSRtOBA5jUYxe2ADBVSy2xuDCZU7JNDn1nLPEfuhhbhNfFcRf2X7tHc7uROzLLoax7Dj2cO2rXBPB2Q8Nx4CyVe0096yb5MPa50c8prWPMd/FS6/r8QIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUci06AjGQQ7kUBU7h6qfHMdEjiTQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQELBQADggIBAH9yzw+3xRXbm8BJyiZb/p4T5tPw0tuXX/JLP02zrhmu7deXoKzvqTqjwkGw5biRnhOBJAPmCf0/V0A5ISRW0RAvS0CpNoZLtFNXmvvxfomPEf4YbFGq6O0JlbXlccmh6Yd1phV/yX43VF50k8XDZ8wNT2uoFwxtCJJ+i92Bqi1wIcM9BhS7vyRep4TXPw8hIr1LAAbblxzYXtTFC1yHblCk6MM4pPvLLMWSZpuFXst6bJN8gClYW1e1QGm6CHmmZGIVnYeWRbVmIyADixxzoNOieTPgUFmG2y/lAiXqcyqfABTINseSO+lOAOzYVgm5M0kS0lQLAausR7aRKX1MtHWAUgHoyoL2n8ysnI8X6i8msKtyrAv+nlEex0NVZ09Rs1fWtuzuUrc66U7h14GIvE+OdbtLqPA1qibUZ2dJsnBMO5PcHd94kIZysjik0dySTclY6ysSXNQ7roxrsIPlAT/4CTL2kzU0Iq/dNw13CYArzUgA8YyZGUcFAenRv9FO0OYoQzeZpApKCNmacXPSqs0xE2N2oTdvkjgefRI8ZjLny23h/FKJ3crWZgWalmG+oijHHKOnNlA8OqTfSm7mhzvO6/DggTedEzxSjr25HTTGHdUKaj2YKXCMiSrRq4IQSB/c9O+lxbtVGjhjhE63bK2VVOxlIhBJF7jAHscPrFRH" ] }, "counterSign": { "x509Data": [ - "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" ], - "timestamp": "2025-08-14-07:37:33", + "timestamp": "2025-10-23-07:30:29", "counterSignatureMethod": "timeStamp", - "counterSignature": "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" + "counterSignature": "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" } } } diff --git a/pkgs/os-specific/windows/msvcSdk/update.nu b/pkgs/os-specific/windows/msvcSdk/update.nu index 7c6ce40880e8..a2f8b7b8a4f8 100755 --- a/pkgs/os-specific/windows/msvcSdk/update.nu +++ b/pkgs/os-specific/windows/msvcSdk/update.nu @@ -36,9 +36,9 @@ def main [] { |arch| let dir = mktemp -d - xwin --accept-license --cache-dir $dir --manifest $"($PATH | path join manifest.json)" --arch $arch splat --preserve-ms-arch-notation + xwin --accept-license --cache-dir $dir --manifest $"($PATH | path join manifest.json)" --arch $arch download - let hash = nix hash path ($dir | path join splat) + let hash = nix hash path $dir {arch: $arch, hash: $hash} } | transpose -r -d diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 1a3e65ea650d..6caed4b8bb24 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -677,7 +677,7 @@ let defaultCPEParts = { part = "a"; #vendor = null; - ${if attrs ? pname then "product" else null} = attrs.pname; + ${if attrs.pname or null != null then "product" else null} = attrs.pname; #version = null; #update = null; edition = "*";