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

Commits on Jun 11, 2019

  1. matrix-synapse: 0.99.5.2 -> 1.0.0

    @fpletz
    fpletz committed Jun 11, 2019
    Copy the full SHA
    557c586 View commit details

Commits on Jun 12, 2019

  1. Merge pull request #62990 from mayflower/pkg/matrix-synapse-1.0.0 

    matrix-synapse: 0.99.5.2 -> 1.0.0
    @fpletz
    fpletz authored Jun 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    076b79a View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/servers/matrix-synapse/default.nix
8 changes: 4 additions & 4 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, stdenv, python3
{ lib, stdenv, python3, openssl
, enableSystemd ? stdenv.isLinux
}:

@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "0.99.5.2";
version = "1.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "0c1kf9zq7cg9scwnvph4vwk449gypbprmdjzrzrg0wp1rcc8h3gn";
sha256 = "1n8hv0zd818z4fx39yz6svb07zsbrh8fd6wfmgvhdxhp6p1vl0wq";
};

patches = [
@@ -72,7 +72,7 @@ in buildPythonApplication rec {
unpaddedbase64
] ++ lib.optional enableSystemd systemd;

checkInputs = [ mock parameterized ];
checkInputs = [ mock parameterized openssl ];

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