Skip to content

immich: some improvements#344237

Merged
dotlambda merged 5 commits intoNixOS:masterfrom
dotlambda:immich
Sep 26, 2024
Merged

immich: some improvements#344237
dotlambda merged 5 commits intoNixOS:masterfrom
dotlambda:immich

Conversation

@dotlambda
Copy link
Member

@dotlambda dotlambda commented Sep 24, 2024

Description of changes

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.

There is no need for it and it cannot be used to override the machine
learning component used by the immich package.
@jvanbruegge
Copy link
Contributor

I just copied this from home assistant:

, packageOverrides ? self: super: {}

I don't really care either way

@dotlambda
Copy link
Member Author

I just copied this from home assistant

I figured. There it's useful because custom components might require overrides. But that's not a thing for immich..

@dotlambda dotlambda changed the title immich.machine-learning: drop packageOverrides argument immich: some improvements Sep 24, 2024
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 24, 2024
@dotlambda dotlambda force-pushed the immich branch 2 times, most recently from 97cedc8 to fff691c Compare September 24, 2024 16:44
A top-level attribute makes sure Hydra builds it (though that already
happens on Linux through the NixOS test) and that nixpkgs-review picks
it up.
Otherwise they could use different versions:

    nix-repl> (immich.overrideAttrs { version = "0"; }).machine-learning.version
    "1.115.0"
postPatch = ''
substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi'

# AttributeError: module 'cv2' has no attribute 'Mat'
Copy link
Member Author

Choose a reason for hiding this comment

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

To me this smells like some issue with the way we package opencv4.
cc @philiptaron @SuperSandro2000 @mweinelt

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 8.has: package (new) This PR adds a new package labels Sep 24, 2024
@ofborg ofborg bot requested a review from jvanbruegge September 24, 2024 20:13
@ofborg ofborg bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 24, 2024
@dotlambda dotlambda merged commit c5d95d4 into NixOS:master Sep 26, 2024
@dotlambda dotlambda deleted the immich branch September 26, 2024 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants