diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-02-19 15:56:48 +0100 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-02-19 15:57:28 +0100 |
| commit | c8d3a81d2ab001bfed3476678d5bc2174d54bc4f (patch) | |
| tree | ad2856d57dff697a60b12da6d4b0e3c6c3e98bfe /pkgs/servers/matrix-synapse | |
| parent | cfa3e7e6339ad4e96077e8099dc2193fadb5371b (diff) | |
| download | nixpkgs-c8d3a81d2ab001bfed3476678d5bc2174d54bc4f.tar nixpkgs-c8d3a81d2ab001bfed3476678d5bc2174d54bc4f.tar.gz nixpkgs-c8d3a81d2ab001bfed3476678d5bc2174d54bc4f.tar.bz2 nixpkgs-c8d3a81d2ab001bfed3476678d5bc2174d54bc4f.tar.lz nixpkgs-c8d3a81d2ab001bfed3476678d5bc2174d54bc4f.tar.xz nixpkgs-c8d3a81d2ab001bfed3476678d5bc2174d54bc4f.tar.zst nixpkgs-c8d3a81d2ab001bfed3476678d5bc2174d54bc4f.zip | |
matrix-synapse: fix pynacl dependency
closes #34959
Diffstat (limited to 'pkgs/servers/matrix-synapse')
| -rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 7de011e5866..d8352df3623 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }: +{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub, fetchpatch }: let matrix-angular-sdk = pythonPackages.buildPythonPackage rec { name = "matrix-angular-sdk-${version}"; @@ -35,7 +35,13 @@ in pythonPackages.buildPythonApplication rec { sha256 = "1ggdnb4c8y835j9lxsglxry6fqy7d190s70rccjrc3rj0p5vwlyj"; }; - patches = [ ./matrix-synapse.patch ]; + patches = [ + (fetchpatch { # Update pynacl dependency + url = "https://github.com/matrix-org/synapse/pull/2888.patch"; + sha256 = "0gr9vwv02ps17d6pzassp9xmj1qbdgxwn1z4kckx4x964zzhyn4f"; + }) + ./matrix-synapse.patch + ]; propagatedBuildInputs = with pythonPackages; [ blist canonicaljson daemonize dateutil frozendict pillow pyasn1 |