kubernix: 0.2.0 -> 0.2.0-unstable-2021-11-16

Updates some dependencies to non-vulnerable versions.

(cherry picked from commit 384fda8e34)

pkgs/by-name/ku/kubernix/Cargo.toml.patch

@@ -0,0 +1,14 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 681e634..48cbc8e 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -19,7 +19,8 @@ path = "src/main.rs"
+ [dependencies]
+ anyhow = "1.0.43"
+ base64 = "0.13.0"
+-clap = { git = "https://github.com/clap-rs/clap", features = ["wrap_help"] }
++clap = { version = "= 3.0.0-beta.2", features = ["wrap_help"] }
++clap_derive = "= 3.0.0-beta.2"
+ console = "0.14.1"
+ crossbeam-channel = "0.5.1"
+ getset = "0.1.1"

pkgs/by-name/ku/kubernix/fix-compile-error.patch

@@ -0,0 +1,13 @@
+diff --git a/src/crio.rs b/src/crio.rs
+index 36bf40b..97d5e57 100644
+--- a/src/crio.rs
++++ b/src/crio.rs
+@@ -34,7 +34,7 @@ impl Display for CriSocket {
+ impl CriSocket {
+     pub fn new(path: PathBuf) -> Result<CriSocket> {
+         if path.display().to_string().len() > 100 {
+-            bail!("Socket path '{}' is too long")
++            bail!("Socket path '{}' is too long", path.display().to_string())
+         }
+         Ok(CriSocket(path))
+     }

pkgs/by-name/ku/kubernix/package.nix

@@ -6,22 +6,28 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubernix";
-  version = "0.2.0";
+  version = "0.2.0-unstable-2021-11-16";
 
   src = fetchFromGitHub {
     owner = "saschagrunert";
     repo = "kubernix";
-    rev = "v${version}";
+    rev = "630087e023e403d461c4bb8b1c9368b26a2c0744";
-    sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp";
+    sha256 = "sha256-IkfVpNxWOqQt/aXsN4iD9dkKKyOui3maKowVibuKbvM=";
   };
 
-  cargoLock = {
+  cargoLock.lockFile = ./Cargo.lock;
-    lockFile = ./Cargo.lock;
+
-    outputHashes = {
+  patches = [
-      "clap-3.0.0-beta.1" = "sha256-tErZmEiAF1v39AtgRUHoEmoYqXPWRDXBEkWUbH+fPyY=";
+    # Need a specific version of clap and clap_derive: fails with anything greater.
-      "clap_derive-0.3.0" = "sha256-VijH+XB4WeKYUsJH9h/ID8EGZ89R3oauYO8Yg331dPU=";
+    ./Cargo.toml.patch
-    };
+    # error: 1 positional argument in format string, but no arguments were given
-  };
+    ./fix-compile-error.patch
+  ];
+
+  postPatch = ''
+    cp ${./Cargo.lock} Cargo.lock
+  '';
+
   doCheck = false;
 
   meta = with lib; {