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

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-10-28 12:09:16 +00:00
committed by GitHub
parent c182554329 cf1ce7f9d1
commit f1a0342b8c
24 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/team.yml → .github/workflows/teams.yml
+5 -2
View File
@@ -4,8 +4,6 @@ on:
schedule:
# Every Tuesday at 19:42 (randomly chosen)
- cron: '42 19 * * 1'
# Allows manual trigger
workflow_dispatch:
permissions: {}
@@ -25,6 +23,7 @@ jobs:
private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
permission-administration: read
permission-members: read
- name: Fetch source
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
@@ -32,8 +31,10 @@ jobs:
sparse-checkout: |
ci/github-script
maintainers/github-teams.json
- name: Install dependencies
run: npm install bottleneck
- name: Synchronise teams
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
@@ -54,6 +55,7 @@ jobs:
private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
permission-contents: write
permission-pull-requests: write
- name: Get GitHub App User Git String
id: user
env:
@@ -64,6 +66,7 @@ jobs:
userId=$(gh api "/users/$name" --jq .id)
email="$userId+$name@users.noreply.github.com"
echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT"
- name: Create Pull Request
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
with:
ci/github-script/get-teams.js
Executable → Regular
+11 -8
View File
@@ -7,9 +7,13 @@ const excludeTeams = [
module.exports = async ({ github, context, core, outFile }) => {
const withRateLimit = require('./withRateLimit.js')
const { writeFileSync } = require('node:fs')
const org = context.repo.owner
const result = {}
await withRateLimit({ github, core }, async (_stats) => {
/// Turn an Array of users into an Object, mapping user.login -> user.id
await withRateLimit({ github, core }, async () => {
// Turn an Array of users into an Object, mapping user.login -> user.id
function makeUserSet(users) {
// Sort in-place and build result by mutation
users.sort((a, b) => (a.login > b.login ? 1 : -1))
@@ -20,21 +24,21 @@ module.exports = async ({ github, context, core, outFile }) => {
}, {})
}
/// Process a list of teams and append to the result variable
// Process a list of teams and append to the result variable
async function processTeams(teams) {
for (const team of teams) {
core.notice(`Processing team ${team.slug}`)
if (!excludeTeams.some((regex) => team.slug.match(regex))) {
const members = makeUserSet(
await github.paginate(github.rest.teams.listMembersInOrg, {
org: context.repo.owner,
org,
team_slug: team.slug,
role: 'member',
}),
)
const maintainers = makeUserSet(
await github.paginate(github.rest.teams.listMembersInOrg, {
org: context.repo.owner,
org,
team_slug: team.slug,
role: 'maintainer',
}),
@@ -49,7 +53,7 @@ module.exports = async ({ github, context, core, outFile }) => {
}
await processTeams(
await github.paginate(github.rest.teams.listChildInOrg, {
org: context.repo.owner,
org,
team_slug: team.slug,
}),
)
@@ -57,8 +61,7 @@ module.exports = async ({ github, context, core, outFile }) => {
}
const teams = await github.paginate(github.rest.repos.listTeams, {
owner: context.repo.owner,
repo: context.repo.repo,
...context.repo,
})
await processTeams(teams)
ci/github-script/run
-1
View File
@@ -91,7 +91,6 @@ program
.argument('[outFile]', 'Path to the output file (Example: github-teams.json). If not set, prints to stdout')
.action(async (owner, repo, outFile, options) => {
const getTeams = (await import('./get-teams.js')).default
// TODO: Refactor this file so we don't need to pass a PR
await run(getTeams, owner, repo, undefined, { ...options, outFile })
})
maintainers/team-list.nix
-1
View File
@@ -920,7 +920,6 @@ with lib.maintainers;
samasaur
stephank
trepetti
trundle
];
scope = "Maintain Swift compiler suite for NixOS.";
shortName = "Swift";
nixos/tests/aesmd.nix
-1
View File
@@ -3,7 +3,6 @@
name = "aesmd";
meta = {
maintainers = with lib.maintainers; [
trundle
veehaitch
];
};
pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "claude-code";
publisher = "anthropic";
version = "2.0.27";
hash = "sha256-4zifN9Wf7Tp+qrIvjf3iBPqu8wtedCAu1v93lDBAGbo=";
version = "2.0.28";
hash = "sha256-RfZDKiGPnmfNuq4D8dSO+Rk97g+Amo4G1apqgqVZttg=";
};
meta = {
pkgs/by-name/cl/claude-code/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "@anthropic-ai/claude-code",
"version": "2.0.27",
"version": "2.0.28",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@anthropic-ai/claude-code",
"version": "2.0.27",
"version": "2.0.28",
"license": "SEE LICENSE IN README.md",
"bin": {
"claude": "cli.js"
pkgs/by-name/cl/claude-code/package.nix
+3 -3
View File
@@ -7,14 +7,14 @@
}:
buildNpmPackage (finalAttrs: {
pname = "claude-code";
version = "2.0.27";
version = "2.0.28";
src = fetchzip {
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
hash = "sha256-ZxwEnUWCtgrGhgtUjcWcMgLqzaajwE3pG7iSIfaS3ic=";
hash = "sha256-S8Qp6xzbEnU0GOx8BfblHMsjmOZkPuTvSeCAHEZN8+E=";
};
npmDepsHash = "sha256-cBhHQYHmLtGhLfaK//L48qGZCF+u6N/OsLTTpNA2t+E==";
npmDepsHash = "sha256-EjvkOHRwhiBBMV9xZuYqObuz93CxbqUwNgc2enBA5go=";
postPatch = ''
cp ${./package-lock.json} package-lock.json
pkgs/by-name/pu/pulumi/package.nix
-1
View File
@@ -187,7 +187,6 @@ buildGoModule rec {
license = lib.licenses.asl20;
mainProgram = "pulumi";
maintainers = with lib.maintainers; [
trundle
veehaitch
tie
];
pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix
-1
View File
@@ -33,7 +33,6 @@ mkPulumiPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [
veehaitch
trundle
];
};
}
pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix
-1
View File
@@ -38,7 +38,6 @@ mkPulumiPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [
veehaitch
trundle
];
};
}
pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix
-1
View File
@@ -32,7 +32,6 @@ mkPulumiPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [
veehaitch
trundle
];
};
}
pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix
-1
View File
@@ -22,7 +22,6 @@ mkPulumiPackage rec {
license = licenses.asl20;
maintainers = with maintainers; [
veehaitch
trundle
];
};
}
pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix
-1
View File
@@ -25,7 +25,6 @@ mkPulumiPackage rec {
maintainers = with maintainers; [
tie
veehaitch
trundle
];
mainProgram = cmdRes;
};
pkgs/by-name/sa/sage/sagelib.nix
-8
View File
@@ -13,7 +13,6 @@
gd,
iml,
libpng,
readline,
blas,
boost,
brial,
@@ -23,7 +22,6 @@
fflas-ffpack,
flint,
gap,
giac,
givaro,
glpk,
gsl,
@@ -44,7 +42,6 @@
planarity,
ppl,
rankwidth,
ratpoints,
singular,
sqlite,
symmetrica,
@@ -60,7 +57,6 @@
ipykernel,
ipython,
ipywidgets,
jinja2,
jupyter-client,
jupyter-core,
lrcalc-python,
@@ -117,7 +113,6 @@ buildPythonPackage rec {
gd
iml
libpng
readline
];
env = lib.optionalAttrs stdenv.cc.isClang {
@@ -138,7 +133,6 @@ buildPythonPackage rec {
fflas-ffpack
flint
gap
giac
givaro
glpk
gsl
@@ -159,7 +153,6 @@ buildPythonPackage rec {
planarity
ppl
rankwidth
ratpoints
singular
sqlite
symmetrica
@@ -177,7 +170,6 @@ buildPythonPackage rec {
ipykernel
ipython
ipywidgets
jinja2
jupyter-client
jupyter-core
lrcalc-python
pkgs/by-name/se/seppo/package.nix
+3 -3
View File
@@ -12,14 +12,14 @@ in
ocamlPackages.buildDunePackage {
pname = "seppo";
version = "0-unstable-2025-06-03";
version = "0-unstable-2025-08-07";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "seppo";
repo = "seppo";
rev = "33ae3e9f61d596fb91d3ab1a91fc26ae80981a93";
hash = "sha256-tOIIfYBLcZqQzoPxAVkE8RGX0sugUmDGpxIhIZ5Wy+w=";
rev = "d927311cae64883fe2b88f5a1c7e17c8cc525bad";
hash = "sha256-Lb2w0mRNNamCltAwdxOyAYh02wkN7yKJGBzqBIPKE8k=";
};
# Provide git sha to avoid git dependency
pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
-1
View File
@@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/microsoft/azure-dcap-client";
maintainers = with lib.maintainers; [
phlip9
trundle
veehaitch
];
platforms = [ "x86_64-linux" ];
pkgs/by-name/sg/sgx-ssl/package.nix
-1
View File
@@ -84,7 +84,6 @@ stdenv.mkDerivation {
homepage = "https://github.com/intel/intel-sgx-ssl";
maintainers = with lib.maintainers; [
phlip9
trundle
veehaitch
];
platforms = [ "x86_64-linux" ];
pkgs/by-name/st/stalwart-mail/package.nix
+4
View File
@@ -50,6 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
]
++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
nativeCheckInputs = [
openssl
];
# Issue: https://github.com/stalwartlabs/stalwart/issues/1104
buildNoDefaultFeatures = true;
buildFeatures = [
pkgs/by-name/wo/worker-build/package.nix
+3 -3
View File
@@ -6,17 +6,17 @@
rustPlatform.buildRustPackage rec {
pname = "worker-build";
version = "0.6.6";
version = "0.6.7";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "workers-rs";
tag = "v${version}";
hash = "sha256-Ia921UNb++9Y1NoEd7nNdJaEEqRxQLAzZ8yYaxPrWYc=";
hash = "sha256-c0PXLuWEY+keYRAjQkgd84Hn7IDh17SePKDF9J4ZQ5M=";
fetchSubmodules = true;
};
cargoHash = "sha256-sIxsGeORhWpL3lWzXas7fK4QVuB03UT7rAN8uEzOdr0=";
cargoHash = "sha256-axK9/EVNKBb4xoYMOJ+0Y5nQvtkYyFDE6RsiL2MqxTM=";
buildAndTestSubdir = "worker-build";
pkgs/development/ocaml-modules/domain-name/default.nix
+7 -11
View File
@@ -1,31 +1,27 @@
{
lib,
buildDunePackage,
ocaml,
fetchurl,
alcotest,
}:
buildDunePackage rec {
buildDunePackage (finalAttrs: {
pname = "domain-name";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-${version}.tbz";
sha256 = "sha256-Hboy81p81cyBh9IeLMIaC2Z6ZFRHoO7+V6/jyiW8RWY=";
url = "https://github.com/hannesm/domain-name/releases/download/v${finalAttrs.version}/domain-name-${finalAttrs.version}.tbz";
hash = "sha256-nseuLCJ3LBULhM+j8h2b8l+uFKeW8x4g31LYb0ZJnYk=";
};
minimalOCamlVersion = "4.04";
duneVersion = "3";
doCheck = true;
checkInputs = [ alcotest ];
doCheck = lib.versionAtLeast ocaml.version "4.08";
meta = {
homepage = "https://github.com/hannesm/domain-name";
changelog = "https://github.com/hannesm/domain-name/blob/v${finalAttrs.version}/CHANGES.md";
description = "RFC 1035 Internet domain names";
license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ];
};
}
})
pkgs/development/ocaml-modules/magic-trace/default.nix
+9 -6
View File
@@ -18,7 +18,7 @@
zstandard ? null,
}:
buildDunePackage rec {
buildDunePackage (finalAttrs: {
pname = "magic-trace";
version = "1.2.4";
@@ -27,13 +27,14 @@ buildDunePackage rec {
src = fetchFromGitHub {
owner = "janestreet";
repo = "magic-trace";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-LkhnlOd5rI8cbOYbVqrkRJ2qTcRn3Zzl6GjQEdjBjVA=";
};
nativeBuildInputs = [
ocaml-crunch
];
buildInputs = [
angstrom
async
@@ -50,10 +51,12 @@ buildDunePackage rec {
zstandard
];
meta = with lib; {
meta = {
description = "Collects and displays high-resolution traces of what a process is doing";
license = licenses.mit;
maintainers = [ maintainers.alizter ];
license = lib.licenses.mit;
maintainers = [ lib.maintainers.alizter ];
homepage = "https://github.com/janestreet/magic-trace";
platforms = lib.platforms.linux;
mainProgram = "magic-trace";
};
}
})
pkgs/development/ocaml-modules/tls/eio.nix
+2
View File
@@ -17,6 +17,8 @@ buildDunePackage {
minimalOCamlVersion = "5.0";
__darwinAllowLocalNetworking = true;
doCheck = true;
nativeCheckInputs = [
mdx.bin
pkgs/kde/misc/kirigami-addons/default.nix
+2 -2
View File
@@ -8,11 +8,11 @@
}:
mkKdeDerivation rec {
pname = "kirigami-addons";
version = "1.9.0";
version = "1.10.0";
src = fetchurl {
url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
hash = "sha256-ITFKkfJrHJYt7z/X/y52LTNYsHX2P01+AUT7LGO368c=";
hash = "sha256-yY+Sv3xFLhL23EA0BCFUE9s5Wf6QStgw6tDba7CbPRE=";
};
extraNativeBuildInputs = [ qttools ];