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

qbittorrent: 5.0.1 -> 5.0.2; move to by-name; modernize derivation #358115

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

KSJ2000
Copy link
Contributor

@KSJ2000 KSJ2000 commented Nov 22, 2024

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.

Copy link
Contributor

@azuwis azuwis left a comment

Choose a reason for hiding this comment

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

Just remove non-default apple SDK input, and use the default one.

See https://github.com/NixOS/nixpkgs/blob/master/doc/stdenv/platform-notes.chapter.md for more info.

pkgs/by-name/qb/qbittorrent/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/qb/qbittorrent/package.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@ambroisie ambroisie left a comment

Choose a reason for hiding this comment

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

Just from a cursory look, doesn't this remove qbittorrent-nox completely, as the PR currently stands?

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/by-name/qb/qbittorrent/package.nix Show resolved Hide resolved
pkgs/by-name/qb/qbittorrent/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/qb/qbittorrent/package.nix Show resolved Hide resolved
pkgs/by-name/qb/qbittorrent/package.nix Show resolved Hide resolved
@azuwis
Copy link
Contributor

azuwis commented Nov 23, 2024

You don't need to duplicate most code in pkgs/by-name/qb/qbittorrent-nox, just add this in pkgs/top-level/all-packages.nix:

qbittorrent-nox = callPackage ../by-name/qb/qbittorrent/package.nix { guiSupport = false; };

See https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/README.md#changing-implicit-attribute-defaults

As for the apple-sdk version, I've asked in the matrix #macos:nixos.org:

azuwis: I'm trying to fix moonlight-qt on x86_64-darwin https://hydra.nixos.org/build/278554147/nixlog/2 after #353256 merged, but not quite sure what apple-sdk shoud be used.

moonlight-qt on aarch64-darwin was build on hydra with default apple-sdk(11), seems works fine on my local machine with limited test.

reckenrode: apple-sdk_11 should work if it builds on aarch64-darwin. For 25.05, both architectures will use the same SDK defaults.

I think the reason for that is the deployment target, if new apple SDK is used without specifying darwinMinVersionHook, may end up a binary that does not run in old macOS version.

@KSJ2000 KSJ2000 force-pushed the qBittorrent branch 2 times, most recently from 9822d63 to 8b711f6 Compare November 24, 2024 11:01
@KSJ2000 KSJ2000 changed the title qbittorrent: 5.0.1 -> 5.0.2; modernize derivation qbittorrent: 5.0.1 -> 5.0.2; move to by-name; modernize derivation Nov 24, 2024
@azuwis
Copy link
Contributor

azuwis commented Nov 24, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 358115


x86_64-linux

✅ 2 packages built:
  • qbittorrent
  • qbittorrent-nox

aarch64-darwin

✅ 2 packages built:
  • qbittorrent
  • qbittorrent-nox

x86_64-darwin

✅ 2 packages built:
  • qbittorrent
  • qbittorrent-nox

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 28, 2024
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 29, 2024
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
'';

passthru.updateScript = nix-update-script { };
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
passthru.updateScript = nix-update-script { };
passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };

Copy link
Contributor

Choose a reason for hiding this comment

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

Run nix-shell maintainers/scripts/update.nix --argstr package qbittorrent to test.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants