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

Commits on Oct 25, 2019

  1. matrix-synapse: 1.4.0 -> 1.4.1 

    https://github.com/matrix-org/synapse/releases/tag/v1.4.1
    @Ma27
    Ma27 committed Oct 25, 2019
    Copy the full SHA
    d384987 View commit details

  2. Merge pull request #71360 from Ma27/bump-matrix-synapse 

    matrix-synapse: 1.4.0 -> 1.4.1
    @Ekleog
    Ekleog authored Oct 25, 2019
    Copy the full SHA
    b262fef View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/servers/matrix-synapse/default.nix
6 changes: 4 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.4.0";
version = "1.4.1";

src = fetchPypi {
inherit pname version;
sha256 = "1y8yhzsf2lk2d7v4l61rpy4918c0qz276j79q88l9yazb6gw5pkk";
sha256 = "10vfjf5f4micqwpxnw2dliq4y0j0mqj0087p6kgnfi5w9syz8g75";
};

patches = [
@@ -75,6 +75,8 @@ in buildPythonApplication rec {

checkInputs = [ mock parameterized openssl ];

doCheck = !stdenv.isDarwin;

checkPhase = ''
PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
'';