From ca0e288de3d4128f3af24da0e0d7b7b9127685c2 Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Thu, 2 Jun 2022 18:14:30 +0000
Subject: [PATCH] runitor: 0.9.2 -> 0.10.0

- New version
- Requires Go 1.18
- Remove `-w` from the ldflags as it's implied by `-s`
- Pull in timeout retry test fix as a patch and re-enable tests
---
 pkgs/tools/system/runitor/default.nix | 23 +++++++++++------------
 pkgs/top-level/all-packages.nix       |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix
index 5bb821afdaf1..965813f6e371 100644
--- a/pkgs/tools/system/runitor/default.nix
+++ b/pkgs/tools/system/runitor/default.nix
@@ -1,29 +1,28 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, runitor }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch, testers, runitor }:
 
 buildGoModule rec {
   pname = "runitor";
-  version = "0.9.2";
+  version = "0.10.0";
   vendorSha256 = null;
 
   src = fetchFromGitHub {
     owner = "bdd";
     repo = "runitor";
     rev = "v${version}";
-    sha256 = "sha256-LuCxn4j0MlnJjSh3d18YNzNrtbqtMPxgkZttqKUGJd4";
+    sha256 = "sha256-96WKMeRkkG6en9JXaZjjnqeZOcLSII3knx8cdjTBAKw=";
   };
 
   ldflags = [
-    "-s" "-w" "-X main.Version=v${version}"
+    "-s" "-X main.Version=v${version}"
   ];
 
-  # TODO(cole-h):
-  # End-to-end tests requiring localhost networking currently under
-  # OfBorg's Linux builders, while passing under Darwin.
-  #
-  # Ref: https://github.com/NixOS/nixpkgs/pull/170566#issuecomment-1114034891
-  #
-  # Temporarily disable tests.
-  doCheck = false;
+  patches = [
+    (fetchpatch {
+      name = "backport_TestPostRetries-timeout-fix.patch";
+      url = "https://github.com/bdd/runitor/commit/418142585a8387224825637cca3fe275d3c3d147.patch";
+      sha256 = "sha256-cl+KYoiHm2ioFuJVKokZkglIzL/NaEd5JNUuj4g8MUg=";
+    })
+  ];
 
   passthru.tests.version = testers.testVersion {
     package = runitor;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d43c24a7fdad..42910b888c20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34541,7 +34541,7 @@ with pkgs;
 
   runit = callPackage ../tools/system/runit { };
 
-  runitor = callPackage ../tools/system/runitor { };
+  runitor = callPackage ../tools/system/runitor { buildGoModule = buildGo118Module; };
 
   refind = callPackage ../tools/bootloaders/refind { };