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] merge master #370755

Closed
wants to merge 128 commits into from
Closed

[staging] merge master #370755

wants to merge 128 commits into from

Conversation

pbsds
Copy link
Member

@pbsds pbsds commented Jan 3, 2025

manual merge master->staging to account for #368177, a merge from master->staging-next was conflict free

These are my manual fixes: https://gist.github.com/pbsds/df7240a564f488d144dd630e63fe84ba, of interest is the fix to pkgs/development/python-modules/music-assistant-models/default.nix which fixes an erroneous switch to tag on staging

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

motiejus and others added 30 commits December 10, 2024 20:58
@motiejus
headscale: backport BaseDomain and ServerURL checks
f1bdc12 
Currently users upgrading from 24.05 to 24.11 may stumble across an
overly-restrictive BaseURL and ServerURL check in headscale[1].

A fix has been merged upstream[2], this is backport, so users can have
it easier upgrading from 24.05 to 24.11 or unstable.

The patch does not apply cleanly on v0.23.0, so putting it here instead.

Supersedes NixOS#357969, this will be backported to 24.11 with a tag.

[1]: juanfont/headscale#2210
[2]: juanfont/headscale#2248
@kjeremy
vmware-guest: Don't use lib directly for maintainers
7d4abac
@djds
Remove with lib from minimal profile; group config
26e66c5
@Sigmanificient
python3Packages.tinytag: 1.10.4 -> 2.0.0
e94b558
@fee1-dead
cnijfilter2: add patch to fix missing import
913c5d2
@TomaSajt
rstudio: format with nixfmt
e7ff77d
@TomaSajt
rstudio: don't use libsForQt5.callPackage
3f9546f
@TomaSajt
rstudio: clean up by moving values around
b43523d
@TomaSajt
rstudio: refactor patches and deps, use lib.cmake*
e8cc15f
@TomaSajt
rstudioWrapper: only symlink share directory if not server
3ce431a
@booxter
thunderbird: fix darwin build
34b5b9a 
Add patches for bundled libraries (rnp and libsexpp) to handle clang 19
lack of char_traits for unsigned char.
@stepbrobd
caddy: 2.8.4 -> 2.9.0
7c52e7a
@Gliczy
alpaca: 3.1.0 -> 3.2.0
df8c70a
@DimitarNestorov
broot: 1.44.3 -> 1.44.4
4df6154
@r-ryantm
sbt-with-scala-native: 1.10.6 -> 1.10.7
7c1fe22
@r-ryantm
sbt: 1.10.6 -> 1.10.7
3a63b6f
@r-ryantm
fwup: 1.11.0 -> 1.12.0
5d239cc
@iainvm
go-task: update shell completions
783d48a
@FliegendeWurst
irssi: fix cross build
fb8b7c3
@fabaff
python312Packages.archinfo: 9.2.134 -> 9.2.135
a6503ea 
Diff: angr/archinfo@refs/tags/v9.2.134...v9.2.135
@fabaff
python312Packages.ailment: 9.2.134 -> 9.2.135
ee18541 
Diff: angr/ailment@refs/tags/v9.2.134...v9.2.135
@fabaff
python312Packages.pyvex: 9.2.134 -> 9.2.135
417db03
@fabaff
python312Packages.claripy: 9.2.134 -> 9.2.135
579af0b 
Diff: angr/claripy@refs/tags/v9.2.134...v9.2.135
@fabaff
python312Packages.cle: 9.2.134 -> 9.2.135
43a7804 
Diff: angr/cle@refs/tags/v9.2.134...v9.2.135
@fabaff
python311Packages.angr: 9.2.134 -> 9.2.135
a2f3aab 
Diff: angr/angr@refs/tags/v9.2.134...v9.2.135
@r-ryantm
nb: 7.15.0 -> 7.15.1
3ed899a
@fabaff
python312Packages.aioacaia: 0.1.11 -> 0.1.12
b989541 
Diff: zweckj/aioacaia@refs/tags/v0.1.11...v0.1.12

Changelog: https://github.com/zweckj/aioacaia/releases/tag/v0.1.12
@fabaff
python312Packages.twitchapi: 4.3.1 -> 4.4.0
6fa6721 
Diff: Teekeks/pyTwitchAPI@refs/tags/v4.3.1...v4.4.0

Changelog: https://github.com/Teekeks/pyTwitchAPI/blob/refs/tags/v4.4.0/docs/changelog.rst
@r-ryantm @wegank
stanc: 2.35.0 -> 2.36.0
c29e08f
@wegank
cmdstan: 2.35.0 -> 2.36.0
2d34f69
thoughtpolice and others added 15 commits January 3, 2025 16:20
@thoughtpolice
buck2: migrate to pkgs/by-name
d3ce529 
Signed-off-by: Austin Seipp <[email protected]>
@thoughtpolice
buck2: 2024-10-15 -> 2025-01-02
4bc2a5f 
Signed-off-by: Austin Seipp <[email protected]>
@mweinelt
home-assistant: support jvc_projector component (NixOS#370684)
14a0b57
@wegank
cnijfilter2: add patch to fix missing import (NixOS#369086)
7f5756b
@wegank
bazel_{5,6,7}: use new apple sdk pattern (NixOS#370672)
80893e0
@TomaSajt
rstudio: clean up and refactor (NixOS#357034)
f4d10f1
@wegank
treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin
896be7b
@rhendric
python3Packages.tinytag: 1.10.4 -> 2.0.0 (NixOS#367456)
c0cb675
@pbsds
treewide: migrate fetchgit rev = "refs/tags/..." to tag
0cd04d3
@rhendric
Remove with lib from minimal profile; group config (NixOS#365239)
aa8929e
@dotlambda
python312Packages.imgw-pib: 1.0.7 -> 1.0.8 (NixOS#370677)
6db5f9d
@pbsds
treewide: migrate fetchgit rev = "refs/tags/..." to tag (NixOS#36…
de9ea63 
…8177)
@emilazy
treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin …
42c7314 
…(pass 2) (NixOS#370744)
@rhendric
vmware-guest: Don't use lib directly for maintainers (NixOS#364628)
a7f712a
@pbsds
Merge remote-tracking branch 'upstream/master' into migrate-git-tag-m…
0581319 
…erge-1735947667
@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: GNOME GNOME desktop environment and its underlying platform 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: policy discussion 6.topic: ocaml 6.topic: mate The MATE Desktop Environment 6.topic: vscode 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: php 6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500 labels Jan 3, 2025
@pbsds
Copy link
Member Author

pbsds commented Jan 4, 2025

#368177 (comment)

@pbsds pbsds closed this Jan 4, 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
6.topic: continuous integration Affects continuous integration (CI) in Nixpkgs, including Ofborg and GitHub Actions 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: mate The MATE Desktop Environment 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: ocaml 6.topic: php 6.topic: policy discussion 6.topic: python 6.topic: vscode 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.