summaryrefslogtreecommitdiff
path: root/flora/services
diff options
context:
space:
mode:
Diffstat (limited to 'flora/services')
-rw-r--r--flora/services/akkoma.nix9
-rw-r--r--flora/services/blog.nix2
2 files changed, 10 insertions, 1 deletions
diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index efc693e..98cfb7b 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -6,6 +6,7 @@ let
inherit system;
overlays = [ (self: super: rec {
beamPackages = super.beam.packagesWith super.erlang_nox;
+ elixir = beamPackages.elixir_1_13;
}) ];
};
staticDir = "/var/lib/akkoma/static";
@@ -31,6 +32,14 @@ in
("${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/akkoma.nix")
];
+ # the pleroma_ctl wrapper uses pkgs.elixir, which without this is not the same
+ # as akkoma's elixir
+ nixpkgs.overlays = [
+ (self: super: {
+ elixir = unstable.beamPackages.elixir_1_13;
+ })
+ ];
+
system.stateVersion = "22.11";
services.akkoma = {
diff --git a/flora/services/blog.nix b/flora/services/blog.nix
index e78152f..e8335b1 100644
--- a/flora/services/blog.nix
+++ b/flora/services/blog.nix
@@ -4,7 +4,7 @@ let
lux = pkgs.stdenv.mkDerivation {
name = "gtfs-mdbooks";
src = pkgs.fetchgit {
- url = "https://stuebinm.eu/git/lux";
+ url = "https://stuebinm.eu/git/forks/lux";
rev = "refs/heads/master";
sha256 = "sha256-L2y5SEGOaoWl+jQGP3TmpQQLojjkRAjiRjbwhGKOg14=";
};