gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-11-05 00:17:33 +00:00
committed by GitHub
parent 6803de389f 72609b8ced
commit 4434bd9511
81 changed files with 874 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/bot.yml
+2 -2
View File
@@ -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:
ci/github-script/bot.js
+44 -1
View File
@@ -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,
})
ci/github-script/merge.js
+50 -61
View File
@@ -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(`^<!-- comment: ${node_id} -->$`, '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(`^<!-- comment: ${node_id} -->$`, '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 {
maintainers/maintainer-list.nix
+1 -1
View File
@@ -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;
nixos/modules/services/networking/netbird.nix
+13 -2
View File
@@ -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
];
})
);
pkgs/applications/editors/vscode/extensions/default.nix
+2 -2
View File
@@ -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;
pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+2 -2
View File
@@ -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";
pkgs/applications/networking/browsers/librewolf/src.json
+5 -5
View File
@@ -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=="
}
}
pkgs/applications/networking/cluster/terraform-providers/providers.json
+11 -11
View File
@@ -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=",
pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
+3 -3
View File
@@ -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)
pkgs/by-name/ak/aks-mcp-server/package.nix
+3 -3
View File
@@ -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" ];
pkgs/by-name/au/automatic-timezoned/package.nix
+3 -3
View File
@@ -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 ];
pkgs/by-name/ca/cargo-xwin/package.nix
+3 -3
View File
@@ -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";
pkgs/by-name/ch/checkov/package.nix
+2 -2
View File
@@ -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 = [
pkgs/by-name/cl/clickhouse/generic.nix
+37 -6
View File
@@ -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
];
pkgs/by-name/cl/clickhouse/lts.nix
+1 -6
View File
@@ -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"
];
}
pkgs/by-name/cl/clickhouse/package.nix
+1 -6
View File
@@ -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"
];
}
pkgs/by-name/cl/clickhouse/update.sh
Executable
+78
View File
@@ -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"
pkgs/by-name/co/codecrafters-cli/package.nix
+2 -2
View File
@@ -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
pkgs/by-name/db/dbip-asn-lite/package.nix
+2 -2
View File
@@ -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;
pkgs/by-name/db/dbip-city-lite/package.nix
+2 -2
View File
@@ -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;
pkgs/by-name/db/dbip-country-lite/package.nix
+6 -3
View File
@@ -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;
};
})
pkgs/by-name/dd/ddns-go/package.nix
+2 -2
View File
@@ -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=";
pkgs/by-name/di/dinish/package.nix
+2 -2
View File
@@ -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 = ''
pkgs/by-name/do/dotenvx/package.nix
+3 -3
View File
@@ -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;
pkgs/by-name/fa/famistudio/package.nix
+2 -2
View File
@@ -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 =
pkgs/by-name/fn/fn-cli/package.nix
+2 -2
View File
@@ -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;
pkgs/by-name/gh/gh/package.nix
+3 -3
View File
@@ -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 ];
pkgs/by-name/gr/grml-zsh-config/package.nix
+2 -2
View File
@@ -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;
pkgs/by-name/ki/kitty/package.nix
+3 -4
View File
@@ -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 = [
pkgs/by-name/lg/lgogdownloader/package.nix
+2 -2
View File
@@ -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 = [
pkgs/by-name/li/livekit/package.nix
+3 -3
View File
@@ -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" ];
pkgs/by-name/lz/lzham/package.nix
+20 -11
View File
@@ -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;
};
}
pkgs/by-name/md/mdns-scanner/package.nix
+3 -3
View File
@@ -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";
pkgs/by-name/mi/misconfig-mapper/package.nix
+3 -3
View File
@@ -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"
pkgs/by-name/mo/models-dev/package.nix
+3 -3
View File
@@ -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 {
pkgs/by-name/mt/mt32emu-smf2wav/package.nix
+5
View File
@@ -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 = [
pkgs/by-name/ne/neovim-unwrapped/package.nix
+2 -2
View File
@@ -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 = [
pkgs/by-name/ni/nix-heuristic-gc/package.nix
+2 -2
View File
@@ -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
pkgs/by-name/no/nova/package.nix
+3 -3
View File
@@ -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}"
pkgs/by-name/op/openfga/package.nix
+3 -3
View File
@@ -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 ];
pkgs/by-name/ph/phrase-cli/package.nix
+3 -3
View File
@@ -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}" ];
pkgs/by-name/pr/process-compose/package.nix
+2 -2
View File
@@ -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.
pkgs/by-name/re/renode-dts2repl/package.nix
+3 -3
View File
@@ -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 = [
pkgs/by-name/re/reth/package.nix
+3 -3
View File
@@ -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
pkgs/by-name/ru/rundeck/package.nix
+2 -2
View File
@@ -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 ];
pkgs/by-name/sm/smpmgr/package.nix
+2 -2
View File
@@ -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; [
pkgs/by-name/sn/sniffnet/package.nix
+3 -3
View File
@@ -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 ];
pkgs/by-name/st/stevenblack-blocklist/package.nix
+2 -2
View File
@@ -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 = [
pkgs/by-name/sv/svlint/package.nix
+3 -3
View File
@@ -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"
pkgs/by-name/sv/svtplay-dl/package.nix
+2 -2
View File
@@ -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 ];
pkgs/by-name/to/tokio-console/package.nix
+3 -3
View File
@@ -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";
pkgs/by-name/ub/ubports-pdk/package.nix
+3 -3
View File
@@ -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;
pkgs/by-name/vi/victoriametrics/package.nix
+2 -2
View File
@@ -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;
pkgs/by-name/vu/vuls/package.nix
+3 -3
View File
@@ -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"
pkgs/by-name/we/webdav/package.nix
+2 -2
View File
@@ -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=";
pkgs/by-name/za/zashboard/package.nix
+2 -2
View File
@@ -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 = [
pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
+6 -6
View File
@@ -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?= <joerg@thalheim.io>
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 <joerg@thalheim.io>
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
pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
-24
View File
@@ -1,24 +0,0 @@
From b83e6354de099860bcb1ca3876c222c57de89f0c Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
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
pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch
+52
View File
@@ -0,0 +1,52 @@
From 5c6f3e6c8c33e23b8bb3fe39b9ce26495724af09 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sat, 4 Oct 2025 19:27:19 -0700
Subject: [PATCH 2/2] Support single arch builds on macOS
Co-Authored-By: Michael Hoang <enzime@users.noreply.github.com>
---
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
pkgs/by-name/ze/zerotierone/package.nix
+13 -18
View File
@@ -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
pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix
+5
View File
@@ -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 = ''
pkgs/development/cuda-modules/packages/nccl-tests.nix
+11 -14
View File
@@ -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" ];
pkgs/development/python-modules/iamdata/default.nix
+2 -2
View File
@@ -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;
pkgs/development/python-modules/magika/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/pymitsubishi/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/python-smarttub/default.nix
+2 -2
View File
@@ -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 = [
pkgs/development/python-modules/pyvista/default.nix
+2 -6
View File
@@ -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 = [
pkgs/development/python-modules/reolink-aio/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/tesla-fleet-api/default.nix
+2 -5
View File
@@ -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 ];
pkgs/development/python-modules/types-aiobotocore/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/ucsmsdk/default.nix
+2 -2
View File
@@ -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 ];
pkgs/development/python-modules/vt-py/default.nix
+2 -2
View File
@@ -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 = ''
pkgs/development/python-modules/yamlfix/default.nix
+2 -2
View File
@@ -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 = [
pkgs/kde/generated/sources/plasma.json
+210 -210
View File
@@ -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="
}
}
pkgs/os-specific/windows/msvcSdk/default.nix
+19 -36
View File
@@ -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;
pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix
+91
View File
@@ -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/";
};
};
}
pkgs/os-specific/windows/msvcSdk/hashes.json
+3 -3
View File
@@ -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="
}
pkgs/os-specific/windows/msvcSdk/manifest.json
+58 -59
View File
File diff suppressed because one or more lines are too long
pkgs/os-specific/windows/msvcSdk/update.nu
+2 -2
View File
@@ -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
pkgs/stdenv/generic/check-meta.nix
+1 -1
View File
@@ -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 = "*";