pinpox/infra
1
0
Fork 0
forked from pub-solar/infra
Code Pull requests Activity

mastodon: remove overlay for security update, new

Browse source 
version landed in NixOS 24.05
This commit is contained in:
teutat3s 2024-07-08 18:36:48 +02:00
parent 70ae84272c
commit dfb523133e
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -360,22 +360,6 @@
"type": "github"
}
},
"nixpkgs-head": {
"locked": {
"lastModified": 1720453862,
"narHash": "sha256-iQcYpFRFzQV/lN6eqrHWMKmMMkGbJl3eY+piZ67ZKqU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "acbecbb607c70bddfc5938b61cedbff3cfb1fc39",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1719876945,
@ -402,7 +386,6 @@
"nixos-flake": "nixos-flake",
"nixpkgs": "nixpkgs",
"nixpkgs-2205": "nixpkgs-2205",
"nixpkgs-head": "nixpkgs-head",
"simple-nixos-mailserver": "simple-nixos-mailserver",
"triton-vmtools": "triton-vmtools",
"unstable": "unstable"

1
flake.nix
View file

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

16
overlays/default.nix
View file

@ -16,22 +16,6 @@
element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker {
inherit (inputs) element-stickers maunium-stickerpicker;
};
mastodon = prev.mastodon.override {
version = "4.2.10";
patches = [
(final.fetchpatch {
url = "https://github.com/mastodon/mastodon/compare/v4.2.9...v4.2.10.patch";
hash = "sha256-268iq+2E5OOlhaJE1u5q7AFPdsloXpZCEXoyRMLtRys=";
})
];
# Mastodon has been upgraded on master, the backport is still
# in progress. This is a temporary hack until the backport
# makes it to the branch nixos-24.05.
# https://github.com/NixOS/nixpkgs/pull/324587
# https://nixpk.gs/pr-tracker.html?pr=324587
gemset = import "${inputs.nixpkgs-head.sourceInfo.outPath}/pkgs/servers/mastodon/gemset.nix";
};
}
)
];