From 6c87c725e2c94278a1fdd1b3773deb4dd3dc19cb Mon Sep 17 00:00:00 2001
From: Blake Smith <blakesmith0@gmail.com>
Date: Sat, 16 Apr 2022 23:10:58 -0500
Subject: firectl: 0.1.0 -> 0.1.0-unstable-2022-03-01

The latest version of nixpkgs.firecracker (1.0.0) is incompatible
with version 0.1.0 of firectl. Must use latest HEAD in upstream
to pick up breaking changes in the API. See:
https://github.com/firecracker-microvm/firectl/issues/82
---
 pkgs/applications/virtualization/firectl/default.nix | 12 ++++++------
 pkgs/applications/virtualization/firectl/gomod.patch | 15 ---------------
 2 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/firectl/gomod.patch

(limited to 'pkgs/applications')

diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix
index ac531b36dd2..458e2ffc7e5 100644
--- a/pkgs/applications/virtualization/firectl/default.nix
+++ b/pkgs/applications/virtualization/firectl/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "firectl";
-  version = "0.1.0";
-
-  patches = [ ./gomod.patch ];
+  # The latest upstream 0.1.0 is incompatible with firecracker
+  # v0.1.0. See issue: https://github.com/firecracker-microvm/firectl/issues/82
+  version = "unstable-2022-03-01";
 
   src = fetchFromGitHub {
     owner = "firecracker-microvm";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "1ni3yx4rjhrkqk2038c6hkb2jwsdj2llx233wd5wgpvb6c57652p";
+    rev = "9f1b639a446e8d75f31787a00b9f273c1e68f12c";
+    sha256 = "TjzzHY9VYPpWoPt6nHYUerKX94O03sm524wGM9lGzno=";
   };
 
-  vendorSha256 = "1xbpck1gvzl75xgrajf5yzl199l4f2f6j3mac5586i7b00b9jxqj";
+  vendorSha256 = "3SVEvvGNx6ienyJZg0EOofHNHCPSpJUGXwHxokdRG1c=";
 
   doCheck = false;
 
diff --git a/pkgs/applications/virtualization/firectl/gomod.patch b/pkgs/applications/virtualization/firectl/gomod.patch
deleted file mode 100644
index 96c65e72822..00000000000
--- a/pkgs/applications/virtualization/firectl/gomod.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 1044001..7bafeda 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,7 +1,10 @@
- module github.com/firecracker-microvm/firectl
- 
-+go 1.14
-+
- require (
- 	github.com/firecracker-microvm/firecracker-go-sdk v0.15.1
-+	github.com/go-openapi/strfmt v0.17.1
- 	github.com/jessevdk/go-flags v1.4.0
- 	github.com/pkg/errors v0.8.0
- 	github.com/sirupsen/logrus v1.1.1
-- 
cgit 1.4.1