Merge branch 'pr-55320'

* pr-55320:
  nixos/release-notes: mention breaking changes with matrix-synapse update
  nixos/matrix-synapse: reload service with SIGHUP
  nixos/tests/matrix-synapse: generate ca and certificates
  nixos/matrix-synapse: use python to launch synapse
  pythonPackages.pymacaroons-pynacl: remove unmaintained fork
  matrix-synapse: 0.34.1.1 -> 0.99.0
  pythonPackages.pymacaroons: init at 0.13.0
This commit is contained in:
Léo Gaspard
2019-02-07 17:12:04 +01:00
8 changed files with 90 additions and 65 deletions

View File

@@ -1,24 +0,0 @@
{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }:
buildPythonPackage rec {
pname = "pymacaroons-pynacl";
version = "0.9.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "pymacaroons";
rev = "v${version}";
sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii";
};
propagatedBuildInputs = [ pynacl six ];
# Tests require an old version of hypothesis
doCheck = false;
meta = with lib; {
description = "Macaroon library for Python";
homepage = https://github.com/matrix-org/pymacaroons;
license = licenses.mit;
};
}

View File

@@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, six, pynacl }:
buildPythonPackage rec {
pname = "pymacaroons";
version = "0.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8";
};
propagatedBuildInputs = [
six
pynacl
];
# Tests require an old version of hypothesis
doCheck = false;
meta = with lib; {
description = "Macaroon library for Python";
homepage = https://github.com/ecordell/pymacaroons;
license = licenses.mit;
};
}