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

mautrix-telegram: 0.6.1 -> 0.7.0 #76603

Merged
merged 3 commits into from Dec 30, 2019
Merged

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Dec 28, 2019

Motivation for this change

Updates mautrix-telegram to 0.7.0.
The dependency mautrix-appservice was updated to 0.4.0 and was renamed to mautrix.

⚠️ The license of python3Packages.mautrix changed from MIT to MPL2.


Final notes:

  • I'd wait with merging until @pacien took a look at this (as this PR will require changes in their mautrix-telegram-module PR)
  • I'm currently running this on my HS on NixOS 19.09 (you need to update python3Packages.telethon to 1.10.9 in your fork to make it work).
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @nyanloutre @pacien

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

failures not related to PR

[6 built (1 failed), 8 copied (5.6 MiB), 0.8 MiB DL]
error: build of '/nix/store/ly5qlnciv2ygnvxpkvyarwxwpda6xvwm-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/76603
1 package failed to build:
python38Packages.mautrix

2 package were built:
mautrix-telegram python37Packages.mautrix

@jonringer
Copy link
Contributor

please address darwin issue, or limit platforms to only linux :)

Tests currently fail like this:

```
/nix/store/yslk7x7iw3hka6d33kmnba9sxaia4492-python3.7-mautrix-0.4.0/lib/python3.7/site-packages/mautrix/util/manhole.py:9: in <module>
    from socket import SOL_SOCKET, SO_PEERCRED
E   ImportError: cannot import name 'SO_PEERCRED' from 'socket' (/nix/store/81qani7sdir46gjwf3a3jr2cv1aggkz1-python3-3.7.5/lib/python3.7/socket.py)
!!!!!!!!!!!!!!!!!!! Interrupted: 1 errors during collection !!!!!!!!!!!!!!!!!!!!
=============================== 1 error in 1.73s ===============================
```

Those values don't seem to be available on the MacOS-version of that
module. As there's no workaround implemented in the source, I assume
that upstream doesn't intend to support darwin-alike platforms atm.
@Ma27
Copy link
Member Author

Ma27 commented Dec 29, 2019

@jonringer fixed (explanation is in the body of the commit message :))

@jonringer
Copy link
Contributor

LGTM

@jonringer jonringer merged commit 975a6b7 into NixOS:master Dec 30, 2019
@Ma27 Ma27 deleted the bump-mautrix-telegram branch December 30, 2019 08:18
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

2 participants