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: 021b296435a4
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: dce33f1a2d49
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 16, 2020

  1. python3Packages.signedjson: 1.0.0 -> 1.1.0 

    (cherry picked from commit 500375e)
    @Ma27
    Ma27 committed Mar 16, 2020
    Copy the full SHA
    a9d4746 View commit details

  2. matrix-synapse: 1.9.1 -> 1.11.1 

    Contains only the version update from 8be61f7,
the module-changes are not needed on 19.09 since the database is always
configured properly here.
    @Ma27
    Ma27 committed Mar 16, 2020
    Copy the full SHA
    dce33f1 View commit details
Showing with 6 additions and 5 deletions.
  1. +4 −3 pkgs/development/python-modules/signedjson/default.nix
  2. +2 −2 pkgs/servers/matrix-synapse/default.nix
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/signedjson/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,19 +4,20 @@
, canonicaljson
, unpaddedbase64
, pynacl
, typing-extensions
}:

buildPythonPackage rec {
pname = "signedjson";
version = "1.0.0";
version = "1.1.0";

src = fetchgit {
url = "https://github.com/matrix-org/python-signedjson.git";
rev = "refs/tags/v${version}";
sha256 = "0b8xxhc3npd4567kqapfp4gs7m0h057xam3an7424az262ind82n";
sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c";
};

propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl ];
propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ];

meta = with stdenv.lib; {
homepage = https://pypi.org/project/signedjson/;
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.9.1";
version = "1.11.1";

src = fetchPypi {
inherit pname version;
sha256 = "13csf18dchm75vw251a7h57diag94vw6rhg8kkkbpi35cibn0cz2";
sha256 = "0xd4bxsmk67r6pfj5lh0hn36r8z51mxsl39fjfrfdidvl1qqbxnk";
};

patches = [