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: 84c2e9954683
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6ea2f786b83d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 4, 2018

  1. matrix-synapse: 0.33.6 -> 0.33.8 

    Also reworked dependencies:
 * blist and ujson are marked as no longer needed
 * pytz has no mention throughout `git log -p` on synapse's repository
 * systemd and affinity are optional (but turned on by default)

(cherry picked from commit bb86056)
    @Ekleog
    Ekleog committed Nov 4, 2018
    Copy the full SHA
    139fd45 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #49606 from Ekleog/synapse-0.33.8-b18.09 

    matrix-synapse: 0.33.6 -> 0.33.8
    @7c6f434c
    7c6f434c committed Nov 4, 2018
    Copy the full SHA
    6ea2f78 View commit details
    Browse the repository at this point in the history