diff options
author | Fabian Affolter <mail@fabian-affolter.ch> | 2023-09-10 16:11:00 +0200 |
---|---|---|
committer | Fabian Affolter <mail@fabian-affolter.ch> | 2023-09-10 16:11:00 +0200 |
commit | 4c2b34580c38475d015973d382da69dc8749ed83 (patch) | |
tree | 60cf85cd982019b75f0ab68abcb27b314839f847 /pkgs/servers/matrix-synapse | |
parent | 19ca99a309b03010648d350dff8809a787ad76e5 (diff) |
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)
Diffstat (limited to 'pkgs/servers/matrix-synapse')
-rw-r--r-- | pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix index 6d8abb4cdd54a..58be711efd766 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" ''; + buildInputs = [ + matrix-synapse + ]; + + propagatedBuildInputs = [ + boto3 + humanize + tqdm + twisted + ] + # For the s3_media_upload script + ++ matrix-synapse.propagatedBuildInputs; + + # Tests need network access doCheck = false; - pythonImportsCheck = [ "s3_storage_provider" ]; - buildInputs = [ matrix-synapse ]; - propagatedBuildInputs = [ twisted humanize boto3 tqdm ] - # for the s3_media_upload script - ++ matrix-synapse.propagatedBuildInputs; + pythonImportsCheck = [ + "s3_storage_provider" + ]; meta = with lib; { description = "Synapse storage provider to fetch and store media in Amazon S3"; |