diff --git a/common/fragments/mastodon.nix b/common/fragments/mastodon.nix index 9bd4223..8ddd505 100644 --- a/common/fragments/mastodon.nix +++ b/common/fragments/mastodon.nix @@ -22,7 +22,7 @@ MAX_POLL_OPTIONS = "128"; MAX_POLL_OPTION_CHARS = "512"; EXTRA_DATA_HOSTS = "https://ftp.technogothic.net"; - MASTODON_VERSION_METADATA = "+AGATHA+AGATHA"; + MASTODON_VERSION_METADATA = "AGATHA+AGATHA"; }; }; diff --git a/common/pkgs/mastodon/gemset.nix b/common/pkgs/mastodon/gemset.nix index 90f27d1..7f006cd 100644 --- a/common/pkgs/mastodon/gemset.nix +++ b/common/pkgs/mastodon/gemset.nix @@ -1859,10 +1859,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; + sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8"; type = "gem"; }; - version = "1.16.0"; + version = "1.16.2"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -2847,10 +2847,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qkhnmvkw6782vrvd9p03ifl2j206lr3kkljpccvmf18qgkrd356"; + sha256 = "1am17wfx023z1x9sxq90cyjarcmcwb95mi456mcf13m783r4n190"; type = "gem"; }; - version = "7.1.31"; + version = "7.1.33"; }; simple-navigation = { dependencies = ["activesupport"]; diff --git a/common/pkgs/mastodon/source.nix b/common/pkgs/mastodon/source.nix index 2fe7eb9..70455bd 100644 --- a/common/pkgs/mastodon/source.nix +++ b/common/pkgs/mastodon/source.nix @@ -1,12 +1,12 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [ ] }: -let version = "4615ff9a14d80753ebbae8eb6174d43f553241ad"; +let version = "e74ef482675e9cb524e5e46d2e6624a2dd922395"; in (applyPatches { src = fetchFromGitHub { owner = "AgathaSorceress"; repo = "mastodon"; rev = "${version}"; - sha256 = "bTjyeZbxdkAtLb63jBgNUKhlnXY0KIpGAN0YCglcT5E="; + sha256 = "lcTw8C1KFnl5kUKjdBXFrrx6Nz8hFqvqG8nThQHv0Hs="; }; patches = patches ++ [ ./yarn-typescript.patch ]; }) // { diff --git a/flake.lock b/flake.lock index b40ba7b..7ab7a67 100644 --- a/flake.lock +++ b/flake.lock @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1705976678, - "narHash": "sha256-gPVkZJ4XbdJ5JWltoMHfJbmgbgsgYi/hE2zkj/njUjM=", + "lastModified": 1707488951, + "narHash": "sha256-xD0e8vLhrxmLKP8mo4kHmfXtDSQ9RZm/dbMmWDdW5WQ=", "owner": "helix-editor", "repo": "helix", - "rev": "ae8042bb83e34b7cf085ec8792fcbf529896d998", + "rev": "d570c29ce37ffbb46a9c49708c31dfd81daa27cf", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1705659542, - "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705883077, - "narHash": "sha256-ByzHHX3KxpU1+V0erFy8jpujTufimh6KaS/Iv3AciHk=", + "lastModified": 1707588924, + "narHash": "sha256-0e1ce6X5ghapv6cAF9rxLZKeNyFHHXsLbGxN2cQQE8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f5210aa20e343b7e35f40c033000db0ef80d7b9", + "rev": "10b813040df67c4039086db0f6eaf65c536886c6", "type": "github" }, "original": { @@ -499,11 +499,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1705916986, - "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", + "lastModified": 1707514827, + "narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", + "rev": "20f65b86b6485decb43c5498780c223571dd56ef", "type": "github" }, "original": {