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 from staging-next #370761

Merged
merged 146 commits into from
Jan 4, 2025
Merged

[staging] merge from staging-next #370761

merged 146 commits into from
Jan 4, 2025

Conversation

pbsds
Copy link
Member

@pbsds pbsds commented Jan 4, 2025 •
edited
Loading

fixes https://github.com/NixOS/nixpkgs/actions/runs/12605651116
caused by #368177

manual fixes: https://gist.github.com/pbsds/d417f0759e75ec34b81f389efa564fd0
of interest is pkgs/development/python-modules/music-assistant-models/default.nix which was migrated to tag incorrectly

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.

qubitnano and others added 30 commits December 4, 2024 17:12
@qubitnano
unifi-controller: patchelf unifi's sdnotify
0b6f4a2 
Fixes the following in server.log:

<launcher> ERROR sdnotify - failed to load ubnt_sdnotify_jni

java.lang.UnsatisfiedLinkError:
/var/lib/unifi/lib/native/Linux/x86_64/libubnt_sdnotify_jni.so:
libsystemd.so.0: cannot open shared object file: No such file or
directory
@qubitnano
nixos/unifi: enable sd_notify
e5b5cf8 
Let's use unifi's sd_notify now that it's patched
@qubitnano
nixos/unifi: always restart service
5d10e2b 
This allows the controller to restart when restoring from a backup
@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
@jmbaur
pinentry-rofi: add rofi and coreutils to runtime PATH
17f32f3 
This program wants to call `env rofi`, however when pinentry-rofi is
configured as the pinentry program for gpg-agent via a systemd service,
these dependencies might not be available in the service's PATH.
@Sigmanificient
python3Packages.tinytag: 1.10.4 -> 2.0.0
e94b558
@magneticflux-
dell-command-configure: fix missing include in wrapper
ed4bda4 
Also removes unused `rec`.
@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
@musjj
evcxr: add mainProgram
fb6bdb4
@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
@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 6.topic: haskell 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 labels Jan 4, 2025
@pbsds pbsds requested review from K900 and Atemu January 4, 2025 00:28
@pbsds pbsds marked this pull request as ready for review January 4, 2025 00:29
@nix-owners
Copy link

nix-owners bot commented Jan 4, 2025

The PR's base branch is set to staging, but 144 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch: 
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
git rebase --onto a2891e6416a43fd4288c2697dc0012b768d08014 b16a62cd6010999a77f2e9ee290397278030f41f
git push --force-with-lease

@emilazy
Copy link
Member

emilazy commented Jan 4, 2025

(We tend to push these directly because GitHub is… like this, and our CI isn’t great at handling it either. Though I do wish we had a way of doing proper review.)

@pbsds
Copy link
Member Author

pbsds commented Jan 4, 2025

I thought staging was write-protected?

@nix-owners
Copy link

nix-owners bot commented Jan 4, 2025

The PR's base branch is set to staging, but 144 commits from the master branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the master branch, change the base branch to master
  • If the changes should go to the staging branch, rebase your PR onto the merge base with the staging branch: 
    # git rebase --onto $(git merge-base upstream/staging HEAD) $(git merge-base upstream/master HEAD)
git rebase --onto a2891e6416a43fd4288c2697dc0012b768d08014 b16a62cd6010999a77f2e9ee290397278030f41f
git push --force-with-lease

@emilazy
Copy link
Member

emilazy commented Jan 4, 2025

For force pushes I expect so, but people regularly make direct commits to staging-next and I imagine staging is probably the same. Certainly people do manual merge commits to them constantly, since the automation fails a lot. (I think actually you can push merge commits to master manually too, and some people do for PR merges.)

@emilazy
Copy link
Member

emilazy commented Jan 4, 2025

(Anyway the Gist looks good to me, and I even maintain some of those packages. I’d make this a proper approval but clicking the tab I need to be on for that makes my browser die.)

Atemu
Atemu approved these changes Jan 4, 2025
View reviewed changes
Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My browser is too powerful to be stopped by a mere 3000 changes

@Atemu Atemu merged commit c2e24a7 into NixOS:staging Jan 4, 2025
44 of 50 checks passed
@Atemu
Copy link
Member

Atemu commented Jan 4, 2025

cc @mweinelt about the fix for the botched music-assistant-models migration. Perhaps double check that it's correct now.

@pbsds
Copy link
Member Author

pbsds commented Jan 4, 2025

huh, i was working out a git worktree-based approach to do the merge into an upstream remote directly. This is what i had gotten to when i saw you merge this:

git fetch upstream staging
git fetch upstream staging-next
git worktree add ../fix/merge-conflict upstream/staging
cd ../fix/merge-conflict
git checkout -b fix-merge-conflict --track upstream/staging
git merge upstream/staging-next
# do fixes
git commit
git push

What do you commonly do @emilazy?

@emilazy
Copy link
Member

emilazy commented Jan 4, 2025

I think people usually just do the very basic git switch staging && git merge staging-next. I do jj new staging staging-next (and then jj bookmark set staging && jj git push --remote origin when I’m done resolving conflicts) because I’m Nixpkgs’ resident Jujutsu shill :)

@mweinelt
Copy link
Member

mweinelt commented Jan 4, 2025

cc @mweinelt about the fix for the botched music-assistant-models migration. Perhaps double check that it's correct now.

It's wrong.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Atemu Atemu Atemu approved these changes

@K900 K900 Awaiting requested review from K900

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: haskell 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.