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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

grocy: 4.0.3 -> 4.2.0, build from sources #296686

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Conversation

LeSuisse
Copy link
Contributor

Description of changes

The adjusted patch have been taken from #288602.

Changes:
https://github.com/grocy/grocy/releases/tag/v4.1.0
https://github.com/grocy/grocy/releases/tag/v4.2.0

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.05 Release Notes (or backporting 23.05 and 23.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.

Result of nixpkgs-review run on x86_64-linux 1

1 package blacklisted:
  • nixos-install-tools
1 package built:
  • grocy

Add a 馃憤 reaction to pull requests you find important.

@LeSuisse
Copy link
Contributor Author

cc @tebriel It might be of interest for you since you opened #288602

@wegank
Copy link
Member

wegank commented Mar 28, 2024

@ofborg build grocy

@diogotcorreia diogotcorreia self-requested a review April 13, 2024 17:01
Copy link
Member

@diogotcorreia diogotcorreia left a comment

Choose a reason for hiding this comment

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

I've successfully built the package and ran the corresponding tests (x86_64 linux).
Additionally, I've ran the tests interactively and can validate that everything seems to be working visually as well:
image

nixos/modules/services/web-apps/grocy.nix Outdated Show resolved Hide resolved
pkgs/servers/grocy/default.nix Show resolved Hide resolved
@diogotcorreia diogotcorreia self-requested a review April 16, 2024 21:33
Copy link
Member

@diogotcorreia diogotcorreia left a comment

Choose a reason for hiding this comment

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

I've done the same tests as before, things seems to (still) work fine.

I have, however, noticed that on nginx logs, it is complaining about the data/viewcache directory not existing.

machine # [   89.918347] nginx[799]: 2024/04/17 07:59:30 [error] 799#799: *31 FastCGI sent in stderr: "PHP message: PHP Warning:  Base directory /nix/store/50q0mswdxi6lg412rr2da5i19yvkrys5-grocy-4.2.0/public/../data/viewcache does not exist,
machine # [   89.921235] nginx[799]:                     please create or change using %Cache.SerializerPath in /nix/store/50q0mswdxi6lg412rr2da5i19yvkrys5-grocy-4.2.0/packages/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php on line 232; PHP message: PHP Warning:  Base directory /nix/store/50q0mswdxi6lg412rr2da5i19yvkrys5-grocy-4.2.0/public/../data/viewcache does not exist,

I've tried to see if this was present in the version in master, and it seems like the directory exists but (obviously) it is not writable:

machine # [ 3998.407026] nginx[800]: 2024/04/17 09:19:58 [error] 800#800: *7 FastCGI sent in stderr: "PHP message: PHP Warning:  Directory /nix/store/mmdcj83if1qnhj4j6qj7vlag0mg7psgm-grocy-4.0.3/public/../data/viewcache not writable, please chmod to 777 in /nix/store/mmdcj83if1qnhj4j6qj7vlag0mg7psgm-grocy-4.0.3/packages/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php on line 294; PHP message: PHP Warning:  Directory /nix/store/mmdcj83if1qnhj4j6qj7vlag0mg7psgm-grocy-4.0.3/public/../data/viewcache not writable, please chmod to 777 in /nix/store/mmdcj83if1qnhj4j6qj7vlag0mg7psgm-grocy-4.0.3/packages/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php on line 294; PHP message: PHP Warning:  Directory /nix/store/mmdcj83if1qnhj4j6qj7vlag0mg7psgm-grocy-4.0.3/public/../data/viewcache not writable, please chmod to 777 in /nix/store/mmdcj83if1qnhj4j6qj7vlag0mg7psgm-grocy-4.0.3/packages/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php on line 294" while reading response header from upstream, client: 10.0.2.2, server: localhost, request: "PUT /api/user/settings/datatables_state_stock-overview-table HTTP/1.1", upstream: "fastcgi://unix:/run/phpfpm/grocy.sock:", host: "localhost:8080", referrer: "http://localhost:8080/stockoverview"

I wouldn't call it a regression since it was not working before either, but it would be nice to fix it either way (I'm guessing it might require patching?)

pkgs/servers/grocy/default.nix Outdated Show resolved Hide resolved
@LeSuisse
Copy link
Contributor Author

I wouldn't call it a regression since it was not working before either, but it would be nice to fix it either way (I'm guessing it might require patching?)

Fixed.

@diogotcorreia diogotcorreia self-requested a review April 17, 2024 21:47
Copy link
Member

@diogotcorreia diogotcorreia left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for fixing all the issues :)

(Tested everything again, it's all working)

@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/1596

@wegank
Copy link
Member

wegank commented Apr 22, 2024

4 neutral checks, doesn't look good?

@diogotcorreia
Copy link
Member

diogotcorreia commented Apr 22, 2024

Hm I missed that, sorry
Last time I tried the tests locally they worked on my machine
@LeSuisse could you take a look?

EDIT: still builds for me, no idea what's wrong.
The error in OfBorg is /nix/store/zykyv2faxz6s1l2pdn6i7i5hb5r5wri6-stdenv-linux/setup: line 1582: fixup-yarn-lock: command not found

@LeSuisse
Copy link
Contributor Author

Done, I missed #281902 after my last rebase.

@diogotcorreia
Copy link
Member

@LeSuisse seems to still be failing on darwin, now sure if it's supposed to, but I have no way to test

@LeSuisse
Copy link
Contributor Author

Does not seem to be directly related to this change, the error does not come from the grocy derivation which is the only touched here.

error: a 'x86_64-linux' with features {} is required to build '/nix/store/033j5c2xsbz7qw4pbvvpj7xmzl0ijdrb-audit-disable.drv', but I am a 'x86_64-darwin' with features {benchmark, big-parallel, nixos-test}
error: a 'aarch64-linux' with features {} is required to build '/nix/store/zz5knj1m69pmn42fvsmjvcsp4psyxhpv-append-initrd-secrets.drv', but I am a 'aarch64-darwin' with features {benchmark, big-parallel, nixos-test}

@diogotcorreia
Copy link
Member

The checks seem to have passed in the latest version: https://github.com/NixOS/nixpkgs/runs/16724617034

Maybe it's related to buildComposerProject?
Judging by other packages using it (firefly-iii), seems like so: https://github.com/NixOS/nixpkgs/runs/23906932987

Copy link
Member

@diogotcorreia diogotcorreia left a comment

Choose a reason for hiding this comment

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

Excluding the darwin builds (which I don't think are related to this PR), everything seems to build and work on my PC (tested stuff again).

@wegank
Copy link
Member

wegank commented Apr 23, 2024

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

1 package built:
  • grocy

@wegank wegank merged commit 4c62c97 into NixOS:master Apr 23, 2024
24 checks passed
@LeSuisse LeSuisse deleted the grocy-4.2.0 branch April 23, 2024 17:41
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

7 participants