Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d3784204ba1a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a10a004bb58
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Oct 13, 2020

  1. pdns-recursor: 4.2.2 -> 4.2.5 

    Fixes: CVE-2020-25829
    @mweinelt
    mweinelt committed Oct 13, 2020
    Copy the full SHA
    62d9864 View commit details

  2. Merge pull request #100407 from mweinelt/20.03/pdns-recursor/cve-2020… 

    …-25829

[20.03] pdns-recursor: 4.2.2 -> 4.2.5
    @rnhmjoj
    rnhmjoj authored Oct 13, 2020
    Copy the full SHA
    2871784 View commit details

  3. matrix-synapse: 1.20.1 -> 1.21.0 

    https://github.com/matrix-org/synapse/releases/tag/v1.21.0
(cherry picked from commit 87414de)
    @Ma27
    Ma27 committed Oct 13, 2020
    Copy the full SHA
    8e5088c View commit details

  4. python37Packages.canonicaljson: 1.3.0 -> 1.4.0 

    (cherry picked from commit ed9c3d4)
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Oct 13, 2020
    Copy the full SHA
    3a10a00 View commit details
Showing with 7 additions and 13 deletions.
  1. +2 −2 pkgs/development/python-modules/canonicaljson/default.nix
  2. +2 −2 pkgs/servers/dns/pdns-recursor/default.nix
  3. +3 −9 pkgs/servers/matrix-synapse/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/canonicaljson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@

buildPythonPackage rec {
pname = "canonicaljson";
version = "1.3.0";
version = "1.4.0";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "0v2b72n28fi763xxv9vrf4qc61anl2ys9njy7hlm719fdaq3sxml";
sha256 = "0c86g0vvzdcg3nrcsqnbzlfhpprc2i894p8i14hska56yl27d6w9";
};

propagatedBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/servers/dns/pdns-recursor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "pdns-recursor";
version = "4.2.2";
version = "4.2.5";

src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
sha256 = "013jdyzkl4igipaz61lvw2jnrjgrv1nhzsixrdggxqyxny5dw0lm";
sha256 = "0h089aiaaw0w4bdf1sazb482b0w6y5i6pgp8wzvydms9kwhzsw4j";
};

nativeBuildInputs = [ pkgconfig ];
12 changes: 3 additions & 9 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.20.1";
version = "1.21.0";

src = fetchPypi {
inherit pname version;
sha256 = "1sf36vwvy2f9jy6dldq6gqfmh60384i5j64s7yc131b4dp0n7lcw";
sha256 = "0iip311xbzc984gzpmri5fabpb3b2ck1ywv5378pk90m02yybgi5";
};

patches = [
@@ -50,13 +50,7 @@ in buildPythonApplication rec {
netaddr
phonenumbers
pillow
(prometheus_client.overrideAttrs (x: {
src = fetchPypi {
pname = "prometheus_client";
version = "0.3.1";
sha256 = "093yhvz7lxl7irnmsfdnf2030lkj4gsfkg6pcmy4yr1ijk029g0p";
};
}))
prometheus_client
psutil
psycopg2
pyasn1