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: 85d879e51331
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d011e4749457
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Mar 27, 2020

  1. matrix-synapse: 1.11.1 -> 1.12.0 

    (cherry picked from commit 425efa5)
    @ajs124 @Ma27
    ajs124 authored and Ma27 committed Mar 27, 2020
    Copy the full SHA
    1881b34 View commit details

Commits on Mar 29, 2020

  1. python3Packages.twisted: fix CVE-2020-10109 

    Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
    @Ma27 @worldofpeace
    Ma27 and worldofpeace committed Mar 29, 2020
    Copy the full SHA
    2015db3 View commit details

  2. python3Packages.pysaml2: fix tests

    @Ma27
    Ma27 committed Mar 29, 2020
    Copy the full SHA
    a8639df View commit details

Commits on Apr 1, 2020

  1. Merge pull request #83516 from Ma27/synapse-19.09 

    [19.09] matrix-synapse: 1.11.1 -> 1.12.0
    @lheckemann
    lheckemann authored Apr 1, 2020
    Copy the full SHA
    d011e47 View commit details
Showing with 16 additions and 3 deletions.
  1. +6 −1 pkgs/development/python-modules/pysaml2/default.nix
  2. +8 −0 pkgs/development/python-modules/twisted/default.nix
  3. +2 −2 pkgs/servers/matrix-synapse/default.nix
7 changes: 6 additions & 1 deletion pkgs/development/python-modules/pysaml2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {
@@ -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 ];
8 changes: 8 additions & 0 deletions pkgs/development/python-modules/twisted/default.nix
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
, service-identity
, setuptools
, idna
, fetchpatch
}:
buildPythonPackage rec {
pname = "Twisted";
@@ -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 ];
4 changes: 2 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.11.1";
version = "1.12.0";

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

patches = [