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

sozi: init at 23.7.25-1690311612 #321465

Merged
merged 1 commit into from
Jul 8, 2024
Merged

sozi: init at 23.7.25-1690311612 #321465

merged 1 commit into from
Jul 8, 2024

Conversation

srghma
Copy link
Contributor

@srghma srghma commented Jun 21, 2024

Description of changes

adding sozi

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.

Copy link
Member

@afh afh left a comment

Choose a reason for hiding this comment

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

Thanks for this PR, @srghma, much appreciated.

Please find below a few ideas and suggestions on how to improve this PR. Hopefully I've been able to give understandable and helpful feedback. Do let me know if there are any questions.

pkgs/applications/office/sozi/default.nix Outdated Show resolved Hide resolved
pkgs/applications/office/sozi/default.nix Outdated Show resolved Hide resolved
pkgs/applications/office/sozi/default.nix Outdated Show resolved Hide resolved
pkgs/applications/office/sozi/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved
pkgs/applications/office/sozi/default.nix Outdated Show resolved Hide resolved
pkgs/applications/office/sozi/default.nix Outdated Show resolved Hide resolved
@afh
Copy link
Member

afh commented Jun 24, 2024

Thank you for accepting the review suggestions, @srghma, much appreciated 👍

Can you please squash all commits into a single one.

@afh
Copy link
Member

afh commented Jun 24, 2024

If you wanted to go above and beyond you could also format the file using nixfmt, e.g. nix run github:NixOS/nixfmt -- pkgs/by-name/so/sozi/package.nix

@srghma srghma force-pushed the sozi branch 2 times, most recently from e8863ac to 16eb5d7 Compare June 24, 2024 12:03
Copy link
Member

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution! Some feedback below:

pkgs/by-name/so/sozi/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/so/sozi/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/so/sozi/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/so/sozi/package.nix Outdated Show resolved Hide resolved
@eclairevoyant
Copy link
Member

Also per CI, the URL doesn't seem to exist?

       >
       > trying https://github.com/sozi-projects/Sozi/releases/download/v23.7/Sozi-23.7.25-1690311612.AppImage
       >   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
       >                                  Dload  Upload   Total   Spent    Left  Speed
       >   0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
       > curl: (22) The requested URL returned error: 404
       > error: cannot download Sozi-23.7.25-1690311612.AppImage from any mirror

Copy link
Member

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

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

Also, please squash the commits + rebase your branch on a recent commit, 171a116 is from October 2023 and is the reason why you were seeing a lot of strange behaviour.

pkgs/by-name/so/sozi/package.nix Outdated Show resolved Hide resolved
@srghma srghma force-pushed the sozi branch 2 times, most recently from b0cada8 to 7f31e2c Compare July 2, 2024 08:06
Copy link
Member

@afh afh left a comment

Choose a reason for hiding this comment

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

Thanks for addressing all the review comments, @srghma, very much appreciated. What's your take on the following?

pkgs/by-name/so/sozi/package.nix Outdated Show resolved Hide resolved
Copy link
Member

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

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

SVG files appear to open fine, lgtm

install -m 444 -D ${appimageContents}/sozi.desktop -t $out/share/applications
cp -r ${appimageContents}/usr/share/icons $out/share
substituteInPlace $out/share/applications/sozi.desktop \
--replace 'Exec=AppRun' 'Exec=sozi'
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
--replace 'Exec=AppRun' 'Exec=sozi'
--replace-fail 'Exec=AppRun' 'Exec=sozi'

as --replace is deprecated

@eclairevoyant eclairevoyant merged commit d41a79d into NixOS:master Jul 8, 2024
25 of 26 checks passed
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.

None yet

4 participants