Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: dcdc95ce4d9e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 31c575190c0e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 10, 2019

  1. matrix-synapse: fix startup

    Currently, `setuptools` isn't propagated automatically to python
    packages[1] which causes the following error when starting
    `matrix-synapse`:
    
    ```
    Traceback (most recent call last):
       File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/bin/.homeserver-wrapped", line 39, in <module>
         import synapse.config.logger
       File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/lib/python3.7/site-packages/synapse/config/logger.py", line 27, in <module>
         from synapse.app import _base as appbase
       File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/lib/python3.7/site-packages/synapse/app/__init__.py", line 18, in <module>
     E402
       File "/nix/store/xxkds7821mrahfx75az0sq3ryf69m612-matrix-synapse-1.3.1/lib/python3.7/site-packages/synapse/python_dependencies.py", line 19, in <module>
         from pkg_resources import (
     No module named 'pkg_resources'
    ```
    
    [1] NixOS/nixpkgs#68314
    
    (cherry picked from commit 58dc1e2)
    Ma27 authored and worldofpeace committed Sep 10, 2019
    Copy the full SHA
    8050566 View commit details
    Browse the repository at this point in the history
  2. pythonPackages.pivy: fix build

    (cherry picked from commit 91fc125)
    gebner committed Sep 10, 2019
    Copy the full SHA
    31c5751 View commit details
    Browse the repository at this point in the history