From 352d3a3ad9345a0d9864c3923904b81a0e1f4ef7 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Mon, 20 Nov 2023 05:02:23 +0700
Subject: maubot: switch to ensureNewerSourcesForZipFilesHook

---
 .../maubot/allow-building-plugins-from-nix-store.patch      | 13 -------------
 pkgs/tools/networking/maubot/default.nix                    |  2 --
 pkgs/tools/networking/maubot/plugins/default.nix            |  6 +++++-
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/tools/networking/maubot/allow-building-plugins-from-nix-store.patch

diff --git a/pkgs/tools/networking/maubot/allow-building-plugins-from-nix-store.patch b/pkgs/tools/networking/maubot/allow-building-plugins-from-nix-store.patch
deleted file mode 100644
index 1df88b92aa51f..0000000000000
--- a/pkgs/tools/networking/maubot/allow-building-plugins-from-nix-store.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/maubot/cli/commands/build.py b/maubot/cli/commands/build.py
-index ec3ac26..4de85f2 100644
---- a/maubot/cli/commands/build.py
-+++ b/maubot/cli/commands/build.py
-@@ -84,7 +84,7 @@ def read_output_path(output: str, meta: PluginMeta) -> str | None:
- 
- 
- def write_plugin(meta: PluginMeta, output: str | IO) -> None:
--    with zipfile.ZipFile(output, "w") as zip:
-+    with zipfile.ZipFile(output, "w", strict_timestamps=False) as zip:
-         meta_dump = BytesIO()
-         yaml.dump(meta.serialize(), meta_dump)
-         zip.writestr("maubot.yaml", meta_dump.getvalue())
diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix
index 2eb5c9e76bae4..acee6f1dedb3b 100644
--- a/pkgs/tools/networking/maubot/default.nix
+++ b/pkgs/tools/networking/maubot/default.nix
@@ -56,8 +56,6 @@ let
         url = "https://github.com/maubot/maubot/commit/283f0a3ed5dfae13062b6f0fd153fbdc477f4381.patch";
         sha256 = "0yn5357z346qzy5v5g124mgiah1xsi9yyfq42zg028c8paiw8s8x";
       })
-      # allow running "mbc build" in a nix derivation
-      ./allow-building-plugins-from-nix-store.patch
     ];
 
     propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/tools/networking/maubot/plugins/default.nix b/pkgs/tools/networking/maubot/plugins/default.nix
index 0a7c606909a02..b60589b9df7e9 100644
--- a/pkgs/tools/networking/maubot/plugins/default.nix
+++ b/pkgs/tools/networking/maubot/plugins/default.nix
@@ -5,6 +5,7 @@
 , fetchFromGitea
 , stdenvNoCC
 , callPackage
+, ensureNewerSourcesForZipFilesHook
 , maubot
 , python3
 , poetry
@@ -18,7 +19,10 @@ let
   buildMaubotPlugin = attrs@{ version, pname, base_config ? null, ... }:
     stdenvNoCC.mkDerivation (builtins.removeAttrs attrs [ "base_config" ] // {
       pluginName = "${pname}-v${version}.mbp";
-      nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ maubot ];
+      nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [
+        ensureNewerSourcesForZipFilesHook
+        maubot
+      ];
       buildPhase = ''
         runHook preBuild
 
-- 
cgit 1.4.1