mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 13:00:23 +00:00
[Backport release-24.11] matrix-media-repo: 1.3.7 -> 1.3.8 (#400645)
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
diff --git a/go.mod b/go.mod
|
||||
index b228f3e..f43f43e 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -54,7 +54,7 @@ require (
|
||||
github.com/redis/go-redis/v9 v9.7.0
|
||||
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
|
||||
github.com/stretchr/testify v1.10.0
|
||||
- github.com/strukturag/libheif v1.19.5
|
||||
+ github.com/strukturag/libheif v1.18.2
|
||||
github.com/t2bot/go-leaky-bucket v1.0.0
|
||||
github.com/t2bot/go-singleflight-streams v1.0.0
|
||||
github.com/t2bot/go-typed-singleflight v0.0.3
|
||||
diff --git a/go.sum b/go.sum
|
||||
index c15be35..964e40e 100644
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -368,8 +368,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
|
||||
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
-github.com/strukturag/libheif v1.19.5 h1:YLf0RO6mNQYeeNkFSk/Uto8EyUOCzDpLPjbEBoeV9Io=
|
||||
-github.com/strukturag/libheif v1.19.5/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=
|
||||
+github.com/strukturag/libheif v1.18.2 h1:CrlRS7Kwl2odl4DYM/m6ay/HPXEcmQPK1xF8FxAqP7k=
|
||||
+github.com/strukturag/libheif v1.18.2/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=
|
||||
github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM=
|
||||
github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8=
|
||||
github.com/t2bot/go-leaky-bucket v1.0.0 h1:w16tqQj4pslBFNc8xEYvOcu5rt8QhLugx1e5TKyT9zI=
|
||||
@@ -8,20 +8,31 @@
|
||||
}:
|
||||
let
|
||||
pname = "matrix-media-repo";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t2bot";
|
||||
repo = "matrix-media-repo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-trVn+Mn98aJLQCpQX1+qps/uuA5+8zeDoM94eauxHO8=";
|
||||
hash = "sha256-KP1ZyHqeATxk1PCLuM6lPk+GB4Rd0f7ppKVETIURx28=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fKDdL7C3L33caoXxlutzoND2izB5GH+5qTeojTskIUg=";
|
||||
patches = [
|
||||
# matrix-media-repo 1.3.8+ uses a Go wrapper expecting libheif 1.19+
|
||||
# which NixOS 24.11 does not have
|
||||
./downgrade-libheif-wrapper.diff
|
||||
];
|
||||
|
||||
vendorHash = "sha256-3cmjdhL4U7tq429vUPElM5Kp203SWgZeoHM/i6Vuf7Q=";
|
||||
|
||||
asset-compiler = buildGoModule {
|
||||
pname = "${pname}-compile_assets";
|
||||
inherit version src vendorHash;
|
||||
inherit
|
||||
version
|
||||
src
|
||||
patches
|
||||
vendorHash
|
||||
;
|
||||
|
||||
subPackages = [
|
||||
"cmd/utilities/compile_assets"
|
||||
@@ -34,6 +45,7 @@ buildGoModule {
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
vendorHash
|
||||
;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user