From 0e0d43445658106654f64807e2fc698d3a77c27f Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 4 Apr 2024 01:58:29 +0200 Subject: [PATCH 1/4] forgejo-runner: rename from forgejo-actions-runner This is to match the name upstream and other repositories use. See https://code.forgejo.org/forgejo/runner and https://repology.org/project/forgejo-runner/versions Furthermore, upstream calls the resulting binary `forgejo-runner` instead of `act_runner`. https://code.forgejo.org/forgejo/runner/src/tag/v3.3.0/Makefile#L2 We should probably copy this. --- .../default.nix => by-name/fo/forgejo-runner/package.nix} | 6 +++--- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{development/tools/continuous-integration/forgejo-actions-runner/default.nix => by-name/fo/forgejo-runner/package.nix} (90%) diff --git a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix b/pkgs/by-name/fo/forgejo-runner/package.nix similarity index 90% rename from pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix rename to pkgs/by-name/fo/forgejo-runner/package.nix index dc5ad3708a0e..8d50fd8541b7 100644 --- a/pkgs/development/tools/continuous-integration/forgejo-actions-runner/default.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -2,11 +2,11 @@ , buildGoModule , fetchFromGitea , testers -, forgejo-actions-runner +, forgejo-runner }: buildGoModule rec { - pname = "forgejo-actions-runner"; + pname = "forgejo-runner"; version = "3.3.0"; src = fetchFromGitea { @@ -28,7 +28,7 @@ buildGoModule rec { doCheck = false; # Test try to lookup code.forgejo.org. passthru.tests.version = testers.testVersion { - package = forgejo-actions-runner; + package = forgejo-runner; version = src.rev; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4dccb378bcf9..6b85d75ec185 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -355,6 +355,7 @@ mapAliases ({ flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 foldingathome = fahclient; # Added 2020-09-03 + forgejo-actions-runner = forgejo-runner; # Added 2024-04-04 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7d1fa296bb..be910185bdb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8484,8 +8484,6 @@ with pkgs; forgejo = callPackage ../applications/version-management/forgejo { }; - forgejo-actions-runner = callPackage ../development/tools/continuous-integration/forgejo-actions-runner { }; - gokart = callPackage ../development/tools/gokart { }; gl2ps = callPackage ../development/libraries/gl2ps { }; From 7c18b96700e6b350710647cefcce03a9bb209010 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 4 Apr 2024 02:04:30 +0200 Subject: [PATCH 2/4] forgejo-runner: add emilylange as maintainer --- pkgs/by-name/fo/forgejo-runner/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 8d50fd8541b7..7f772cd6554d 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -37,7 +37,7 @@ buildGoModule rec { homepage = "https://code.forgejo.org/forgejo/runner"; changelog = "https://gitea.com/gitea/act_runner/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ kranzes ]; + maintainers = with maintainers; [ kranzes emilylange ]; mainProgram = "act_runner"; }; } From a9da75cb7ffac76d4cb120982043d323f388613f Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 4 Apr 2024 02:04:47 +0200 Subject: [PATCH 3/4] forgejo-runner: fix `meta.changelog` --- pkgs/by-name/fo/forgejo-runner/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 7f772cd6554d..7672b2d9fb50 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -35,7 +35,7 @@ buildGoModule rec { meta = with lib; { description = "A runner for Forgejo based on act"; homepage = "https://code.forgejo.org/forgejo/runner"; - changelog = "https://gitea.com/gitea/act_runner/releases/tag/${src.rev}"; + changelog = "https://code.forgejo.org/forgejo/runner/src/tag/${src.rev}/RELEASE-NOTES.md"; license = licenses.mit; maintainers = with maintainers; [ kranzes emilylange ]; mainProgram = "act_runner"; From b821720d255122f34056b6c886d494629b61f625 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 4 Apr 2024 02:07:07 +0200 Subject: [PATCH 4/4] forgejo-runner: 3.3.0 -> 3.4.1 https://code.forgejo.org/forgejo/runner/releases/tag/v3.4.0 https://code.forgejo.org/forgejo/runner/releases/tag/v3.4.1 changelog: https://code.forgejo.org/forgejo/runner/src/tag/v3.4.1/RELEASE-NOTES.md diff: https://code.forgejo.org/forgejo/runner/compare/v3.3.0...v3.4.0 diff: https://code.forgejo.org/forgejo/runner/compare/v3.4.0...v3.4.1 --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 7672b2d9fb50..10914f4d637f 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "forgejo-runner"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-ZpsHytsIp+ZW4DI7X9MmI7nZRnXVHvx905YdZGS6WMY="; + hash = "sha256-c8heIHt+EJ6LnZT4/6TTWd7v85VRHjH72bdje12un4M="; }; - vendorHash = "sha256-5GnGXpMy1D7KpVAVroX07Vw5QKYYtwdIhQsk23WCLgc="; + vendorHash = "sha256-FCCQZdAYRtJR3DGQIEvUzv+1kqvxVTGkwJwZSohq28s="; ldflags = [ "-s"