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

photoprism: 221118-e58fee0fb -> 230603-378d4746a #230373

Merged
merged 3 commits into from
Jun 5, 2023

Conversation

gregod
Copy link
Contributor

@gregod gregod commented May 6, 2023

Description of changes

major: 230502-c405f6eff: https://github.com/photoprism/photoprism/releases/tag/230502-c405f6eff
minor: 230504-cbf48798c: https://github.com/photoprism/photoprism/releases/tag/230504-cbf48798c
minor: 230506-9de9a3540: https://github.com/photoprism/photoprism/releases/tag/230506-9de9a3540
minor: 230513-0b780defb: https://github.com/photoprism/photoprism/releases/tag/230513-0b780defb
minor: 230603-378d4746a: https://github.com/photoprism/photoprism/releases/tag/230603-378d4746a

I updated the src version, dependency hashes and added new binaries required to pkg wrapper.

As stated in #230194 i'm not sure if the tensorflow or models need to be updated. It seems to me that they haven't changed upstream.

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:
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

Comment on lines 65 to 66
--set PHOTOPRISM_IMAGEMAGICK_BIN ${imagemagick}/bin/convert \
--set PHOTOPRISM_RSVGCONVERT_BIN ${librsvg}/bin/rsvg-convert \
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not entirely sold that this should be part of the package update.

1.) Even if we decide to always add the dependencies imagemagick and librsvg this could be done in a separate PR - or maybe in a separate commit within this PR?
2.) I'm not entirely sold if it is really necessary to add those dependencies. As far as I can tell those are only used for converting vector graphics which I'd imagine is a rather niche application of photoprism.

Anyway, thank you for taking the time to update the package, appreciated! 👍

Copy link
Contributor Author

@gregod gregod May 7, 2023

Choose a reason for hiding this comment

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

The functionality for both was newly introduced within this release.

I agree that the svg converter is optional, especially since it is a non community-edition feature. Imagemagic, however, is also used to fix invalid jpgs that the golang library has trouble with (photoprism/photoprism#2463). I feel that this is closer to a core functionality that should be enabled by default. In my personal library this affects quite a few files.

My suggestion would be:

  • Keep only imagemagic in this PR
  • Create a separate PR/discussion on how to handle such optional dependencies. I think similar concerns can be raised for rawtherapee, which is quite heavy and (as far as i understand it) primarily used as a fallback raw converter if darktable fails. (We could either parameterize the package, or leave the binary configuration to the nixos module which can dynamically include the tools based on the settings)

Copy link
Contributor

Choose a reason for hiding this comment

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

Wasn't aware that imagemagick was used this way 👍 Your suggestions sounds good, I guess I'd prefer if the module handles those runtime dependencies instead of a parameterized package. But this is for another PR :)

@gregod gregod force-pushed the photoprism-230506-9de9a3540 branch from 927ddde to a170401 Compare May 9, 2023 12:33
@gregod gregod force-pushed the photoprism-230506-9de9a3540 branch from a170401 to 804bb25 Compare May 9, 2023 12:34
@ofborg ofborg bot requested a review from BeneSim May 9, 2023 12:52
@BeneSim
Copy link
Contributor

BeneSim commented May 15, 2023

This new minor version sure looks shiny. Guess we should update this PR for that.

@gregod gregod changed the title photoprism: 221118-e58fee0fb -> 230506-9de9a3540 photoprism: 221118-e58fee0fb -> 230513-0b780defb May 15, 2023
@ofborg ofborg bot requested a review from BeneSim May 15, 2023 16:08
@peperunas
Copy link
Contributor

peperunas commented Jun 3, 2023

Any blockages for this PR? Also, great job and thank you for your time!

@gregod gregod changed the title photoprism: 221118-e58fee0fb -> 230513-0b780defb photoprism: 221118-e58fee0fb -> 230603-378d4746a Jun 3, 2023
@ofborg ofborg bot requested a review from BeneSim June 3, 2023 18:37
@BeneSim
Copy link
Contributor

BeneSim commented Jun 4, 2023

Any blockages for this PR? Also, great job and thank you for your time!

Not from my point of view. I'm wondering if I can do something as the package maintainer to speed up the merge process ?

@ajs124 ajs124 merged commit a6c64b2 into NixOS:master Jun 5, 2023
10 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

6 participants