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.

Sign up for GitHub

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

Jump to bottom

Backport: matrix-synapse: 0.28.1 -> 0.30.0 #41075

Merged
merged 1 commit into from May 25, 2018
Merged

Backport: matrix-synapse: 0.28.1 -> 0.30.0 #41075

merged 1 commit into from May 25, 2018

Conversation

srhb
Copy link
Contributor

@srhb srhb commented May 25, 2018

Backport of #41036
(cherry picked from commit 429d81d)

Motivation for this change

A backport for this was requested due to GDPR concerns.

@florianjacob and @pstn have done some testing on this already, are any further changes necessary?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@florianjacob @srhb
matrix-synapse: 0.28.1 -> 0.30.0
1dbc6e2 
Backport of NixOS#41036
(cherry picked from commit 429d81d)
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: matrix-synapse

Partial log (click to expand)

error: while evaluating the attribute 'propagatedBuildInputs' of the derivation 'matrix-synapse-0.30.0' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:148:11:
while evaluating the attribute 'buildInputs' of the derivation 'python2.7-systemd-234' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:148:11:
while evaluating 'getOutput' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/attrsets.nix:450:23, called from undefined position:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:97:17, called from undefined position:
while evaluating the attribute 'systemd' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:13915:3:
while evaluating 'callPackageWith' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:113:35, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:13915:13:
while evaluating 'makeOverridable' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:72:24, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:117:8:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/systemd/default.nix:1:1, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:74:12:
assertion failed at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/systemd/default.nix:14:1

@pstn
Copy link
Contributor

pstn commented May 25, 2018

To document what I tested exactly:
Since I only have my production setup, I did services.matrix-synapse.package = pkgs.callPackage ../../pkgs/matrix-synapse.nix { }; where ../../pkgs/martix-synapse.nix {}; is the exact file that should be merged here. I also supplied the appropriate (and unchanged) matrix-synapse.patch from this repository.

The server is running for ~12h now and I didn't notice any breakage at any point so far.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: matrix-synapse

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/lib  /nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/bin
patching script interpreter paths in /nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0
checking for references to /build in /nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0...
wrapping `/nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/bin/hash_password'...
wrapping `/nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/bin/homeserver'...
wrapping `/nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/bin/move_remote_media_to_new_store.py'...
wrapping `/nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/bin/register_new_matrix_user'...
wrapping `/nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/bin/synapse_port_db'...
wrapping `/nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0/bin/synctl'...
/nix/store/0ndccjh941z4fxgq0syvmrwzpfzfky4v-matrix-synapse-0.30.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: matrix-synapse

Partial log (click to expand)

strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/lib  /nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/bin
patching script interpreter paths in /nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0
checking for references to /build in /nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0...
wrapping `/nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/bin/synapse_port_db'...
wrapping `/nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/bin/register_new_matrix_user'...
wrapping `/nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/bin/synctl'...
wrapping `/nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/bin/move_remote_media_to_new_store.py'...
wrapping `/nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/bin/hash_password'...
wrapping `/nix/store/dis5zancz3yj0vfw3al4lp799l6j1jpb-matrix-synapse-0.30.0/bin/homeserver'...

@xeji
Copy link
Contributor

xeji commented May 25, 2018

@GrahamcOfBorg test matrix-synapse

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.matrix-synapse

Partial log (click to expand)

server_postgres# [   34.037650] synapse[980]: synapse.storage.background_updates: [] Starting update batch on background update 'user_ips_device_index'
server_postgres# [   34.041104] synapse[980]: synapse.storage.background_updates: [] Adding index user_ips_device_id to user_ips
server_postgres: exit status 0
test script finished in 38.38s
cleaning up
killing server_sqlite (pid 593)
killing server_postgres (pid 604)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/smhrkc5fihwn12dzrlqcjdpaidb007lh-vm-test-run-matrix-synapse

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.matrix-synapse

Partial log (click to expand)

server_postgres: exit status 0
server_sqlite: running command: sync
server_sqlite: exit status 0
test script finished in 102.10s
cleaning up
killing server_postgres (pid 627)
killing server_sqlite (pid 639)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/b0hp32rj4rb41c0ky9c2pgaq3l8s0yrz-vm-test-run-matrix-synapse

@xeji xeji merged commit 7655989 into NixOS:release-18.03 May 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@srhb @GrahamcOfBorg @pstn @xeji @florianjacob