diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 5aa22ad..e7a3024 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -25,8 +25,6 @@ let rev = "v${version}"; sha256 = "sha256-6FyLhRy+/uW+RYt+IRHpkTABjKGTQYjR/4GSPN+GlGY="; }; - # mastodon ships with broken symlinks, disable the check for that for now - dontCheckForBrokenSymlinks = true; installPhase = '' cp -r ./ $out/ cp -r ${tangerineUI}/mastodon/app/javascript/styles/* $out/app/javascript/styles/ @@ -50,14 +48,6 @@ let ]; }; yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; - }).overrideAttrs (old: { - mastodonModules = old.mastodonModules.overrideAttrs (old: { - # FIXME: Remove once fixed in nixpkgs. See https://github.com/NixOS/nixpkgs/issues/380366 - postBuild = '' - # Remove workspace "package" as it contains broken symlinks - rm -r ~/node_modules/@mastodon - ''; - }); }); }; pkgs-overlay = pkgs.extend mastodonNekoverseOverlay; diff --git a/flake.lock b/flake.lock index 9645052..7539436 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739188370, - "narHash": "sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY=", + "lastModified": 1738755945, + "narHash": "sha256-yhRbvMTZRP8plyZvhDkN6P/ZRdz581PoIFxipduSU6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ae4ee7978617d3af98721a62f14f25befc0beef", + "rev": "2912b26f2abf86ef1d61f3e821a4f696e7676624", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1739319052, - "narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=", + "lastModified": 1738790909, + "narHash": "sha256-ke9hUOSayBqpxn+d/qvPWvhfERY4t9ubBRw5h/i2wsI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4", + "rev": "e43c53cfc11b8ea55791429e22280783f840fe4d", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739303263, - "narHash": "sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM=", + "lastModified": 1738758495, + "narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cc4213488e886db863878a1e3dc26cc932d38b8", + "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b", "type": "github" }, "original": {