mastodon: 4.2.13 -> 4.3.0 #337545
Open
mastodon: 4.2.13 -> 4.3.0 #337545
+1,041
−610
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Izorkin
force-pushed
the
update-mastodon
branch
2 times, most recently
from
3ac888c
to
b227da2
Compare
erictapen
reviewed
Aug 26, 2024
Izorkin
force-pushed
the
update-mastodon
branch
from
b227da2
to
1e1b0e9
Compare
|
Will close #277697 |
leo60228
reviewed
Aug 27, 2024
Comment on lines
716
to
726
| bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=//' > /var/lib/mastodon/secrets/active-record-encryption-deterministic-key | ||
| fi | ||
|
|
||
| if ! test -f /var/lib/mastodon/secrets/active-record-encryption-key-derivation-salt; then | ||
| mkdir -p /var/lib/mastodon/secrets | ||
| bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=//' > /var/lib/mastodon/secrets/active-record-encryption-key-derivation-salt | ||
| fi | ||
|
|
||
| if ! test -f /var/lib/mastodon/secrets/active-record-encryption-primary-key; then | ||
| mkdir -p /var/lib/mastodon/secrets | ||
| bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=//' > /var/lib/mastodon/secrets/active-record-encryption-deterministic-key |
There was a problem hiding this comment.
Is it safe to run this as three separate invocations?
There was a problem hiding this comment.
Yeah, the keys are independent of each other.
I haven't finished this piece of code yet.
|
The precompiled bootsnap code requires write access, me need to do it differently: |
|
How about we set |
Moved to |
Izorkin
force-pushed
the
update-mastodon
branch
2 times, most recently
from
ccf4b4e
to
240d739
Compare
|
Everything seems to be working :) |
Izorkin
force-pushed
the
update-mastodon
branch
from
240d739
to
1ecbd26
Compare
Izorkin
force-pushed
the
update-mastodon
branch
from
b852c65
to
237b0f8
Compare
|
Update to 4.3.0-rc.1. |
Izorkin
force-pushed
the
update-mastodon
branch
from
237b0f8
to
17e2ccb
Compare
| hash = yarnHash; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ fixup-yarn-lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; | ||
| nativeBuildInputs = [ nodejs-slim yarn-berry mastodonGems mastodonGems.wrappedRuby brotli python3 ]; |
There was a problem hiding this comment.
Why do we need such an old python version? Maybe distutils? Can we add it in an env instead?
There was a problem hiding this comment.
If use the latest versions of Pythons a build error occurs:
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info it worked if it ends with ok
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info using node-gyp@10.0.1
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info using node@20.17.0 | linux | x64
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info find Python using Python version 3.12.5 found at "/nix/store/h3i0acpmr8mrjx07519xxmidv8mpax4y-python3-3.12.5/bin/python3"
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn /nix/store/h3i0acpmr8mrjx07519xxmidv8mpax4y-python3-3.12.5/bin/python3
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args [
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '/build/source/node_modules/node-gyp/gyp/gyp_main.py',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args 'binding.gyp',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-f',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args 'make',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-I',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '/build/source/node_modules/utf-8-validate/build/config.gypi',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-I',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '/build/source/node_modules/node-gyp/addon.gypi',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-I',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '/nix/store/a3rj28n8mblqs26nrn7wzl4m8hda8rkk-nodejs-slim-22.8.0/include/node/common.gypi',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Dlibrary=shared_library',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Dvisibility=default',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Dnode_root_dir=/nix/store/a3rj28n8mblqs26nrn7wzl4m8hda8rkk-nodejs-slim-22.8.0',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Dnode_gyp_dir=/build/source/node_modules/node-gyp',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Dnode_lib_file=/nix/store/a3rj28n8mblqs26nrn7wzl4m8hda8rkk-nodejs-slim-22.8.0/$(Configuration)/node.lib',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Dmodule_root_dir=/build/source/node_modules/utf-8-validate',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Dnode_engine=v8',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '--depth=.',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '--no-parallel',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '--generator-output',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args 'build',
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args '-Goutput_dir=.'
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args ]
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR <string>:17: SyntaxWarning: invalid escape sequence '\.'
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn make
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info spawn args [ 'BUILDTYPE=Release', '-C', 'build' ]
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDOUT make: Entering directory '/build/source/node_modules/utf-8-validate/build'
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDOUT CXX(target) Release/obj.target/validation/src/validation.o
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDOUT CXX(target) Release/obj.target/validation/deps/is_utf8/src/is_utf8.o
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDOUT SOLINK_MODULE(target) Release/obj.target/validation.node
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDOUT COPY Release/validation.node
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDOUT make: Leaving directory '/build/source/node_modules/utf-8-validate/build'
➤ YN0000: │ utf-8-validate@npm:6.0.4 STDERR gyp info ok
There was a problem hiding this comment.
I don't see an error in the logs and locally it build also fine. Am I missing something?
There was a problem hiding this comment.
Can be seen with the additional parameter --inline-builds.
There was a problem hiding this comment.
Try adding setuptools. That often fixed issues with pre-gyp and the like.
There was a problem hiding this comment.
The setuptools package does not resolve the error.
I think the current option is easier to handle with scripts. |
Izorkin
force-pushed
the
update-mastodon
branch
2 times, most recently
from
269b1a5
to
05f12f0
Compare
This comment was marked as resolved.
This comment was marked as resolved.
| hash, | ||
| }: | ||
| stdenvNoCC.mkDerivation { | ||
| name = "yarn-deps"; |
There was a problem hiding this comment.
Suggested change
| name = "yarn-deps"; | |
| pname = "yarn-deps"; | |
| inherit version; |
There was a problem hiding this comment.
error:
… while calling the 'derivationStrict' builtin
at <nix/derivation-internal.nix>:34:12:
33|
34| strict = derivationStrict drvAttrs;
| ^
35|
… while evaluating derivation 'mastodon-4.3.0'
whose name attribute is located at /home/lafiel/works/src-nix/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:336:7
… while evaluating attribute 'mastodonModules' of derivation 'mastodon-4.3.0'
at /home/user/works/src-nix/nixpkgs/pkgs/servers/mastodon/default.nix:26:3:
25|
26| mastodonModules = stdenv.mkDerivation {
| ^
27| pname = "${pname}-modules";
(stack trace truncated; use '--show-trace' to show the full, detailed trace)
error: undefined variable 'version'
at /home/user/works/src-nix/nixpkgs/pkgs/servers/mastodon/yarn.nix:10:11:
9| pname = "yarn-deps";
10| inherit version;
| ^
11| nativeBuildInputs = [
This comment was marked as off-topic.
This comment was marked as off-topic.
Izorkin
force-pushed
the
update-mastodon
branch
from
79a85f3
to
a61d406
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Updata package to version 4.3.0.
Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.3.0-beta.1
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.