mastodon: 4.6.6 -> 4.6.7

Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.6.7
(cherry picked from commit dac363921a)
This commit is contained in:
Kerstin Humm
2026-09-01 16:28:04 +02:00
committed by github-actions[bot]
parent 821db4d1d3
commit 4a82eca44c
2 changed files with 11 additions and 18 deletions

View File

@@ -741,10 +741,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1qfi2ns3zwkgq616fc127xiqhan7g7m7gqpwriwcr34nds1vxwdj";
sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4";
type = "gem";
};
version = "1.3.8";
version = "1.3.7";
};
connection_pool = {
groups = [
@@ -1112,10 +1112,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1raacipbb5m0176w05m3n21ip91w7i0cb5zjqhkz2nqgf234kcm9";
sha256 = "1ncmbdjf2bwmk0jf5cxywns9zbxyfiy4h4p3pzi7yddyjhv81qrq";
type = "gem";
};
version = "6.0.6";
version = "6.0.4";
};
erubi = {
groups = [
@@ -2137,10 +2137,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0ha9sgkfqna62c1basc17dkx91yk7ppgjq32k4nhrikirlz6g9kg";
sha256 = "1s30l5z7jkazgi4m6l6mh80rgsyhh2pp1pa5h70xclsj8z54wmq6";
type = "gem";
};
version = "2.9.0";
version = "2.9.1";
};
marcel = {
groups = [ "default" ];
@@ -2322,10 +2322,10 @@
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "1px886qvws5zvqphy5cysj8vg01lym0w7vs9wq1h41pk1pjlxaln";
sha256 = "03ga2h4i5hsk8pdlicyfvqfsbh55vrbikb0nkx9x7vx7fl6kdw19";
type = "gem";
};
version = "0.6.6";
version = "0.6.4.1";
};
net-ldap = {
dependencies = [

View File

@@ -2,29 +2,22 @@
{
fetchFromGitHub,
applyPatches,
fetchpatch,
patches ? [ ],
}:
let
version = "4.6.6";
version = "4.6.7";
in
applyPatches {
src = fetchFromGitHub {
owner = "mastodon";
repo = "mastodon";
rev = "v${version}";
hash = "sha256-V/mhT11IJ60kT7Q1dP17XOEUIVGNuJoitseDBX1sbjI=";
hash = "sha256-gSJXe4/uRYYKQTmjMirD2uFA7ymRl2LQP6VHt8nBD9k=";
passthru = {
inherit version;
yarnHash = "sha256-VlOG91ZuO+1UXTbtwIrYUbqHjmSfPSfLhrf4TxCJqJ0=";
yarnMissingHashes = ./missing-hashes.json;
};
};
patches = patches ++ [
(fetchpatch {
name = "CVE-2026-66066.patch";
url = "https://github.com/mastodon/mastodon/commit/0aede8f7d799aff721a2b3e454163dfae25538b7.patch";
hash = "sha256-NSplnP+c8ZnTmmarZ/cplk5TZvxooKXfLnMDHcBSYY4=";
})
];
patches = [ ];
}