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

Compare commits

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

2 commits
881189eb62 ... 1368fd8663

Author SHA1 Message Date
fi 1368fd8663 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.
 2025-02-12 02:12:27 +01:00
fi 6dae3c7b29 flake.lock: Update 
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)
 2025-02-12 01:38:58 +01:00
2 changed files with 19 additions and 9 deletions
Show stats Expand all files Collapse all files

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

@ -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;

18
flake.lock
View file

@ -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": {