diff options
| author | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2022-04-22 19:08:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-22 19:08:33 +0200 |
| commit | a318a09a96a38382fe61a7f85d03ea6e25c46c56 (patch) | |
| tree | ead63d572d17a1216dbfca79892c436bfc829875 | |
| parent | Merge pull request #169701 from bobby285271/epiphany (diff) | |
| parent | firectl: 0.1.0 -> 0.1.0-unstable-2022-03-01 (diff) | |
| download | nixpkgs-a318a09a96a38382fe61a7f85d03ea6e25c46c56.tar.gz | |
Merge pull request #169827 from NixOS/backport-169054-to-release-21.11
[Backport release-21.11] firectl: 0.1.0 -> unstable-2022-03-01
| -rw-r--r-- | pkgs/applications/virtualization/firectl/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/firectl/gomod.patch | 15 |
2 files changed, 6 insertions, 21 deletions
diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index ac531b36dd21..458e2ffc7e5e 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 96c65e728221..000000000000 --- 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 |