Merge pull request #146287 from jojosch/mjolnir-1.2.0

2021-11-18 18:40:45 +01:00 · 2021-11-18 18:40:45 +01:00 · f271698f25
commit f271698f25
parent cb34fa1b42 c3908b0110
3 changed files with 1481 additions and 247 deletions
--- a/nixos/modules/services/matrix/mjolnir.nix
+++ b/nixos/modules/services/matrix/mjolnir.nix
@ -14,6 +14,8 @@ let
      else
        cfg.homeserverUrl;

+    rawHomeserverUrl = cfg.homeserverUrl;
+
    pantalaimon = {
      inherit (cfg.pantalaimon) username;

--- a/pkgs/servers/mjolnir/default.nix
+++ b/pkgs/servers/mjolnir/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "mjolnir";
-  version = "1.1.20";
+  version = "1.2.1";

  src = fetchFromGitHub {
    owner = "matrix-org";
    repo = "mjolnir";
    rev = "v${version}";
-    sha256 = "yfMBnNriSpwitR4u664iz+8uWp/3iSTymyFajMBP5xg=";
+    sha256 = "4c9LyQb5SZ1IoBayiP0C0ho4hwJDv49DhsuoQIv9bTs=";
  };

  nativeBuildInputs = [
--- a/pkgs/servers/mjolnir/node-deps.nix
+++ b/pkgs/servers/mjolnir/node-deps.nix