From 87605312c52c09dc53a67a3c3d15f543614db85c Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:16:37 +0100 Subject: [PATCH 1/8] akkoma: provide changelog --- pkgs/servers/akkoma/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index fbc2ea15d890..c2d6995049e0 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -77,6 +77,7 @@ beamPackages.mixRelease rec { meta = { description = "ActivityPub microblogging server"; homepage = "https://akkoma.social"; + changelog = "https://akkoma.dev/AkkomaGang/akkoma/releases/tag/v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ mvs ]; platforms = lib.platforms.unix; From aa7d01a8e00d6cb316c74ac8e93482414882660a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:43:53 +0100 Subject: [PATCH 2/8] akkoma: migrate to pkgs/by-name --- pkgs/{servers => by-name/ak}/akkoma/mime.exs | 0 .../akkoma/default.nix => by-name/ak/akkoma/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers => by-name/ak}/akkoma/mime.exs (100%) rename pkgs/{servers/akkoma/default.nix => by-name/ak/akkoma/package.nix} (100%) diff --git a/pkgs/servers/akkoma/mime.exs b/pkgs/by-name/ak/akkoma/mime.exs similarity index 100% rename from pkgs/servers/akkoma/mime.exs rename to pkgs/by-name/ak/akkoma/mime.exs diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/by-name/ak/akkoma/package.nix similarity index 100% rename from pkgs/servers/akkoma/default.nix rename to pkgs/by-name/ak/akkoma/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7950345c2af..79b47517fb71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -922,7 +922,7 @@ with pkgs; type = "OPN"; }; - akkoma = callPackage ../servers/akkoma { + akkoma = callPackage ../by-name/ak/akkoma/package.nix { beamPackages = beam_nox.packages.erlang_26.extend (self: super: { elixir = self.elixir_1_16; rebar3 = self.rebar3WithPlugins { From 30cbef7dc9d89656a96c48a55442c764b1761dd6 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:48:19 +0100 Subject: [PATCH 3/8] akkoma-fe: migrate to pkgs/by-name --- nixos/modules/services/web-apps/akkoma.nix | 6 +++--- .../default.nix => by-name/ak/akkoma-fe/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) rename pkgs/{servers/akkoma/akkoma-fe/default.nix => by-name/ak/akkoma-fe/package.nix} (100%) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 1b7cc0fa54c9..13a76542ea09 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -95,7 +95,7 @@ let package = mkOption { type = types.package; description = "Akkoma frontend package."; - example = literalExpression "pkgs.akkoma-frontends.akkoma-fe"; + example = literalExpression "pkgs.akkoma-fe"; }; name = mkOption { @@ -520,7 +520,7 @@ in { type = with types; attrsOf (submodule frontend); default = { primary = { - package = pkgs.akkoma-frontends.akkoma-fe; + package = pkgs.akkoma-fe; name = "akkoma-fe"; ref = "stable"; }; @@ -533,7 +533,7 @@ in { defaultText = literalExpression '' { primary = { - package = pkgs.akkoma-frontends.akkoma-fe; + package = pkgs.akkoma-fe; name = "akkoma-fe"; ref = "stable"; }; diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/by-name/ak/akkoma-fe/package.nix similarity index 100% rename from pkgs/servers/akkoma/akkoma-fe/default.nix rename to pkgs/by-name/ak/akkoma-fe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79b47517fb71..863a3d570770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -931,7 +931,6 @@ with pkgs; }); }; akkoma-frontends = recurseIntoAttrs { - akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; admin-fe = callPackage ../servers/akkoma/admin-fe { nodejs = nodejs_18; yarn = yarn.override { nodejs = nodejs_18; }; From 4c17535c7be6c0e52e3918fce5c714d93bef4f5d Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:52:45 +0100 Subject: [PATCH 4/8] akkoma-frontends.admin-fe: rename to akkoma-admin-fe & migrate to pkgs/by-name --- nixos/modules/services/web-apps/akkoma.nix | 4 ++-- .../ak/akkoma-admin-fe/package.nix} | 0 pkgs/top-level/all-packages.nix | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/{servers/akkoma/admin-fe/default.nix => by-name/ak/akkoma-admin-fe/package.nix} (100%) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 13a76542ea09..1529d63dde57 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -525,7 +525,7 @@ in { ref = "stable"; }; admin = { - package = pkgs.akkoma-frontends.admin-fe; + package = pkgs.akkoma-admin-fe; name = "admin-fe"; ref = "stable"; }; @@ -538,7 +538,7 @@ in { ref = "stable"; }; admin = { - package = pkgs.akkoma-frontends.admin-fe; + package = pkgs.akkoma-admin-fe; name = "admin-fe"; ref = "stable"; }; diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix similarity index 100% rename from pkgs/servers/akkoma/admin-fe/default.nix rename to pkgs/by-name/ak/akkoma-admin-fe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 863a3d570770..5c9019ef7e83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -930,13 +930,13 @@ with pkgs; }; }); }; - akkoma-frontends = recurseIntoAttrs { - admin-fe = callPackage ../servers/akkoma/admin-fe { - nodejs = nodejs_18; - yarn = yarn.override { nodejs = nodejs_18; }; - python3 = python311; - }; + + akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix { + nodejs = nodejs_18; + yarn = yarn.override { nodejs = nodejs_18; }; + python3 = python311; }; + akkoma-emoji = recurseIntoAttrs { blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { }; }; From 0c7fe139f1a6e6f6388d6b9a159e97b3fa378655 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 14:56:32 +0100 Subject: [PATCH 5/8] akkoma-admin-fe: remove unnecessary Node.js version pin --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c9019ef7e83..1b2e2f135c14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -932,8 +932,6 @@ with pkgs; }; akkoma-admin-fe = callPackage ../by-name/ak/akkoma-admin-fe/package.nix { - nodejs = nodejs_18; - yarn = yarn.override { nodejs = nodejs_18; }; python3 = python311; }; From c60031fed775e51ad0b0062d08960b44b695cc9a Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 15:03:10 +0100 Subject: [PATCH 6/8] akkoma-admin-fe: change version to conventional format --- pkgs/by-name/ak/akkoma-admin-fe/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ak/akkoma-admin-fe/package.nix b/pkgs/by-name/ak/akkoma-admin-fe/package.nix index 7faac39ee53e..9bfbd2295f16 100644 --- a/pkgs/by-name/ak/akkoma-admin-fe/package.nix +++ b/pkgs/by-name/ak/akkoma-admin-fe/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "admin-fe"; - version = "unstable-2024-04-27"; + version = "2.3.0-2-unstable-2024-04-27"; src = fetchFromGitea { domain = "akkoma.dev"; From 6a55cc63f3abdf4c1e3cebf0842607dcc9a7f177 Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 15:13:10 +0100 Subject: [PATCH 7/8] =?UTF-8?q?akkoma-emoji.blobs=5Fgg:=20move=20to=20top?= =?UTF-8?q?=E2=80=90level=20&=20migrate=20to=20pkgs/by-name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/modules/services/web-apps/akkoma.nix | 2 +- .../emoji/blobs_gg.nix => by-name/bl/blobs_gg/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 1 insertion(+), 5 deletions(-) rename pkgs/{servers/akkoma/emoji/blobs_gg.nix => by-name/bl/blobs_gg/package.nix} (100%) diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix index 1529d63dde57..9df89c65a3cf 100644 --- a/nixos/modules/services/web-apps/akkoma.nix +++ b/nixos/modules/services/web-apps/akkoma.nix @@ -557,7 +557,7 @@ in { default = null; example = literalExpression '' { - "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg; + "emoji/blobs.gg" = pkgs.blobs_gg; "static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" ''' … '''; diff --git a/pkgs/servers/akkoma/emoji/blobs_gg.nix b/pkgs/by-name/bl/blobs_gg/package.nix similarity index 100% rename from pkgs/servers/akkoma/emoji/blobs_gg.nix rename to pkgs/by-name/bl/blobs_gg/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b2e2f135c14..2d697bdfc630 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -935,10 +935,6 @@ with pkgs; python3 = python311; }; - akkoma-emoji = recurseIntoAttrs { - blobs_gg = callPackage ../servers/akkoma/emoji/blobs_gg.nix { }; - }; - aegisub = callPackage ../by-name/ae/aegisub/package.nix ({ luajit = luajit.override { enable52Compat = true; }; } // (config.aegisub or {})); From 28228df54de2893793653a680d324bf8e47df05c Mon Sep 17 00:00:00 2001 From: Mikael Voss Date: Fri, 14 Mar 2025 15:29:07 +0100 Subject: [PATCH 8/8] akkoma-{emoji,frontends}: provide package aliases --- pkgs/top-level/aliases.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 292a40eb0f2a..e9aab7b7b809 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -148,6 +148,13 @@ mapAliases { afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12 + akkoma-emoji = recurseIntoAttrs { + blobs_gg = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14 + }; + akkoma-frontends = recurseIntoAttrs { + admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14 + akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14 + }; alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25 alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17 alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17