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.

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

[Backport release-24.05] slskd: 0.21.3 -> 0.21.4 #345785

Merged

Conversation

melvyn2
Copy link
Contributor

@melvyn2 melvyn2 commented Oct 1, 2024

Manual backport of #344958, needed as 2641d97 isn't present in release-24.05.

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

melvyn2 and others added 5 commits October 1, 2024 17:50
(cherry picked from commit 5f34e0d)
(cherry picked from commit 8acd294)
(cherry picked from commit 02464bd)
(cherry picked from commit d4735e4)
@melvyn2 melvyn2 requested a review from ppom0 October 1, 2024 21:57
@melvyn2
Copy link
Contributor Author

melvyn2 commented Oct 1, 2024

An expected failure since merge conflicts had to be resolved.

@ofborg ofborg bot requested a review from getchoo October 1, 2024 23:16
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Oct 1, 2024
@fpletz
Copy link
Member

fpletz commented Oct 2, 2024

The test suite seems to fail on x86_64-linux on ofborg.

@melvyn2
Copy link
Contributor Author

melvyn2 commented Oct 2, 2024

I'm not sure how exactly to troubleshoot this: the exact same derivation (/nix/store/dgfwg97aqgabsncyk8fi00k0px1j0gnh-slskd-0.21.4.drv) builds completely normally with all tests passing on my machine.

@melvyn2
Copy link
Contributor Author

melvyn2 commented Oct 2, 2024

@ofborg eval

@melvyn2
Copy link
Contributor Author

melvyn2 commented Oct 2, 2024

@ofborg build slskd

@getchoo
Copy link
Member

getchoo commented Oct 2, 2024

I'm not sure how exactly to troubleshoot this: the exact same derivation (/nix/store/dgfwg97aqgabsncyk8fi00k0px1j0gnh-slskd-0.21.4.drv) builds completely normally with all tests passing on my machine.

Most likely a flakey test. Seems to be good enough for Ofborg now though and it hasn't been replicated in Hydra yet, so this may be good to merge? But I'd recommend disabling the test(s?) responsible here and in master at some point regardless

@melvyn2 melvyn2 mentioned this pull request Oct 7, 2024
13 tasks
@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 7, 2024
@Artturin Artturin merged commit 90fe4c0 into NixOS:release-24.05 Oct 7, 2024
35 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants