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: 2fa95f0e11a3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6366973ea07c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 7, 2018

  1. Copy the full SHA
    29473c5 View commit details

Commits on Apr 9, 2018

  1. Merge pull request #38538 from Ralith/matrix-synapse

    matrix-synapse: 0.26.1 -> 0.27.2
    matthewbauer authored Apr 9, 2018
    Copy the full SHA
    6366973 View commit details
Showing with 2 additions and 6 deletions.
  1. +2 −6 pkgs/servers/matrix-synapse/default.nix
8 changes: 2 additions & 6 deletions pkgs/servers/matrix-synapse/default.nix
Original file line number Diff line number Diff line change
@@ -26,20 +26,16 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
version = "0.26.1";
version = "0.27.2";

src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
sha256 = "1rm15qj743k376skjxyyfmzwajx3rb8z2inzc4309kl98jfw3cw0";
sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3";
};

patches = [
(fetchpatch { # Update pynacl dependency
url = "https://github.com/matrix-org/synapse/pull/2888.patch";
sha256 = "0gr9vwv02ps17d6pzassp9xmj1qbdgxwn1z4kckx4x964zzhyn4f";
})
./matrix-synapse.patch
];