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,377 commits into
base: master
Choose a base branch
from
Open

staging-next 2025-01-27 #377253

wants to merge 1,377 commits into from
+35,806 −11,499

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
@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 and others added 2 commits January 30, 2025 15:02
@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
@vcunat
libgccjit, gccgo*: remove a reflexive symlink
c3c1643 
https://hydra.nixos.org/build/286689241/nixlog/7/tail
https://hydra.nixos.org/build/287154953/nixlog/1/tail

Feel free to improve this ;-)
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 31, 2025
vcunat and others added 2 commits January 31, 2025 10:17
@vcunat
python3Packages.waitress: disable tests on darwin
864b2a1 
Let's just unblock the dependents.  I'm tired of these errors.
https://hydra.nixos.org/build/286270226#tabs-buildsteps

(cherry picked from commit 9a9e7a1 but expanded to all darwin)
https://hydra.nixos.org/build/287031598/nixlog/1/tail
https://hydra.nixos.org/build/287007661/nixlog/1/tail
@alyssais
Merge remote-tracking branch 'origin/master' into staging-next
dffcaaa 
Conflicts:
	pkgs/applications/virtualization/crosvm/default.nix
	pkgs/by-name/as/ast-grep/package.nix
	pkgs/by-name/ca/cargo-mobile2/package.nix
	pkgs/by-name/cl/clang-tidy-sarif/package.nix
	pkgs/by-name/gg/gg-jj/package.nix
	pkgs/by-name/gi/git-warp-time/package.nix
	pkgs/by-name/je/jellyfin-rpc/package.nix
	pkgs/by-name/ne/netbox2netshot/package.nix
	pkgs/by-name/sy/sydbox/package.nix
	pkgs/by-name/te/television/package.nix
	pkgs/development/python-modules/tinytuya/default.nix
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 31, 2025
@imincik imincik mentioned this pull request Jan 31, 2025
Open
13 tasks
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 31, 2025
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Jan 31, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 31, 2025
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: kernel The Linux kernel 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