From 5209fd4a8974cfa93a52ecfbe0d03d5eaafe3ed3 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Wed, 19 Nov 2025 20:34:32 +0100 Subject: [PATCH] earthly: move to earthbuild --- .../ea/{earthly => earthbuild}/package.nix | 27 ++++++++++--------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) rename pkgs/by-name/ea/{earthly => earthbuild}/package.nix (59%) diff --git a/pkgs/by-name/ea/earthly/package.nix b/pkgs/by-name/ea/earthbuild/package.nix similarity index 59% rename from pkgs/by-name/ea/earthly/package.nix rename to pkgs/by-name/ea/earthbuild/package.nix index f941009299fc..cc40c0ee1916 100644 --- a/pkgs/by-name/ea/earthly/package.nix +++ b/pkgs/by-name/ea/earthbuild/package.nix @@ -4,21 +4,22 @@ fetchFromGitHub, stdenv, testers, - earthly, }: buildGoModule (finalAttrs: { - pname = "earthly"; - version = "0.8.16"; + pname = "earthbuild"; + version = "0.8.17"; src = fetchFromGitHub { - owner = "earthly"; - repo = "earthly"; + owner = "EarthBuild"; + repo = "earthbuild"; rev = "v${finalAttrs.version}"; - hash = "sha256-2+Ya5i6V2QDzHsYR+Ro14u0VWR3wrQJHZRXBatGC8BA="; + hash = "sha256-ATdNA9KjAXsxMiez3AF6TxK7OujNDABY8jB6hXeSNpc="; }; - vendorHash = "sha256-kEgg7zrT69X4yrsGtLyvnrGQ7+sXaEzdqd4Fz7rpFyg="; + vendorHash = "sha256-49FWzLHEbgwWOXT1uPshdY5risFHInA541Mfhu7v08A="; + + __structuredAttrs = true; subPackages = [ "cmd/earthly" "cmd/debugger" @@ -30,9 +31,8 @@ buildGoModule (finalAttrs: { "-s" "-w" "-X main.Version=v${finalAttrs.version}" - "-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${finalAttrs.version}" + "-X main.DefaultBuildkitdImage=docker.io/earthbuild/buildkitd:v${finalAttrs.version}" "-X main.GitSha=v${finalAttrs.version}" - "-X main.DefaultInstallationName=earthly" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" @@ -48,19 +48,22 @@ buildGoModule (finalAttrs: { postInstall = '' mv $out/bin/debugger $out/bin/earthly-debugger + ln -s $out/bin/earthly-debugger $out/bin/earth-debugger + ln -s $out/bin/earthly $out/bin/earth ''; passthru = { tests.version = testers.testVersion { - package = earthly; + package = finalAttrs.finalPackage; version = "v${finalAttrs.version}"; }; }; meta = { description = "Build automation for the container era"; - homepage = "https://earthly.dev/"; - changelog = "https://github.com/earthly/earthly/releases/tag/v${finalAttrs.version}"; + mainProgram = "earth"; + homepage = "https://earthbuild.dev/"; + changelog = "https://github.com/EarthBuild/earthbuild/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ zoedsoupe diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2f515b42732..0d5b1662c775 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -695,6 +695,7 @@ mapAliases { e17gtk = throw "'e17gtk' has been removed because it was archived upstream."; # Added 2026-01-15 e-search = throw "'e-search' has been removed due to outdated KF5 dependencies"; # Added 2026-05-01 eagle = throw "'eagle' has been removed because official support ends 2026-06-07. It depended on qt5 webengine, which was removed for its numerous security issues. For more details, see the autodesk announcement at https://www.autodesk.com/support/technical/article/caas/sfdcarticles/sfdcarticles/Autodesk-EAGLE-Announcement-Next-steps-and-FAQ.html"; # Added 2026-04-26 + earthly = warnAlias "'earthly' has been discontinued. It is replaced by a community fork 'earthbuild'" earthbuild; # Added 2025-11-19 eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27 easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17 ebpf-verifier = warnAlias "'ebpf-verifier' has been renamed to 'prevail'" prevail; # Added 2026-04-01