Merge master into staging-next (aba5c3d6) · Commits · nix / nixpkgs

.github/workflows/pull-request-target.yml

+0 −3

Original line number	Diff line number	Diff line
		@@ -12,9 +12,6 @@ on:
		required: true
		NIXPKGS_CI_APP_PRIVATE_KEY:
		required: true
		OWNER_APP_PRIVATE_KEY:
		# The Test workflow should not actually request reviews from owners.
		required: false

		concurrency:
		group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number \|\| github.run_id }}

.github/workflows/teams.yml

+11 −16

Original line number	Diff line number	Diff line
		@@ -16,13 +16,17 @@ jobs:
		sync:
		runs-on: ubuntu-24.04-arm
		steps:
		# Use a GitHub App to create the PR so that CI gets triggered and to
		# request team member lists.
		- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
		id: team-token
		id: app-token
		with:
		app-id: ${{ vars.OWNER_APP_ID }}
		private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
		app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
		private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
		permission-administration: read
		permission-contents: write
		permission-members: read
		permission-pull-requests: write

		- name: Fetch source
		uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
		@@ -38,7 +42,7 @@ jobs:
		- name: Synchronise teams
		uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
		with:
		github-token: ${{ steps.team-token.outputs.token }}
		github-token: ${{ steps.app-token.outputs.token }}
		script: \|
		require('./ci/github-script/get-teams.js')({
		github,
		@@ -47,20 +51,11 @@ jobs:
		outFile: "maintainers/github-teams.json"
		})

		# Use a GitHub App to create the PR so that CI gets triggered
		- uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
		id: sync-token
		with:
		app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
		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:
		GH_TOKEN: ${{ steps.sync-token.outputs.token }}
		APP_SLUG: ${{ steps.sync-token.outputs.app-slug }}
		GH_TOKEN: ${{ steps.app-token.outputs.token }}
		APP_SLUG: ${{ steps.app-token.outputs.app-slug }}
		run: \|
		name="${APP_SLUG}[bot]"
		userId=$(gh api "/users/$name" --jq .id)
		@@ -70,7 +65,7 @@ jobs:
		- name: Create Pull Request
		uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
		with:
		token: ${{ steps.sync-token.outputs.token }}
		token: ${{ steps.app-token.outputs.token }}
		add-paths: maintainers/github-teams.json
		author: ${{ steps.user.outputs.git-string }}
		committer: ${{ steps.user.outputs.git-string }}

maintainers/github-teams.json

+0 −1

Original line number	Diff line number	Diff line
		@@ -724,7 +724,6 @@
		"description": "Provides leadership for and has authority over Nixpkgs.",
		"id": 14317027,
		"maintainers": {
		"K900": 386765,
		"alyssais": 2768870,
		"emilazy": 18535642,
		"wolfgangwalther": 9132420

pkgs/by-name/cl/claude-code/package-lock.json

+2 −2

Original line number	Diff line number	Diff line
		{
		"name": "@anthropic-ai/claude-code",
		"version": "2.0.33",
		"version": "2.0.34",
		"lockfileVersion": 3,
		"requires": true,
		"packages": {
		"": {
		"name": "@anthropic-ai/claude-code",
		"version": "2.0.33",
		"version": "2.0.34",
		"license": "SEE LICENSE IN README.md",
		"bin": {
		"claude": "cli.js"

pkgs/by-name/cl/claude-code/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -7,14 +7,14 @@
		}:
		buildNpmPackage (finalAttrs: {
		pname = "claude-code";
		version = "2.0.33";
		version = "2.0.34";

		src = fetchzip {
		url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
		hash = "sha256-Ng9uJj4STRCKk2ndk7zH3fF/OLZ/cvZSGKH2QRyOFcM=";
		hash = "sha256-GYykbpvkFTsj7tlsAimDrNbN9kP1+8AtfG+Boch8eSk=";
		};

		npmDepsHash = "sha256-89+DrE8rG5WPw6J+iw4t1t+1yJKdbaKLDodfP/CsViU=";
		npmDepsHash = "sha256-D0sbwZ5eCzIobFGf5LY7u3/RWQ6bYpGFDlU/ClPTA7Y=";

		postPatch = ''
		cp ${./package-lock.json} package-lock.json