From 813f7ac8bc5f68165bcb4b7c257540d8c16e3192 Mon Sep 17 00:00:00 2001 From: Fiona Grzebien Date: Tue, 29 Oct 2024 14:47:28 +0100 Subject: [PATCH 1/3] Update mastodon to v4.3.1 --- config/hosts/mastodon/mastodon.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 0c511e9..c4536eb 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -2,24 +2,24 @@ let mastodonNekoversePatches = pkgs.fetchgit { url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git"; - hash = "sha256-Fcbuj5BGkQd3X/gViqqB+NRIvjUlUED32tNEJrzYh5o="; + hash = "sha256-3jWbKll5RGB1vfEmONVivzGYcoONEkBEHh/rOt9LXlU="; }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.2.13"; + version = "4.3.1"; srcOverride = final.applyPatches { src = final.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-+HGu02fjYJ1x6Tk9AdqmFN7JHk3UnlvCdiQ/5yMu69M="; + sha256 = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4="; }; patches = [ "${mastodonNekoversePatches}/patches/001_increase_image_dimensions_limit.patch" "${mastodonNekoversePatches}/patches/002_disable_image_reprocessing.patch" "${mastodonNekoversePatches}/patches/003_make_toot_cute.patch" - "${mastodonNekoversePatches}/patches/005_improve_custom_emoji_support.patch" - "${mastodonNekoversePatches}/patches/006_increase_profile_limits.patch" - "${mastodonNekoversePatches}/patches/007_increase_toot_character_limit.patch" + "${mastodonNekoversePatches}/patches/004_improve_custom_emoji_support.patch" + "${mastodonNekoversePatches}/patches/005_increase_profile_limits.patch" + "${mastodonNekoversePatches}/patches/006_increase_toot_character_limit.patch" ]; }; yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE="; From 9e7c8d1e13ee4f5fe528ea9f016d27488cba5eac Mon Sep 17 00:00:00 2001 From: Fiona Grzebien Date: Tue, 29 Oct 2024 14:51:46 +0100 Subject: [PATCH 2/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/9ae128172f823956e54947fe471bc6dfa670ecb4?narHash=sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4%3D' (2024-10-03) → 'github:nix-community/nixos-generators/7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565?narHash=sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg%3D' (2024-10-21) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1?narHash=sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc%3D' (2024-09-29) → 'github:nix-community/nixpkgs.lib/cce4521b6df014e79a7b7afc58c703ed683c916e?narHash=sha256-hUP9oxmnOmNnKcDOf5Y55HQ%2BNnoT0%2BbLWHLQWLLw9Ks%3D' (2024-10-20) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/7886208f96bdd147662b47aa4432c013034bb02c?narHash=sha256-9Sp%2Br9kK3l194lFZdF1s7AghothogNI/xTAduJd6zNI%3D' (2024-10-05) → 'github:NixOS/nixpkgs/dd6d18bf8d291daca03a444973bd4f9aa5c1f681?narHash=sha256-O2/v/ocUL0KsACqEIK5eD5XeX46duRIgKdOu6uCKarw%3D' (2024-10-28) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/ffec6dc98b42578b2cfea9b71e118228c46367a4?narHash=sha256-T5BHSQd388PZEKANzSYFTFFwIZx7EBCnwnLP4oRNqwo%3D' (2024-10-05) → 'github:NixOS/nixpkgs/ec7caabec9679b1a9008e0cbcfa4b14a2b600774?narHash=sha256-WPGVR8NW9ctqwLMtYV23b94ExQulTFoTKqD21WI3fbg%3D' (2024-10-29) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/d5f1752ca905354f763f2fab62e6139310b5ce91?narHash=sha256-Fih2RMPboL%2BnuY7IEp3ujaCjLXLgFfoDQf%2BCT/GJdok%3D' (2024-10-04) → 'github:NixOS/nixpkgs/75e28c029ef2605f9841e0baa335d70065fe7ae2?narHash=sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ%3D' (2024-10-28) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f175878..4534930 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1729386149, + "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1727917377, - "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", + "lastModified": 1729472750, + "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728121536, - "narHash": "sha256-9Sp+r9kK3l194lFZdF1s7AghothogNI/xTAduJd6zNI=", + "lastModified": 1730142757, + "narHash": "sha256-O2/v/ocUL0KsACqEIK5eD5XeX46duRIgKdOu6uCKarw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7886208f96bdd147662b47aa4432c013034bb02c", + "rev": "dd6d18bf8d291daca03a444973bd4f9aa5c1f681", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1728140783, - "narHash": "sha256-T5BHSQd388PZEKANzSYFTFFwIZx7EBCnwnLP4oRNqwo=", + "lastModified": 1730209337, + "narHash": "sha256-WPGVR8NW9ctqwLMtYV23b94ExQulTFoTKqD21WI3fbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffec6dc98b42578b2cfea9b71e118228c46367a4", + "rev": "ec7caabec9679b1a9008e0cbcfa4b14a2b600774", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728055773, - "narHash": "sha256-Fih2RMPboL+nuY7IEp3ujaCjLXLgFfoDQf+CT/GJdok=", + "lastModified": 1730157240, + "narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d5f1752ca905354f763f2fab62e6139310b5ce91", + "rev": "75e28c029ef2605f9841e0baa335d70065fe7ae2", "type": "github" }, "original": { From b9852f3bfd4a857f2a33fd0008c5c87a93ca00ba Mon Sep 17 00:00:00 2001 From: Fiona Grzebien Date: Tue, 29 Oct 2024 14:53:58 +0100 Subject: [PATCH 3/3] Update mastodon yarn hash --- config/hosts/mastodon/mastodon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index c4536eb..4bd22c2 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -22,7 +22,7 @@ let "${mastodonNekoversePatches}/patches/006_increase_toot_character_limit.patch" ]; }; - yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE="; + yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; }); }; pkgs-overlay = nixpkgs-unstable.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay;