From a669f2a0e447db236e22ac19244ed03c276d0a42 Mon Sep 17 00:00:00 2001
From: Matheus de Souza Pessanha <matheus_pessanha2001@outlook.com>
Date: Sun, 2 May 2021 13:30:24 -0300
Subject: [PATCH 1/2] earthly: init at 0.5.11

Update pkgs/top-level/all-packages.nix; Added earthly

Do check tests

created personal handle in maintainers/maintainer-list.nix

preppended "debugger" and "shellrepeater" binaries with earthly-* to avoid collisions

fixed earthly package maintainer name
---
 maintainers/maintainer-list.nix            |  6 +++++
 pkgs/development/tools/earthly/default.nix | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/tools/earthly/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b8de823c9af..c11ef4d589d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11162,6 +11162,12 @@
     githubId = 26458780;
     name = "Matthew Croughan";
   };
+  mdsp = {
+    github = "Mdsp9070";
+    githubId = 44469426;
+    name = "Matheus de Souza Pessanha";
+    email = "matheus_pessanha_2001@outlook.com";
+  };
   ngerstle = {
     name = "Nicholas Gerstle";
     email = "ngerstle@gmail.com";
diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix
new file mode 100644
index 00000000000..58ca9107c54
--- /dev/null
+++ b/pkgs/development/tools/earthly/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "earthly";
+  version = "0.5.11";
+
+  src = fetchFromGitHub {
+    owner = "earthly";
+    repo = "earthly";
+    rev = "v${version}";
+    sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv";
+  };
+
+  vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k";
+
+  postInstall = ''
+    mv $out/bin/debugger $out/bin/earthly-debugger
+    mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater
+  '';
+
+  meta = with lib; {
+    description = "Build automation for the container era";
+    homepage = "https://earthly.dev/";
+    changelog = "https://github.com/earthly/earthly/releases/tag/v${version}";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ mdsp ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d0ae69db6d..d3910f4ed32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2374,6 +2374,8 @@ in
 
   dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
 
+  earthly = callPackage ../development/tools/earthly { }; 
+
   earlybird = callPackage ../tools/security/earlybird { };
 
   earlyoom = callPackage ../os-specific/linux/earlyoom { };

From ee6e39fdb81c2d1b4fc2d46e38964e31e443f3e8 Mon Sep 17 00:00:00 2001
From: Matheus de Souza Pessanha <matheus_pessanha2001@outlook.com>
Date: Mon, 10 May 2021 15:33:23 -0300
Subject: [PATCH 2/2] maintainers: add mdsp

removed non alphabetically sorted mdsp maintainer

remove trailing whitespace in pkgs/top-level/all-packages.nix:2377

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 maintainers/maintainer-list.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c11ef4d589d..2a9a48704b9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6306,6 +6306,12 @@
       fingerprint = "D709 03C8 0BE9 ACDC 14F0  3BFB 77BF E531 397E DE94";
     }];
   };
+  mdsp = {
+    github = "Mdsp9070";
+    githubId = 44469426;
+    name = "Matheus de Souza Pessanha";
+    email = "matheus_pessanha2001@outlook.com";
+  };
   meatcar = {
     email = "nixpkgs@denys.me";
     github = "meatcar";
@@ -11162,12 +11168,6 @@
     githubId = 26458780;
     name = "Matthew Croughan";
   };
-  mdsp = {
-    github = "Mdsp9070";
-    githubId = 44469426;
-    name = "Matheus de Souza Pessanha";
-    email = "matheus_pessanha_2001@outlook.com";
-  };
   ngerstle = {
     name = "Nicholas Gerstle";
     email = "ngerstle@gmail.com";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3910f4ed32..4c740dfd67d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2374,7 +2374,7 @@ in
 
   dyndnsc = callPackage ../applications/networking/dyndns/dyndnsc { };
 
-  earthly = callPackage ../development/tools/earthly { }; 
+  earthly = callPackage ../development/tools/earthly { };
 
   earlybird = callPackage ../tools/security/earlybird { };