diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 51b3afe..fd5fa64 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -1,4 +1,4 @@ -{ pkgs, nixpkgs-unstable, ... }: +{ pkgs, ... }: let tangerineUI = pkgs.fetchgit { url = "https://github.com/nileane/TangerineUI-for-Mastodon.git"; @@ -40,7 +40,7 @@ let modern-dark: styles/modern-dark.scss" >> $out/config/themes.yml ''; }; - patches = prev.mastodon.src.patches ++ [ + patches = [ "${mastodonNekoversePatches}/patches/001_increase_image_dimensions_limit.patch" "${mastodonNekoversePatches}/patches/002_disable_image_reprocessing.patch" "${mastodonNekoversePatches}/patches/003_make_toot_cute.patch" diff --git a/config/hosts/mastodon/yarn.patch b/config/hosts/mastodon/yarn.patch deleted file mode 100644 index 82a2f77..0000000 --- a/config/hosts/mastodon/yarn.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/.yarnrc.yml b/.yarnrc.yml ---- a/.yarnrc.yml -+++ b/.yarnrc.yml -@@ -1 +1,6 @@ - nodeLinker: node-modules -+ -+approvedGitRepositories: -+ - "**" -+ -+enableScripts: true -diff --git a/yarn.lock b/yarn.lock ---- a/yarn.lock -+++ b/yarn.lock -@@ -2,6 +2,6 @@ - # Manual changes might be lost - proceed with caution! - - __metadata: -- version: 8 -+ version: 9 - cacheKey: 10c0 - \ No newline at end of file diff --git a/flake.lock b/flake.lock index 4ef9f2a..fa8e70b 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778830137, - "narHash": "sha256-wVKu7ZYV3ikh7RVDY1TVlaKwPTFvfkYnOzQGn3IqT4o=", + "lastModified": 1777554940, + "narHash": "sha256-adRHzYRN0huy51aAykoXC4xxBe84AupPMp81lmoNJHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c34a1dd63140ab2150ebb4fa290bbbae58193b", + "rev": "7fea5ede44b70af67136a82b41e39878cfb3a51b", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1778877216, - "narHash": "sha256-NZ9yg+VJy6RftGD3YXeqCEEVsPZH9hPu6yWm/bAuqLM=", + "lastModified": 1777592373, + "narHash": "sha256-/H8BBZdwWPVS9mzK5a8XskmLI+wMf6Zf8d22ZLeWSc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0415a300a8d2daf19019ef418f0b019ee38cf47", + "rev": "6d457375d24d7d6c8b537a161660173ca225dfdf", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778843877, - "narHash": "sha256-BxYhb8H0aVtiM1kGRt+S49NbsJMUMIHvOXxziE9u0nY=", + "lastModified": 1777586718, + "narHash": "sha256-XqqAel6imMLIA8ZeX5CNydzOaokD6GIoUf02DuFeWr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "758b562bc257084aef30b8e3efbdd61d292806c3", + "rev": "417335fe04072fe234d9a566b72d7955df681844", "type": "github" }, "original": {