From 513349d0edd3d9cfcd1404a3ac372ab3131ac3f9 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 25 Sep 2025 08:41:05 -0400 Subject: [PATCH] forgejo: rename bin/gitea -> bin/forgejo --- doc/release-notes/rl-2511.section.md | 2 ++ nixos/tests/forgejo.nix | 4 ++-- pkgs/by-name/fo/forgejo/generic.nix | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 45485b53eda8..74d158a251c9 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -71,6 +71,8 @@ - `hiawata` has been removed, due to lack of active development upstream, lack of maintainership downstream and upcoming security issues. +- `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`. + - `cudaPackages.cudatoolkit-legacy-runfile` has been removed. - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible. diff --git a/nixos/tests/forgejo.nix b/nixos/tests/forgejo.nix index ae78b75dc7f8..cbf5df3f9060 100644 --- a/nixos/tests/forgejo.nix +++ b/nixos/tests/forgejo.nix @@ -176,7 +176,7 @@ let + "Please contact your site administrator.'" ) server.succeed( - "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea admin user create " + "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo forgejo admin user create " + "--username test --password totallysafe --email test@localhost --must-change-password=false'" ) @@ -223,7 +223,7 @@ let with subtest("Testing runner registration and action workflow"): server.succeed( - "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/forgejo/runner_token" + "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo forgejo actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/forgejo/runner_token" ) server.succeed("${serverSystem}/specialisation/runner/bin/switch-to-configuration test") server.wait_for_unit("gitea-runner-test.service") diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index dcb4019fbf8e..9893f9cb8bde 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -129,7 +129,7 @@ buildGoModule rec { [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; preInstall = '' - mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/gitea" + mv "$GOPATH/bin/forgejo.org" "$GOPATH/bin/forgejo" ''; postInstall = '' @@ -137,7 +137,7 @@ buildGoModule rec { cp -R ./{templates,options} ${frontend}/public $data mkdir -p $out cp -R ./options/locale $out/locale - wrapProgram $out/bin/gitea \ + wrapProgram $out/bin/forgejo \ --prefix PATH : ${ lib.makeBinPath [ bash @@ -202,6 +202,6 @@ buildGoModule rec { tebriel ]; broken = stdenv.hostPlatform.isDarwin; - mainProgram = "gitea"; + mainProgram = "forgejo"; }; }