Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

staging-next 2025-01-27 #377253

Open
wants to merge 1,358 commits into
base: master
Choose a base branch
from
Open

staging-next 2025-01-27 #377253

wants to merge 1,358 commits into from
+35,631 −11,310

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented Jan 27, 2025

@vcunat vcunat added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jan 27, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 27, 2025
@vcunat vcunat mentioned this pull request Jan 27, 2025
Merged
1 task
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde 8.has: documentation This PR adds or changes documentation 8.has: changelog 6.topic: emacs Text editor 6.topic: rust 6.topic: golang 6.topic: ruby 6.topic: vim 6.topic: erlang 6.topic: ocaml 6.topic: stdenv Standard environment 6.topic: nodejs 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: lua 6.topic: cinnamon Desktop environment 6.topic: R 6.topic: vscode 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: games 6.topic: julia 6.topic: php 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: flutter 6.topic: xen-project The Xen Project hypervisor and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Jan 27, 2025
alyssais and others added 4 commits January 28, 2025 13:29
@alyssais
Merge remote-tracking branch 'origin/master' into staging-next
35febc0 
Conflicts:
	pkgs/by-name/ha/harper/package.nix
@alyssais
ruby: useFetchCargoVendor
e24c43c 
Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
@alyssais
cargo-auditable: useFetchCargoVendor
51fa0b0 
Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
@jian-lin
emacs: elisp packages update (#377309)
bd52c12
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 28, 2025
@alyssais
Merge remote-tracking branch 'origin/master' into staging-next
896bd47 
Conflicts:
	pkgs/applications/version-management/git-cliff/default.nix
	pkgs/by-name/ba/bacon/package.nix
	pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix
	pkgs/development/python-modules/elevenlabs/default.nix
	pkgs/development/python-modules/jupyter-server/default.nix
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 28, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 29, 2025
@mweinelt
Merge remote-tracking branch 'origin/master' into staging-next
909803a 
Conflicts:
- pkgs/by-name/au/automatic-timezoned/package.nix
- pkgs/by-name/da/darklua/package.nix
- pkgs/by-name/ki/kittycad-kcl-lsp/package.nix
- pkgs/by-name/li/limbo/package.nix
- pkgs/by-name/mi/minijinja/package.nix
- pkgs/by-name/pa/pay-respects/package.nix
- pkgs/by-name/ri/river-bsp-layout/package.nix
- pkgs/by-name/sv/svgbob/package.nix
- pkgs/by-name/tu/tui-journal/package.nix
- pkgs/by-name/wa/waypipe/package.nix
- pkgs/development/python-modules/zxcvbn-rs-py/default.nix
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 29, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 29, 2025
trofi and others added 4 commits January 29, 2025 21:42
@trofi
python3Packages.langchain-ollama: fix updateScript eval
eabb90e 
Without the change the update script fails as:

    error:

       error: function 'anonymous lambda' called with unexpected argument 'skipBulkUpdate'
       at pkgs/by-name/ni/nix-update/nix-update-script.nix:6:1:
            5|
            6| {
             | ^
            7|   attrPath ? null,
@mweinelt
python3Packages.langchain-ollama: fix updateScript eval (#377693)
34e6ffa
@FliegendeWurst
bluez: do not link to removed test binary
42a6b7b
@mweinelt
Merge remote-tracking branch 'origin/master' into staging-next
d59a511 
Conflicts:
- pkgs/by-name/ca/cargo-pgo/package.nix
- pkgs/by-name/lr/lrcget/package.nix
- pkgs/by-name/no/noseyparker/package.nix
- pkgs/development/python-modules/cysignals/default.nix
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 29, 2025
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 30, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 30, 2025
@alyssais
Merge remote-tracking branch 'origin/master' into staging-next
97fc6f3 
Conflicts:
	pkgs/by-name/ez/eza/package.nix
	pkgs/by-name/re/rewatch/package.nix
	pkgs/by-name/rq/rqbit/package.nix
	pkgs/development/python-modules/diffusers/default.nix
	pkgs/development/python-modules/manga-ocr/default.nix
	pkgs/development/tools/misc/texlab/default.nix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: cinnamon Desktop environment 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: emacs Text editor 6.topic: erlang 6.topic: flutter 6.topic: games 6.topic: golang 6.topic: julia 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: lua 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 6.topic: ocaml 6.topic: php 6.topic: python 6.topic: qt/kde 6.topic: R 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 6.topic: vscode 6.topic: xen-project The Xen Project hypervisor 8.has: changelog 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@vcunat @mweinelt @natsukium @dotlambda @alyssais @K900 @jian-lin @jtojnar @trofi @FliegendeWurst