fi/nix-infra
Watch
1
2
Fork
You've already forked nix-infra
 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: fi:7565b0148b573f2c46145722f84e485d9cc25414
Branches Tags
fi:main
fi:ikiwiki
fi:mas
..
compare: fi:0bdb480ebac3ac374de07f8c0dd7f71ecdb96eb6
Branches Tags
fi:main
fi:ikiwiki
fi:mas
2 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,14 +16,14 @@ let
}; };
mastodonNekoverseOverlay = final: prev: { mastodonNekoverseOverlay = final: prev: {
mastodon = (prev.mastodon.override rec { mastodon = (prev.mastodon.override rec {
version = "4.7.5"; version = "4.7.4";
srcOverride = final.applyPatches { srcOverride = final.applyPatches {
src = pkgs.stdenv.mkDerivation { src = pkgs.stdenv.mkDerivation {
name = "mastodonWithThemes"; name = "mastodonWithThemes";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/mastodon/mastodon.git"; url = "https://github.com/mastodon/mastodon.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-pnYJbfPX+Nd1W39HfOsEstzk78U/o0BqbwGhq6+ZrmA="; sha256 = "sha256-+Xctddo4CStftfCb2aBtVO7XCOb22w+HZvuZ4Ds2jps=";
}; };
# mastodon ships with broken symlinks, disable the check for that for now # mastodon ships with broken symlinks, disable the check for that for now
dontCheckForBrokenSymlinks = true; dontCheckForBrokenSymlinks = true;

42
flake.lock generated
View file

@ -24,11 +24,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1793969467, "lastModified": 1793370552,
"narHash": "sha256-fOTg8KFnTZZS226jtFAmsjCBzL1dIpQI7QTImt5ZJQQ=", "narHash": "sha256-Dv4jEQeqvPpicC3H8mLTyqtTgXp23p4HPiCMKqKWXFA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "colmena", "repo": "colmena",
"rev": "d135c22028d382878f394ea5f42cd6baeae30f85", "rev": "fc7d67ed1cd52af91415f92ba92b543bc7245f25",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1793540411, "lastModified": 1792773339,
"narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=", "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f", "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +176,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1793989044, "lastModified": 1793649591,
"narHash": "sha256-h5OcK1v3FPPBUHi11SqdrzbpbAezwPfuQTPJI4vYmrk=", "narHash": "sha256-uVRQhN/OZYdudVAi8L94i6MdkdKwUzEE5B2c7rSzHWw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "32cfc943fe34fdec30ccd670443929c1fadb3ade", "rev": "c3e80179921b4aa4952aa0e9c3b6ec55f3fdc098",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1793931523, "lastModified": 1793580174,
"narHash": "sha256-kyzSFmRVevj9lr2XVskwKnae/pXJEbQ+bHKc+mpjqFE=", "narHash": "sha256-Df87rV1AnZaIX3kM7LZ6bHKKqZ1v8MnK/g286JDTcyw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7dd597af6a9776394693e4d0fed85dd5ea8d56da", "rev": "577e5b3393ab727c2cd3768ef981a7ba7d8c120d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +208,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1793928711, "lastModified": 1793571983,
"narHash": "sha256-x4ZAaSvxHK7Sw+BP4YDW1LjVxAO2CVir988FySEeIWw=", "narHash": "sha256-hwLE3wUw9gnplbv1I4EaB92BecfYK4P0sl84SmB5SPs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "daeef707f1d32744253b7878d2dde9abec45eab3", "rev": "64aec40e18595d342f25f120069f2cb63c3947b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,11 +278,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1793657466, "lastModified": 1793052255,
"narHash": "sha256-GoOvpdsjO5hqZuO6T6ok9u6sJEjO0iPli2zRr9oNUNw=", "narHash": "sha256-Y/JIHTnMlOabDfyaSBubWGLDIVGihLEUuoMhFvQKaDo=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "b18e01ce148eb3efff5de2f2d3181ca53b2b2a54", "rev": "60182817ee048ac94b4c68ea76d5ef2e8aac730d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -293,11 +293,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1793648771, "lastModified": 1793044983,
"narHash": "sha256-UXQHROyj9fK/IYIo5t9uJPlJQNiz5Sf4lyTlvJlnI+M=", "narHash": "sha256-TMADWku9ye40AQKGMdSoCpByfqaL7kbO+o8E46Q7CLQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7adf2d937f2992ce3cccf465348a7667e8ba47b8", "rev": "89844ad35df40e876cb6d0a3a319fbf65ea4b984",
"type": "github" "type": "github"
}, },
"original": { "original": {