From 6dae3c7b299f2cde2dd78b1c9df8983fe5c1962c Mon Sep 17 00:00:00 2001 From: fi Date: Wed, 12 Feb 2025 01:38:58 +0100 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2912b26f2abf86ef1d61f3e821a4f696e7676624?narHash=sha256-yhRbvMTZRP8plyZvhDkN6P/ZRdz581PoIFxipduSU6o%3D' (2025-02-05) → 'github:NixOS/nixpkgs/8ae4ee7978617d3af98721a62f14f25befc0beef?narHash=sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY%3D' (2025-02-10) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/e43c53cfc11b8ea55791429e22280783f840fe4d?narHash=sha256-ke9hUOSayBqpxn%2Bd/qvPWvhfERY4t9ubBRw5h/i2wsI%3D' (2025-02-05) → 'github:NixOS/nixpkgs/83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4?narHash=sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc%3D' (2025-02-12) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/ceaea203f3ae1787b1bd13f021f686391696fc5b?narHash=sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU%3D' (2025-02-05) → 'github:NixOS/nixpkgs/6cc4213488e886db863878a1e3dc26cc932d38b8?narHash=sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM%3D' (2025-02-11) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 7539436..9645052 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738755945, - "narHash": "sha256-yhRbvMTZRP8plyZvhDkN6P/ZRdz581PoIFxipduSU6o=", + "lastModified": 1739188370, + "narHash": "sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2912b26f2abf86ef1d61f3e821a4f696e7676624", + "rev": "8ae4ee7978617d3af98721a62f14f25befc0beef", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1738790909, - "narHash": "sha256-ke9hUOSayBqpxn+d/qvPWvhfERY4t9ubBRw5h/i2wsI=", + "lastModified": 1739319052, + "narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43c53cfc11b8ea55791429e22280783f840fe4d", + "rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1738758495, - "narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=", + "lastModified": 1739303263, + "narHash": "sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b", + "rev": "6cc4213488e886db863878a1e3dc26cc932d38b8", "type": "github" }, "original": { From 1368fd86636f1d682ed56a8365237e14edbc462b Mon Sep 17 00:00:00 2001 From: fi Date: Wed, 12 Feb 2025 01:54:38 +0100 Subject: [PATCH 2/2] Don't check for broken symlinks when building mastodon Mastodon ships with broken symlinks. When building mastodon the check for that needs to be disabled. --- config/hosts/mastodon/mastodon.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index e7a3024..5aa22ad 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -25,6 +25,8 @@ 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/ @@ -48,6 +50,14 @@ 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;