diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-12 14:45:02 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-07-12 14:45:13 +0200 |
| commit | 4d75a540cbad21476da8b4a167d7538166a96d16 (patch) | |
| tree | 32d2ef274ebd1ecfad32ba71dd054c4dd20c6f05 | |
| parent | Merge pull request #326488 from vbgl/ocaml-zarith-1.14 (diff) | |
| download | nixpkgs-4d75a540cbad21476da8b4a167d7538166a96d16.tar.gz | |
matrix-media-repo: 1.3.4 -> 1.3.6
https://github.com/t2bot/matrix-media-repo/blob/v1.3.5/CHANGELOG.md
https://github.com/t2bot/matrix-media-repo/blob/v1.3.6/CHANGELOG.md
| -rw-r--r-- | pkgs/by-name/ma/matrix-media-repo/package.nix | 10 | ||||
| -rw-r--r-- | pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch | 22 |
2 files changed, 3 insertions, 29 deletions
diff --git a/pkgs/by-name/ma/matrix-media-repo/package.nix b/pkgs/by-name/ma/matrix-media-repo/package.nix index 63e0f87d073f..3caf10715b67 100644 --- a/pkgs/by-name/ma/matrix-media-repo/package.nix +++ b/pkgs/by-name/ma/matrix-media-repo/package.nix @@ -7,16 +7,16 @@ }: let pname = "matrix-media-repo"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "t2bot"; repo = "matrix-media-repo"; rev = "v${version}"; - hash = "sha256-wC69OiB3HjRs/i46+E1YS+M4zKmvH5vENHyfgU7nt1I="; + hash = "sha256-Yrw+6WKHm9Y31YvW5iXnUDhIg0TcSctaouIGhAN4iBo="; }; - vendorHash = "sha256-STzpKqn47qS0iogVYhFl4QBfKUtnqgxobqv1WaW6UtQ="; + vendorHash = "sha256-fKDdL7C3L33caoXxlutzoND2izB5GH+5qTeojTskIUg="; asset-compiler = buildGoModule { pname = "${pname}-compile_assets"; @@ -31,10 +31,6 @@ in buildGoModule { inherit pname version src vendorHash; - patches = [ - ./synapse-import-u+x.patch - ]; - nativeBuildInputs = [ pkg-config asset-compiler diff --git a/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch b/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch deleted file mode 100644 index e2be0bfde49a..000000000000 --- a/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmd/homeserver_offline_exporters/import_to_synapse/main.go b/cmd/homeserver_offline_exporters/import_to_synapse/main.go -index 3c7db1e..c6cba4f 100644 ---- a/cmd/homeserver_offline_exporters/import_to_synapse/main.go -+++ b/cmd/homeserver_offline_exporters/import_to_synapse/main.go -@@ -78,7 +78,7 @@ func main() { - - ctx.Log.Infof("Copying %s", mxc) - directories := path.Join(cfg.ExportPath, "local_content", record.MediaId[0:2], record.MediaId[2:4]) -- err = os.MkdirAll(directories, 0655) -+ err = os.MkdirAll(directories, 0755) - if err != nil { - return err - } -@@ -134,7 +134,7 @@ func main() { - dirLock.Lock() - defer dirLock.Unlock() - thumbDir := path.Join(cfg.ExportPath, "local_thumbnails", record.MediaId[0:2], record.MediaId[2:4], record.MediaId[4:]) -- err = os.MkdirAll(thumbDir, 0655) -+ err = os.MkdirAll(thumbDir, 0755) - if err != nil { - ctx.Log.Warn("Error creating thumbnail directories. ", s, err) - return |