diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 56cdd00..e636bef 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -1,4 +1,4 @@ -{ pkgs, nixpkgs-unstable, ... }: +{ pkgs, nixpkgs-unstable, nixpkgs-master, ... }: let tangerineUI = pkgs.fetchgit { url = "https://github.com/nileane/TangerineUI-for-Mastodon.git"; @@ -16,14 +16,14 @@ let }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.5.9"; + version = "4.5.10"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-EXMJWdcuvQWe2cXONlcN/oB4b0nXwDqRT+miIB7P7js="; + sha256 = "sha256-aW5WMmhfV+q/ddebSuEuCL5Mdwav+qocMPBnbvXFBk4="; }; # mastodon ships with broken symlinks, disable the check for that for now dontCheckForBrokenSymlinks = true; @@ -53,7 +53,7 @@ let yarnMissingHashes = prev.mastodon.src.yarnMissingHashes; }); }; - pkgs-overlay = pkgs.extend mastodonNekoverseOverlay; + pkgs-overlay = nixpkgs-master.legacyPackages."x86_64-linux".extend mastodonNekoverseOverlay; vapidPublicKey = pkgs.writeText "vapid-public-key" "BDCbFEDCZ8eFuWr3uEq4Qc30UFZUQeNpF8OCw6OjPwAtaKS1yTM3Ue749Xjqy5WhBDjakzlixh4Gk7gluUhIdsU="; in { diff --git a/flake.lock b/flake.lock index 548d0bc..e0a270b 100644 --- a/flake.lock +++ b/flake.lock @@ -118,11 +118,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1778947228, - "narHash": "sha256-z1PIyRIm5nlh6sB4I4ObT42O6IT5zuFzQK0RtvRoL/c=", + "lastModified": 1779243744, + "narHash": "sha256-hwD5/IbAs5FTdg7R2VPWlVsAwrVDmILa+w8gj4U3HQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff5e747c5f45865599ba7387244212420558e83c", + "rev": "7f04f29e010fdf57851461605322d7c2b95f9f15", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1778973839, - "narHash": "sha256-gnglqTdKUK1UlKfq+ZRXmxWW+MRhbpOi3DzjTp2zqRU=", + "lastModified": 1779287632, + "narHash": "sha256-AMcWQ3mQUrdeXiJaCHXYh+c5tBI3lTsbymEUXPRegdo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6aac1076920329e7863e9fb607d4d1811ea16f3", + "rev": "22dcc7e4821c231607aacd682b035f29fabc2f8f", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778930970, - "narHash": "sha256-FqqcYr0c5in/HRL5bkRWykAGp/Q10Vj/zUiSr1P8URE=", + "lastModified": 1779273561, + "narHash": "sha256-O3UFKrh5oDyOwqD4Njdf7+SIxptOl3gHZyesYvNsIbw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a51fe22e18a6ce886b3cffa4c255378c151323c", + "rev": "8e72e9888e67ce593df16546cd31e0d75544ad0d", "type": "github" }, "original": {