From d3ef73e5f5c4e96e31e9ec12daf731d641e46272 Mon Sep 17 00:00:00 2001 From: Picnoir Date: Fri, 21 Nov 2025 18:20:20 +0100 Subject: [PATCH] pleroma: move package to by-name --- .../Revert-Config-Restrict-permissions-of-OTP-config.patch | 0 pkgs/{servers => by-name/pl}/pleroma/mix.nix | 0 .../pleroma/default.nix => by-name/pl/pleroma/package.nix} | 6 +++++- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{servers => by-name/pl}/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch (100%) rename pkgs/{servers => by-name/pl}/pleroma/mix.nix (100%) rename pkgs/{servers/pleroma/default.nix => by-name/pl/pleroma/package.nix} (97%) diff --git a/pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch b/pkgs/by-name/pl/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch similarity index 100% rename from pkgs/servers/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch rename to pkgs/by-name/pl/pleroma/Revert-Config-Restrict-permissions-of-OTP-config.patch diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/by-name/pl/pleroma/mix.nix similarity index 100% rename from pkgs/servers/pleroma/mix.nix rename to pkgs/by-name/pl/pleroma/mix.nix diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/by-name/pl/pleroma/package.nix similarity index 97% rename from pkgs/servers/pleroma/default.nix rename to pkgs/by-name/pl/pleroma/package.nix index f6aa5e00338f..cc163d36ed22 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/by-name/pl/pleroma/package.nix @@ -1,6 +1,7 @@ { + beam, + elixir_1_17, lib, - beamPackages, fetchFromGitHub, fetchFromGitLab, fetchHex, @@ -14,6 +15,9 @@ fetchpatch, }: +let + beamPackages = beam.packages.erlang_26.extend (self: super: { elixir = elixir_1_17; }); +in beamPackages.mixRelease rec { pname = "pleroma"; version = "2.9.1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fcc0bb27779..f502d38b9432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3797,10 +3797,6 @@ with pkgs; tautulli = python3Packages.callPackage ../servers/tautulli { }; - pleroma = callPackage ../servers/pleroma { - beamPackages = beam.packages.erlang_26.extend (self: super: { elixir = elixir_1_17; }); - }; - plfit = callPackage ../by-name/pl/plfit/package.nix { python = null; };