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: e478127e8006
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 22470fff35a2
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Oct 26, 2019

  1. mautrix-telegram: fix build 

    With updating `pluggy` to `0.13.0`[1] the way how python modules are
imported during pytest changed which broke all modules that had a
`coding: future_fstrings` annotation at the top which used to be needed
for python <=3.5. This only affected the tests, deploying a
`mautrix-telegram` from master with `doCheck = false;` works fine.

I applied a patch for `mautrix-telegram` which drops python 3.5 compat
(this package is intended to be used as application with python 3.7, so this
should be fine on master/unstable) and modified `mautrix-appservice`
accordingly as a lot of things on master changed since their last
release, so applying a patch didn't work there.

Resolves #71996

[1] faf8cfb
    @Ma27
    Ma27 committed Oct 26, 2019
    Copy the full SHA
    22470ff View commit details
    Browse the repository at this point in the history