msclinkbot: use goolm

Signed-off-by: Sumner Evans <[email protected]>
nevarro-space · Dec 15, 2023 · 1e258c4 · 1e258c4
1 parent 32645ff
commit 1e258c4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/nixos/pkgs/matrix-chessbot.nix b/nixos/pkgs/matrix-chessbot.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, buildGoModule, olm, imagemagick }:
 
-buildGoModule rec {
+buildGoModule {
   pname = "matrix-chessbot";
   version = "unstable-2023-05-11";
 
@@ -15,7 +15,7 @@ buildGoModule rec {
 
   propagatedBuildInputs = [ imagemagick ];
 
-  vendorSha256 = "sha256-wNA4s8DCWfxh1z0cnOn0mHKqbN0BHR7AkgUuK+Fzp9U=";
+  vendorHash = "sha256-wNA4s8DCWfxh1z0cnOn0mHKqbN0BHR7AkgUuK+Fzp9U=";
 
   meta = with lib; {
     homepage = "https://github.com/nevarro-space/matrix-chessbot";

diff --git a/nixos/pkgs/mautrix-discord.nix b/nixos/pkgs/mautrix-discord.nix
@@ -13,7 +13,7 @@ buildGoModule {
 
   buildInputs = [ olm ];
 
-  vendorSha256 = "sha256-rbz6bWBl2rmfHuszjKoWZP4/B4F90MUtR5nAIXCU3pg=";
+  vendorHash = "sha256-rbz6bWBl2rmfHuszjKoWZP4/B4F90MUtR5nAIXCU3pg=";
 
   meta = with lib; {
     homepage = "https://github.com/mautrix/discord";

diff --git a/nixos/pkgs/mautrix-signal.nix b/nixos/pkgs/mautrix-signal.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, buildGoModule, olm }:
 
-buildGoModule rec {
+buildGoModule {
   pname = "mautrix-signal";
   version = "unstable-2023-11-01";
 
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   buildInputs = [ olm ];
 
-  vendorSha256 = "sha256-Adfz6mHYa22OqAAAAAAAAAAAAAAA7LuxQI20whq3Zes=";
+  vendorHash = "sha256-Adfz6mHYa22OqAAAAAAAAAAAAAAA7LuxQI20whq3Zes=";
 
   meta = with lib; {
     homepage = "https://github.com/mautrix/slack";

diff --git a/nixos/pkgs/mautrix-slack.nix b/nixos/pkgs/mautrix-slack.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, buildGoModule, olm }:
 
-buildGoModule rec {
+buildGoModule {
   pname = "mautrix-slack";
   version = "unstable-2023-07-26";
 
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   buildInputs = [ olm ];
 
-  vendorSha256 = "sha256-Adfz6mHYa22OqEZZHrvst31XdZFo7LuxQI20whq3Zes=";
+  vendorHash = "sha256-Adfz6mHYa22OqEZZHrvst31XdZFo7LuxQI20whq3Zes=";
 
   meta = with lib; {
     homepage = "https://github.com/mautrix/slack";

diff --git a/nixos/pkgs/msclinkbot.nix b/nixos/pkgs/msclinkbot.nix
@@ -1,19 +1,18 @@
-{ lib, fetchFromGitHub, buildGoModule, olm }:
-
-buildGoModule rec {
+{ lib, fetchFromGitHub, buildGoModule }:
+buildGoModule {
   pname = "msclinkbot";
-  version = "unstable-2023-04-28";
+  version = "unstable-2023-12-15";
 
   src = fetchFromGitHub {
     owner = "beeper";
     repo = "msc-link-bot";
-    rev = "2c4807dd3c9c001a0b90bf9ed1fe2a8d07b76ce5";
-    hash = "sha256-/AVRIZTunByy8iTrB4Gfs6tRsKqrDtl9NILgxfSYXYE=";
+    rev = "5319f21e3e696fca4bef4d566f7ae377c767180b";
+    hash = "sha256-xYKJ+IJgr2vQKSlIQT1wUdJo8nHOi7eFg4+gDZfqZ8U=";
   };
 
-  buildInputs = [ olm ];
+  tags = [ "goolm" ];
 
-  vendorSha256 = "sha256-GyY1z6R/IImCHtomg2qx7E8tn+hFXIGgDWbbKRHvkIM=";
+  vendorHash = "sha256-foQaIMW0W3UQrPDQyb7utWEB+zsibKPk8o7dRol3AKA=";
 
   meta = with lib; {
     homepage = "https://git.hnitbjorg.xyz/~edwargix/msc-link-bot";

diff --git a/nixos/pkgs/standupbot.nix b/nixos/pkgs/standupbot.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub, buildGoModule, olm }:
 
-buildGoModule rec {
+buildGoModule {
   pname = "standupbot";
   version = "unstable-2023-06-02";
 
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   buildInputs = [ olm ];
 
-  vendorSha256 = "sha256-X5D38xyde8zwYZg4RIKbz9v5mFU7inKLMPI9iVbifYI=";
+  vendorHash = "sha256-X5D38xyde8zwYZg4RIKbz9v5mFU7inKLMPI9iVbifYI=";
 
   meta = with lib; {
     homepage = "https://github.com/beeper/standupbot";