security: Upgrade mastodon to 4.2.7 #114

Merged
axeman merged 1 commit from mastodon-4.2.7 into main 2024-02-16 13:47:58 +00:00
3 changed files with 34 additions and 0 deletions
Showing only changes of commit f7d7964299 - Show all commits

View file

@ -285,6 +285,22 @@
"type": "github"
}
},
"nixpkgs-head": {
"locked": {
"lastModified": 1708085481,
"narHash": "sha256-6pi0YjrW5yZIvjhrIkME4IgFBljsCZArkCSJeEd+W0o=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8ecf09944fe1cf1ce5b08d34dbcd134e5764f0f1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
@ -315,6 +331,7 @@
"nixos-flake": "nixos-flake",
"nixpkgs": "nixpkgs",
"nixpkgs-2205": "nixpkgs-2205",
"nixpkgs-head": "nixpkgs-head",
"triton-vmtools": "triton-vmtools",
"unstable": "unstable"
}

View file

@ -6,6 +6,8 @@
nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgs-head.url = "github:nixos/nixpkgs/master";
nix-darwin.url = "github:lnl7/nix-darwin/master";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";

View file

@ -14,6 +14,21 @@
in
{
element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; };
mastodon = prev.mastodon.override {
version = "4.2.7";
patches = [
(final.fetchpatch {
url = "https://github.com/mastodon/mastodon/compare/v4.2.6...v4.2.7.patch";
hash = "sha256-8FhlSIHOKIEjq62+rp8QdHY87qMCtDZwjyR0HabdHig=";
})
];
# Mastodon has been upgraded on master, the backport is still
# in progress. This is a temporary hack until the backport
# makes it to 23.11.
# https://github.com/NixOS/nixpkgs/pull/289261
gemset = import "${inputs.nixpkgs-head.sourceInfo.outPath}/pkgs/servers/mastodon/gemset.nix";
};
})
];
});