Unverified Commit 97f8e4ee authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

akkoma-*: migrate to pkgs/by-name (#389844)

parents 331a960d 28228df5
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -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,12 +520,12 @@ in {
        type = with types; attrsOf (submodule frontend);
        default = {
          primary = {
            package = pkgs.akkoma-frontends.akkoma-fe;
            package = pkgs.akkoma-fe;
            name = "akkoma-fe";
            ref = "stable";
          };
          admin = {
            package = pkgs.akkoma-frontends.admin-fe;
            package = pkgs.akkoma-admin-fe;
            name = "admin-fe";
            ref = "stable";
          };
@@ -533,12 +533,12 @@ in {
        defaultText = literalExpression ''
          {
            primary = {
              package = pkgs.akkoma-frontends.akkoma-fe;
              package = pkgs.akkoma-fe;
              name = "akkoma-fe";
              ref = "stable";
            };
            admin = {
              package = pkgs.akkoma-frontends.admin-fe;
              package = pkgs.akkoma-admin-fe;
              name = "admin-fe";
              ref = "stable";
            };
@@ -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" '''

            ''';
+1 −1
Original line number Diff line number Diff line
@@ -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";
+1 −0
Original line number Diff line number Diff line
@@ -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;
Loading