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

lemmy: 0.17.4 -> 0.18.0 #239690

Merged
merged 4 commits into from
Jun 27, 2023
Merged

lemmy: 0.17.4 -> 0.18.0 #239690

merged 4 commits into from
Jun 27, 2023

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Jun 25, 2023

Description of changes
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.11 Release Notes (or backporting 23.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.

@adisbladis
Copy link
Member Author

Patch for tokio::test taken from LemmyNet/lemmy#3329 but I opted against fetchpatch in case the PR is updated.

@adisbladis
Copy link
Member Author

Note that lemmy-ui fails to start:

Jun 25 05:28:06 nixos systemd[1]: Started Lemmy ui.
Jun 25 05:28:07 nixos node[3301544]: Inferno is in development mode.
Jun 25 05:28:07 nixos node[3301544]: /nix/store/p4rqch5s35nmmv023fwfd3nyjipm6db5-lemmy-ui/node_modules/sharp/lib/sharp.js:37
Jun 25 05:28:07 nixos node[3301544]:   throw new Error(help.join('\n'));
Jun 25 05:28:07 nixos node[3301544]:   ^
Jun 25 05:28:07 nixos node[3301544]: Error:
Jun 25 05:28:07 nixos node[3301544]: Something went wrong installing the "sharp" module
Jun 25 05:28:07 nixos node[3301544]: Cannot find module '../build/Release/sharp-linux-x64.node'
Jun 25 05:28:07 nixos node[3301544]: Require stack:
Jun 25 05:28:07 nixos node[3301544]: - /nix/store/p4rqch5s35nmmv023fwfd3nyjipm6db5-lemmy-ui/node_modules/sharp/lib/sharp.js
Jun 25 05:28:07 nixos node[3301544]: - /nix/store/p4rqch5s35nmmv023fwfd3nyjipm6db5-lemmy-ui/node_modules/sharp/lib/constructor.js
Jun 25 05:28:07 nixos node[3301544]: - /nix/store/p4rqch5s35nmmv023fwfd3nyjipm6db5-lemmy-ui/node_modules/sharp/lib/index.js
Jun 25 05:28:07 nixos node[3301544]: - /nix/store/p4rqch5s35nmmv023fwfd3nyjipm6db5-lemmy-ui/dist/js/server.js
Jun 25 05:28:07 nixos node[3301544]: Possible solutions:
Jun 25 05:28:07 nixos node[3301544]: - Install with verbose logging and look for errors: "npm install --ignore-scripts=false --foreground-scripts --verbose sharp"
Jun 25 05:28:07 nixos node[3301544]: - Install for the current linux-x64 runtime: "npm install --platform=linux --arch=x64 sharp"
Jun 25 05:28:07 nixos node[3301544]: - Consult the installation documentation: https://sharp.pixelplumbing.com/install
Jun 25 05:28:07 nixos node[3301544]:     at Object.<anonymous> (/nix/store/p4rqch5s35nmmv023fwfd3nyjipm6db5-lemmy-ui/node_modules/sharp/lib/sharp.js:37:9)
Jun 25 05:28:07 nixos node[3301544]:     at Module._compile (node:internal/modules/cjs/loader:1256:14)
Jun 25 05:28:07 nixos node[3301544]:     at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
Jun 25 05:28:07 nixos node[3301544]:     at Module.load (node:internal/modules/cjs/loader:1119:32)
Jun 25 05:28:07 nixos node[3301544]:     at Module._load (node:internal/modules/cjs/loader:960:12)
Jun 25 05:28:07 nixos node[3301544]:     at Module.require (node:internal/modules/cjs/loader:1143:19)
Jun 25 05:28:07 nixos node[3301544]:     at require (node:internal/modules/cjs/helpers:110:18)
Jun 25 05:28:07 nixos node[3301544]:     at Object.<anonymous> (/nix/store/p4rqch5s35nmmv023fwfd3nyjipm6db5-lemmy-ui/node_modules/sharp/lib/constructor.js:11:1)
Jun 25 05:28:07 nixos node[3301544]:     at Module._compile (node:internal/modules/cjs/loader:1256:14)
Jun 25 05:28:07 nixos node[3301544]:     at Module._extensions..js (node:internal/modules/cjs/loader:1310:10)
Jun 25 05:28:07 nixos node[3301544]: Node.js v18.16.1

@happysalada
Copy link
Contributor

It looks like we are going to have to package sharp with nix
https://github.com/lovell/sharp/blob/main/docs/install.md

@matejc
Copy link
Contributor

matejc commented Jun 26, 2023

@adisbladis you have my PR pending adisbladis#1
Which is a "chain PR" for this one

@happysalada
Copy link
Contributor

@matejc thanks ! I would say feel free to make a PR directly against nixpkgs, happy to be tagged.
Ill let @adisbladis confirm, but i think it should be fine.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jun 26, 2023
@matejc
Copy link
Contributor

matejc commented Jun 27, 2023

@adisbladis another PR: version in the ui now works adisbladis#2
Required for solving the warning for Jerboa for Lemmy (Android app connected to the instance)

@matejc
Copy link
Contributor

matejc commented Jun 27, 2023

@happysalada just happy to help, and leave all the formalities to others

@happysalada
Copy link
Contributor

LGTM, is there anything else missing ?

@adisbladis
Copy link
Member Author

LGTM, is there anything else missing ?

Nope. I was waiting for another reviewer before merging.
My personal lemmy server is already running 0.18 since I opened this PR (albeit without the UI), and the UI since @matejc's additions.

@adisbladis adisbladis merged commit d76f499 into NixOS:master Jun 27, 2023
@adisbladis adisbladis deleted the lemmy-0_18_0 branch June 27, 2023 12:10
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 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants