daniel/dotfiles
1
0
Fork 0
Code Activity Actions

mastodon: use pkg directly from master
All checks were successful
Build / build-amd64-linux (push) Successful in 29s
Details
Build / build-arm64-linux (push) Successful in 1m25s
Details

Browse source
This commit is contained in:
Daniel Kempkens 2024-02-14 23:36:42 +01:00
parent eb2b5bddc4
commit d075e6ff80
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
4 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -404,6 +404,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1707937360,
"narHash": "sha256-ddAUDSv9DKbme8bYkkm6yGV8HNr+f3Aj+6jO3J2ydp8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c2507ad16ba743d62e6b67691e7b69e06229116e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1702780907, "lastModified": 1702780907,
@ -474,6 +490,7 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable", "nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }

2
flake.nix
View file

@ -2,7 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
# nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-master.url = "github:nixos/nixpkgs/master";
# Tools # Tools

4
system/flakes/tanker.nix
View file

@ -3,13 +3,13 @@
let let
default-system = "x86_64-linux"; default-system = "x86_64-linux";
# overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
# overlay-unstable = _: _: { pkgs-unstable = import inputs.nixpkgs { system = default-system; }; }; # overlay-unstable = _: _: { pkgs-unstable = import inputs.nixpkgs { system = default-system; }; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
# overlay-master overlay-master
# overlay-unstable # overlay-unstable
overlay-nifoc overlay-nifoc
]; ];

20
system/nixos/mastodon.nix
View file

@ -3,25 +3,7 @@
let let
web-domain = "mastodon.kempkens.io"; web-domain = "mastodon.kempkens.io";
pkg-base = pkgs.mastodon.override { pkg-base = pkgs.pkgs-master.mastodon;
srcOverride =
let
version = "4.2.5";
in
(
pkgs.applyPatches {
src = pkgs.fetchFromGitHub {
owner = "mastodon";
repo = "mastodon";
rev = "v${version}";
hash = "sha256-dgC5V/CVE9F1ORTjPWUWc/JVcWCEj/pb4eWpDV0WliY=";
};
patches = [ ];
}) // {
inherit version;
yarnHash = "sha256-qoLesubmSvRsXhKwMEWHHXcpcqRszqcdZgHQqnTpNPE=";
};
};
pkg-mastodon = pkg-base.overrideAttrs (_: { pkg-mastodon = pkg-base.overrideAttrs (_: {
mastodonModules = pkgs.mastodon.mastodonModules.overrideAttrs (oldMods: mastodonModules = pkgs.mastodon.mastodonModules.overrideAttrs (oldMods: