summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-01-29 00:09:36 +0000
committerGitHub <noreply@github.com>2022-01-29 00:09:36 +0000
commit0bc5b1b3f612dbb728f3759bacef05893e7b2213 (patch)
tree9404a12e640c3c5b33bff5b92dfc061a85e31fbf
parentMerge branch 'release-21.11' into staging-next-21.11 (diff)
parentMerge pull request #156773 from NixOS/backport-156756-to-release-21.11 (diff)
downloadnixpkgs-0bc5b1b3f612dbb728f3759bacef05893e7b2213.tar.gz
Merge release-21.11 into staging-next-21.11
-rw-r--r--pkgs/servers/matrix-synapse/default.nix4
-rw-r--r--pkgs/servers/web-apps/wiki-js/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 68f6150496ce..b94257e6d5e2 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -11,11 +11,11 @@ in
with python3.pkgs;
buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.50.2";
+ version = "1.51.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-dy5VCrrmZjWAAkcyfCzUaPLDGSyA0zlP6n8vhS0V8N0=";
+ sha256 = "sha256-qhwFRveFCwflQmVCwzThC8sP+YCqckgCaXAc3IRms0g=";
};
buildInputs = [ openssl ];
diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix
index bfbe46388d2d..3b4af1b86a84 100644
--- a/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/pkgs/servers/web-apps/wiki-js/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
- version = "2.5.268";
+ version = "2.5.272";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz";
- sha256 = "sha256-Ec4trrVETbgKs41aIc4Ne02c969Qc44QtoBf8tyk4+I=";
+ sha256 = "sha256-30thDjmjc24tChgih0FZyIUU6/aKKl4MAD5yqn0yYa4=";
};
sourceRoot = ".";