spotify-unwrapped: add macOS builds

[Enzime]

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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/)
• 22.11 Release Notes (or backporting 22.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
  • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
• Fits CONTRIBUTING.md.

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/1334

[Enzime]

@SuperSandro2000 all I did as part of this PR was move the contents from default.nix to linux.nix, what do you think about fixing these issues in a different PR to keep this one focused?

[laMudri]

I haven't used this package for years. Please could I be removed from the maintainers list?

[Atemu]

Result of nixpkgs-review pr 195473 run on aarch64-darwin 1

1 package built:

• spotify (spotify-unwrapped)

Opened it and it works as expected. I'm on Monterey though, so idk whether it'd work with Ventura's new Gatekeeper but we're not modifying it, so it should.

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/666

[SuperSandro2000]

@SuperSandro2000 all I did as part of this PR was move the contents from default.nix to linux.nix, what do you think about fixing these issues in a different PR to keep this one focused?

GitHub has no support for displaying moved hunks like the git cli so unless I compare the lines one by one I do not know that. Fine for me but the wrapper condition needs to be less awkward between Linux and Darwin. Let me create a PR that removes the wrapper.

[SuperSandro2000]

#199779

[SuperSandro2000]

I just merged the consolidation of the wrapper. Now we don't need to think about the differences between darwin and linux and can make the package decision in top-level.nix or in the package. I have a preference to do it inside of the package but the other way is also fine.

[Enzime]

@SuperSandro2000 rebased on top of master 👍

[nixos-discourse]

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/883

[yamashitax]

Reviewed points

• package name fits guidelines
• package version fits guidelines
• package build on aarch64-darwin
• executables tested on aarch64-darwin
• all depending packages build

Possible improvements

Unable to build due to a merge conflict.

Comments

Result of nixpkgs-review

➜ nix-shell -p nixpkgs-review --run "nixpkgs-review pr 195473"
$ git -c fetch.prune=false fetch --no-tags --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/195473/head:refs/nixpkgs-review/1
remote: Enumerating objects: 24, done.
remote: Counting objects: 100% (22/22), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 12 (delta 9), reused 6 (delta 5), pack-reused 0
Unpacking objects: 100% (12/12), 1.54 KiB | 142.00 KiB/s, done.
From https://github.com/NixOS/nixpkgs
   8f8bb3bb7ed..ed7e3a25a9d  master     -> refs/nixpkgs-review/0
$ git worktree add /Users/yamashita/.cache/nixpkgs-review/pr-195473-1/nixpkgs ed7e3a25a9d964177bd52ff31238bd950dca6807
Preparing worktree (detached HEAD ed7e3a25a9d)
Updating files: 100% (34527/34527), done.
HEAD is now at ed7e3a25a9d Merge pull request #226285 from marsam/update-flexget
$ git merge --no-commit --no-ff 5f78d39caa98d86f1b29caee5733ff4febe0141e
Auto-merging pkgs/applications/audio/spotify/default.nix
CONFLICT (content): Merge conflict in pkgs/applications/audio/spotify/default.nix
Auto-merging pkgs/applications/audio/spotify/update.sh
Automatic merge failed; fix conflicts and then commit the result.
https://github.com/NixOS/nixpkgs/pull/195473 failed to build
$ git worktree prune

[Enzime]

@yamashitax updated 👍

[Enzime]

@yamashitax updated 👍 if you could review again that would be much appreciated

[yamashitax]

Result of nixpkgs-review pr 195473 run on aarch64-darwin 1

1 package built:

• spotify

Works as intended

[yamashitax]

@SuperSandro2000 Seems fine to merge this now, from what I can tell.

[Atemu]

Result of nixpkgs-review pr 195473 run on aarch64-darwin 1

1 package built:

• spotify

[Atemu]

(This is on Ventura; works with Gatekeeper.)

[SuperSandro2000]

Suggested change

[jtojnar]

GitHub has no support for displaying moved hunks like the git cli so unless I compare the lines one by one I do not know that. Fine for me but the wrapper condition needs to be less awkward between Linux and Darwin. Let me create a PR that removes the wrapper.

That is why it is good idea to rename files in a separate commit from any other changes. That way the change commit can be reviewed separately and git blame will continue to work.