Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: ea4da9b5fa0f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 975a6b7b1dbc
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Dec 30, 2019

  1. python3Packages.mautrix: 0.3.11 -> 0.4.0 

    Previously known as `mautrix-appservice`. For backwards-compatibility, I
added an alias in `python-packages.nix`.

Additionally a small patch was needed which I already filed upstream[1].

Please note that the package switched from a MIT license to the Mozilla
Public License[2].

[1] mautrix/python#13
[2] https://github.com/tulir/mautrix-python/blob/v0.4.0/LICENSE
    @Ma27
    Ma27 authored and Jon committed Dec 30, 2019
    Copy the full SHA
    298b3fb View commit details
    Browse the repository at this point in the history

  2. mautrix-telegram: 0.6.1 -> 0.7.0 

    https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc4
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc3
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc2
https://github.com/tulir/mautrix-telegram/releases/tag/v0.7.0-rc1
    @Ma27
    Ma27 authored and Jon committed Dec 30, 2019
    Copy the full SHA
    95ee079 View commit details
    Browse the repository at this point in the history

  3. mautrix-telegram: mark as broken on darwin 

    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
    Ma27 authored and Jon committed Dec 30, 2019
    Copy the full SHA
    975a6b7 View commit details
    Browse the repository at this point in the history