From c36517d632551adc6e0fc2d3fea90a9c6549875c Mon Sep 17 00:00:00 2001
From: Hyzual <hyzual@gmail.com>
Date: Sun, 2 May 2021 19:53:03 +0200
Subject: [PATCH 1/2] maintainers: add Joris Masson

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 60c6f093f3b2..4c6fcb02798d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4121,6 +4121,12 @@
     githubId = 12491746;
     name = "Masato Yonekawa";
   };
+  hyzual = {
+    email = "hyzual@gmail.com";
+    github = "Hyzual";
+    githubId = 2051507;
+    name = "Joris Masson";
+  };
   hzeller = {
     email = "h.zeller@acm.org";
     github = "hzeller";

From cad7a9793d9acbec0c102e948fd443140af91846 Mon Sep 17 00:00:00 2001
From: Hyzual <hyzual@gmail.com>
Date: Sun, 2 May 2021 19:53:38 +0200
Subject: [PATCH 2/2] goss: init at 0.3.16

Co-authored-by: j-k <dev@j-k.io>
---
 pkgs/tools/misc/goss/default.nix | 34 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/goss/default.nix

diff --git a/pkgs/tools/misc/goss/default.nix b/pkgs/tools/misc/goss/default.nix
new file mode 100644
index 000000000000..bbe947ecd120
--- /dev/null
+++ b/pkgs/tools/misc/goss/default.nix
@@ -0,0 +1,34 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "goss";
+  version = "0.3.16";
+
+  src = fetchFromGitHub {
+    owner = "aelsabbahy";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1m5w5vwmc9knvaihk61848rlq7qgdyylzpcwi64z84rkw8qdnj6p";
+  };
+
+  vendorSha256 = "1lyqjkwj8hybj5swyrv6357hs8sxmf4wim0c8yhfb9mv7fsxhrv7";
+
+  CGO_ENABLED = 0;
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version}")
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/aelsabbahy/goss/";
+    changelog = "https://github.com/aelsabbahy/goss/releases/tag/v${version}";
+    description = "Quick and easy server validation";
+    longDescription = ''
+      Goss is a YAML based serverspec alternative tool for validating a server’s configuration.
+      It eases the process of writing tests by allowing the user to generate tests from the current system state.
+      Once the test suite is written they can be executed, waited-on, or served as a health endpoint.
+    '';
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ hyzual jk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c22045dcac1..8efc8f0f584e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2634,6 +2634,8 @@ in
 
   godu = callPackage ../tools/misc/godu { };
 
+  goss = callPackage ../tools/misc/goss { };
+
   gosu = callPackage ../tools/misc/gosu { };
 
   gotify-cli = callPackage ../tools/misc/gotify-cli { };