From 19ca99a309b03010648d350dff8809a787ad76e5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Sep 2023 16:08:50 +0200
Subject: [PATCH 1/4] 
 matrix-synapse.plugins.matrix-synapse-s3-storage-provider: add changelog to
 meta

---
 pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
index 646dfc3728d1..6d8abb4cdd54 100644
--- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
+++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
@@ -27,6 +27,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Synapse storage provider to fetch and store media in Amazon S3";
     homepage = "https://github.com/matrix-org/synapse-s3-storage-provider";
+    changelog = "https://github.com/matrix-org/synapse-s3-storage-provider/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ yuka ];
   };

From 4c2b34580c38475d015973d382da69dc8749ed83 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Sep 2023 16:11:00 +0200
Subject: [PATCH 2/4] 
 matrix-synapse.plugins.matrix-synapse-s3-storage-provider: equalize content

- add and update comments
- use hash as there is already an SRI hash present
- update ordering of phases and inputs (logical and alphabetically)
---
 .../plugins/s3-storage-provider.nix           | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
index 6d8abb4cdd54..58be711efd76 100644
--- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
+++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
@@ -1,4 +1,12 @@
-{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted, humanize, boto3, tqdm }:
+{ lib
+, boto3
+, buildPythonPackage
+, fetchFromGitHub
+, humanize
+, matrix-synapse
+, tqdm
+, twisted
+}:
 
 buildPythonPackage rec {
   pname = "matrix-synapse-s3-storage-provider";
@@ -7,8 +15,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse-s3-storage-provider";
-    rev = "v${version}";
-    sha256 = "sha256-92Xkq54jrUE2I9uVOxI72V9imLNU6K4JqDdOZb+4f+Y=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-92Xkq54jrUE2I9uVOxI72V9imLNU6K4JqDdOZb+4f+Y=";
   };
 
   postPatch = ''
@@ -16,13 +24,25 @@ buildPythonPackage rec {
       --replace "humanize>=0.5.1,<0.6" "humanize>=0.5.1"
   '';
 
-  doCheck = false;
-  pythonImportsCheck = [ "s3_storage_provider" ];
+  buildInputs = [
+    matrix-synapse
+  ];
 
-  buildInputs = [ matrix-synapse ];
-  propagatedBuildInputs = [ twisted humanize boto3 tqdm ]
-    # for the s3_media_upload script
-    ++ matrix-synapse.propagatedBuildInputs;
+  propagatedBuildInputs = [
+    boto3
+    humanize
+    tqdm
+    twisted
+  ]
+  # For the s3_media_upload script
+  ++ matrix-synapse.propagatedBuildInputs;
+
+  # Tests need network access
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "s3_storage_provider"
+  ];
 
   meta = with lib; {
     description = "Synapse storage provider to fetch and store media in Amazon S3";

From 86655c6b75c749d8a30ef19eff1a6499996f84af Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Sep 2023 16:13:20 +0200
Subject: [PATCH 3/4] 
 matrix-synapse.plugins.matrix-synapse-s3-storage-provider: add format

- disable on unsupported Python releases
---
 pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
index 58be711efd76..32e6a64f0001 100644
--- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
+++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , humanize
 , matrix-synapse
+, pythonOlder
 , tqdm
 , twisted
 }:
@@ -11,6 +12,9 @@
 buildPythonPackage rec {
   pname = "matrix-synapse-s3-storage-provider";
   version = "1.2.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "matrix-org";

From 7e8a5f3403981b0eba8c58c5dd116afaa43f6beb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Sep 2023 16:14:04 +0200
Subject: [PATCH 4/4] 
 matrix-synapse.plugins.matrix-synapse-s3-storage-provider: use
 matrix-synapse-unwrapped

---
 pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
index 32e6a64f0001..42d62539b6b3 100644
--- a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
+++ b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
@@ -3,7 +3,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , humanize
-, matrix-synapse
+, matrix-synapse-unwrapped
 , pythonOlder
 , tqdm
 , twisted
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   '';
 
   buildInputs = [
-    matrix-synapse
+    matrix-synapse-unwrapped
   ];
 
   propagatedBuildInputs = [
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     twisted
   ]
   # For the s3_media_upload script
-  ++ matrix-synapse.propagatedBuildInputs;
+  ++ matrix-synapse-unwrapped.propagatedBuildInputs;
 
   # Tests need network access
   doCheck = false;