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

upscayl: darwin support, add darwin maintainer #372657

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

upscayl: darwin support, add darwin maintainer #372657

wants to merge 2 commits into from

Conversation

matteo-pacini
Copy link
Contributor

@matteo-pacini matteo-pacini commented Jan 10, 2025 •
edited
Loading

  • Added darwin support for the package
  • Added myself as maintainer
  • Specified "x86_64-linux" for the AppImage, as it only contains that architecture

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.

@github-actions github-actions bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jan 10, 2025
@matteo-pacini
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 372657

x86_64-linux

x86_64-darwin

✅ 1 package built:
  • upscayl

aarch64-darwin

✅ 1 package built:
  • upscayl

@nixos-discourse
Copy link

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/5068

@Icy-Thought
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 372657

@Icy-Thought
Copy link
Contributor

Apparently the results were not posted... interesting. The package works as intended though!

@matteo-pacini
Copy link
Contributor Author

@Icy-Thought that means that are no changes in output for Linux, which is a good sign!

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 10, 2025
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 12, 2025
@nixos-discourse
Copy link

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

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

ethancedwards8
ethancedwards8 suggested changes Jan 19, 2025
View reviewed changes
@ethancedwards8
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 372657

aarch64-darwin

✅ 1 package built:
  • upscayl

@nixos-discourse
Copy link

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

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

@matteo-pacini matteo-pacini added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package label Jan 21, 2025
@nixos-discourse
Copy link

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/5138

@nixos-discourse
Copy link

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

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

@matteo-pacini matteo-pacini added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Feb 25, 2025
SuperSandro2000
SuperSandro2000 reviewed Feb 27, 2025
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

otherwise LGTM

pkgs/by-name/up/upscayl/linux.nix Outdated
Comment on lines 36 to 42
cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png

substituteInPlace $out/share/applications/${pname}.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'

wrapProgram $out/bin/${pname} \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
cp ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
cp ${appimageContents}/${pname}.png $out/share/pixmaps/${pname}.png
substituteInPlace $out/share/applications/${pname}.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname}'
wrapProgram $out/bin/${pname} \
cp ${appimageContents}/upscayl.desktop $out/share/applications/upscayl.desktop
cp ${appimageContents}/upscayl.png $out/share/pixmaps/upscayl.png
substituteInPlace $out/share/applications/upscayl.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=upscayl'
wrapProgram $out/bin/upscayl \

there is a tracking issue to stop overusing pname

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@SuperSandro2000 fixed, thanks!

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

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@Icy-Thought Icy-Thought Icy-Thought approved these changes

@ethancedwards8 ethancedwards8 ethancedwards8 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@matteo-pacini @nixos-discourse @Icy-Thought @ethancedwards8 @SuperSandro2000 @wegank