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

matrix-synapse: 0.22.1 -> 0.24.1 #30266

Merged
merged 2 commits into from Nov 5, 2017
Merged

matrix-synapse: 0.22.1 -> 0.24.1 #30266

merged 2 commits into from Nov 5, 2017

Conversation

Ralith
Copy link
Contributor

@Ralith Ralith commented Oct 10, 2017

Motivation for this change

Upstream optimizations and fixes

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.

@Ralith Ralith requested a review from FRidh as a code owner October 10, 2017 03:55
@Ralith
Copy link
Contributor Author

Ralith commented Oct 10, 2017

I don't know the first thing about python packaging; maybe there's a tidier way to handle affinity.

@eqyiel
Copy link
Contributor

eqyiel commented Oct 10, 2017

LGTM, but I think there's two unconventional things about the affinity expression:

  • use of buildPythonPackage instead of buildPythonApplication for a library (or is affinity meant to be called interactively?
  • fetchPypi with pname, version and sha256 attributes is preferred over fetchurl

@Ralith
Copy link
Contributor Author

Ralith commented Oct 10, 2017 •
edited

Thanks! Fixed. Made the same change to the local stuff in the matrix-synapse package too, since I doubt they're any different.

@Ralith Ralith force-pushed the matrix-synapse branch 2 times, most recently from d1ee865 to 1bb668d Compare October 10, 2017 05:43
FRidh
FRidh requested changes Oct 10, 2017
View reviewed changes
pkgs/top-level/python-packages.nix Outdated
@@ -105,6 +105,16 @@ in {

aenum = callPackage ../development/python-modules/aenum { };

affinity = buildPythonPackage rec {
Copy link
Member

Choose a reason for hiding this comment

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

See the header of this file and the Nixpkgs manual for contributing Python packages.

@LnL7
Copy link
Member

LnL7 commented Oct 23, 2017

@GrahamcOfBorg matrix-synapse

@GrahamcOfBorg
Copy link 

stripping (with flags -S) in /nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1/lib  /nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1/bin 
patching script interpreter paths in /nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1
checking for references to /tmp/nix-build-matrix-synapse-0.23.1.drv-0 in /nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1...
wrapping `/nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1/bin/synapse_port_db'...
wrapping `/nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1/bin/hash_password'...
wrapping `/nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1/bin/synctl'...
wrapping `/nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1/bin/homeserver'...
wrapping `/nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1/bin/register_new_matrix_user'...
/nix/store/22c0r0hlrvnp3mgi4q3cn9248ly40pq3-matrix-synapse-0.23.1

FRidh
FRidh requested changes Oct 23, 2017
View reviewed changes
pkgs/development/python-modules/affinity/default.nix
src = fetchPypi {
inherit pname version;
sha256 = "1i6j7kszvnzh5vh9k48cqwx2kzf73a6abgv9s6bf0j2zmfjl2wb6";
};
Copy link
Member

Choose a reason for hiding this comment

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

meta is missing

Copy link
Contributor

Choose a reason for hiding this comment

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

@FRidh, this appears to be fixed.

@Ralith
pythonPackages.affinity: init at 0.1.0
274f71e
@Ralith
matrix-synapse: 0.22.1 -> 0.24.1
11d3143 
Also fix use of buildPythonApplication where buildPythonPackage is
more appropriate.
@Ralith Ralith changed the title matrix-synapse: 0.22.1 -> 0.23.1 matrix-synapse: 0.22.1 -> 0.24.1 Oct 28, 2017
@Ralith
Copy link
Contributor Author

Ralith commented Oct 28, 2017

Bumped version again.

@rycee
Copy link
Member

rycee commented Nov 1, 2017

Builds OK for me. Haven't tried running it but would very much like to see this in master.

@Ralith Any remaining issues that you feel blocks this?

@Ralith
Copy link
Contributor Author

Ralith commented Nov 2, 2017

AFAIK this is ready; I've been using it on a live system for a while now.

@FRidh FRidh merged commit f825642 into NixOS:master Nov 5, 2017
@Ralith Ralith deleted the matrix-synapse branch November 5, 2017 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corngood corngood corngood left review comments

@FRidh FRidh FRidh requested changes

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
6.topic: python
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@Ralith @eqyiel @LnL7 @GrahamcOfBorg @rycee @fpletz @FRidh @corngood