Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.09] matrix-synapse: 1.11.1 -> 1.12.0 #83516

Merged
merged 3 commits into from
Apr 1, 2020
Merged

[19.09] matrix-synapse: 1.11.1 -> 1.12.0 #83516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1881b34
matrix-synapse: 1.11.1 -> 1.12.0
ajs124 Mar 23, 2020
2015db3
python3Packages.twisted: fix CVE-2020-10109
Ma27 Mar 27, 2020
a8639df
python3Packages.pysaml2: fix tests
Ma27 Mar 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/pysaml2/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
, substituteAll
, xmlsec
, cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six
, mock, pyasn1, pymongo, pytest, responses
, mock, pyasn1, pymongo, pytest, responses, fetchpatch
}:

buildPythonPackage rec {
Expand All @@ -24,6 +24,11 @@ buildPythonPackage rec {
src = ./hardcode-xmlsec1-path.patch;
inherit xmlsec;
})
(fetchpatch {
name = "fix-test-dates.patch";
url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch";
sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p";
})
];

propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];
Expand Down
8 changes: 8 additions & 0 deletions pkgs/development/python-modules/twisted/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
, service-identity
, setuptools
, idna
, fetchpatch
}:
buildPythonPackage rec {
pname = "Twisted";
Expand All @@ -24,6 +25,13 @@ buildPythonPackage rec {
sha256 = "294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395";
};

patches = [
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/python-twisted/raw/9248b58fc9b22a159f50759ab4959619dfa04a04/f/0001-Fix-several-request-smuggling-attacks.patch";
sha256 = "14xx96hiyp5d3w287rpxls8wz49akr4fb1jp5am511j4g9vckb8b";
})
];

propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ];

passthru.extras.tls = [ pyopenssl service-identity idna ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "1.11.1";
version = "1.12.0";

src = fetchPypi {
inherit pname version;
sha256 = "0xd4bxsmk67r6pfj5lh0hn36r8z51mxsl39fjfrfdidvl1qqbxnk";
sha256 = "18wavnb47w4hfh8dc7g77bfhz03zh1xzl58mxlfi0000qsbkz680";
};

patches = [
Expand Down