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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 583e4b8d8900
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0129b95b13e2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 13, 2020

  1. python3Packages.python-olm: remove dependency on the typing package 

    Typing has been upstreamed into CPython and will cause errors
if loaded with a 3.7 interpreter. Cf.
python/typing#573

Under Python3 libolm works without typing as tested via
weechat-matrix.

typing is still pulled in when installed for Python2.
    @phi-gamma
    phi-gamma committed Jan 13, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 9BCE91C969768E0F
    Learn about vigilant mode
    Copy the full SHA
    0169b72 View commit details

  2. Merge pull request #77608 from phi-gamma/olm-remove-typing 

    python3Packages.python-olm: remove dependency on the typing package
    @Mic92
    Mic92 authored Jan 13, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 9BCE91C969768E0F
    Learn about vigilant mode
    Copy the full SHA
    0129b95 View commit details
Showing with 2 additions and 3 deletions.
  1. +2 −3 pkgs/development/python-modules/python-olm/default.nix
5 changes: 2 additions & 3 deletions pkgs/development/python-modules/python-olm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, olm,
cffi, future, typing }:
cffi, future, isPy3k, typing }:

buildPythonPackage {
pname = "python-olm";
@@ -15,8 +15,7 @@ buildPythonPackage {
propagatedBuildInputs = [
cffi
future
typing
];
] ++ lib.optionals (!isPy3k) [ typing ];

doCheck = false;