fi/nix-infra
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: fi:1368fd86636f1d682ed56a8365237e14edbc462b
Branches Tags
fi:main
fi:ikiwiki
fi:mas
..
compare: fi:881189eb6237b44b67ca5f594fcff6ead10b1da3
Branches Tags
fi:main
fi:ikiwiki
fi:mas

No commits in common. "1368fd86636f1d682ed56a8365237e14edbc462b" and "881189eb6237b44b67ca5f594fcff6ead10b1da3" have entirely different histories.
1368fd8663 ... 881189eb62

2 changed files with 9 additions and 19 deletions
Show stats Expand all files Collapse all files

10
config/hosts/mastodon/mastodon.nix
View file

@ -25,8 +25,6 @@ let
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6FyLhRy+/uW+RYt+IRHpkTABjKGTQYjR/4GSPN+GlGY="; sha256 = "sha256-6FyLhRy+/uW+RYt+IRHpkTABjKGTQYjR/4GSPN+GlGY=";
}; };
# mastodon ships with broken symlinks, disable the check for that for now
dontCheckForBrokenSymlinks = true;
installPhase = '' installPhase = ''
cp -r ./ $out/ cp -r ./ $out/
cp -r ${tangerineUI}/mastodon/app/javascript/styles/* $out/app/javascript/styles/ cp -r ${tangerineUI}/mastodon/app/javascript/styles/* $out/app/javascript/styles/
@ -50,14 +48,6 @@ let
]; ];
}; };
yarnHash = "sha256-e5c04M6XplAgaVyldU5HmYMYtY3MAWs+a8Z/BGSyGBg="; 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; pkgs-overlay = pkgs.extend mastodonNekoverseOverlay;

18
flake.lock
View file

@ -70,11 +70,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739188370, "lastModified": 1738755945,
"narHash": "sha256-2h/5uQaKwQeRXIgpOJpzgeO3qe93AonbJFk0CxTSygY=", "narHash": "sha256-yhRbvMTZRP8plyZvhDkN6P/ZRdz581PoIFxipduSU6o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ae4ee7978617d3af98721a62f14f25befc0beef", "rev": "2912b26f2abf86ef1d61f3e821a4f696e7676624",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +101,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1739319052, "lastModified": 1738790909,
"narHash": "sha256-L8Tq1dnW96U70vrNpCCGCLHz4rX1GhNRCrRI/iox9wc=", "narHash": "sha256-ke9hUOSayBqpxn+d/qvPWvhfERY4t9ubBRw5h/i2wsI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "83a2581c81ff5b06f7c1a4e7cc736a455dfcf7b4", "rev": "e43c53cfc11b8ea55791429e22280783f840fe4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1739303263, "lastModified": 1738758495,
"narHash": "sha256-c/Z/6gZLN8BIpYh1B3qMzEn0TArjf4F2lmy59lDLVBM=", "narHash": "sha256-CZ8T4vP3ag2hwkpSZjatxJb55ouszvmnWw09qxGW9TU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6cc4213488e886db863878a1e3dc26cc932d38b8", "rev": "ceaea203f3ae1787b1bd13f021f686391696fc5b",
"type": "github" "type": "github"
}, },
"original": { "original": {