Commit 0b7130ef authored by dish's avatar dish
Browse files

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

License was changed to Apache 2.0, and no need for patches anymore
parent 749ad7a9
Loading
Loading
Loading
Loading
+0 −1131

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −14
Original line number Diff line number Diff line
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"
+0 −13
Original line number Diff line number Diff line
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))
     }
+8 −18
Original line number Diff line number Diff line
@@ -4,38 +4,28 @@
  rustPlatform,
}:

rustPlatform.buildRustPackage {
rustPlatform.buildRustPackage (finalAttrs: {
  pname = "kubernix";
  version = "0.2.0-unstable-2021-11-16";
  version = "0.3.1";

  src = fetchFromGitHub {
    owner = "saschagrunert";
    repo = "kubernix";
    rev = "630087e023e403d461c4bb8b1c9368b26a2c0744";
    sha256 = "sha256-IkfVpNxWOqQt/aXsN4iD9dkKKyOui3maKowVibuKbvM=";
    tag = "v${finalAttrs.version}";
    sha256 = "sha256-1cnh4h8rX6Uv/JlUy2uSpwgcjo2yTyTi+bHvWREZ7e0=";
  };

  cargoLock.lockFile = ./Cargo.lock;

  patches = [
    # Need a specific version of clap and clap_derive: fails with anything greater.
    ./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
  '';
  cargoHash = "sha256-7Pyj+sLvkEOIYt7UYcpsS65gjNHxXZQS1RRQDagCW8Y=";

  # Tests require network access
  doCheck = false;

  meta = {
    description = "Single dependency Kubernetes clusters for local testing, experimenting and development";
    mainProgram = "kubernix";
    homepage = "https://github.com/saschagrunert/kubernix";
    license = with lib.licenses; [ mit ];
    license = with lib.licenses; [ asl20 ];
    maintainers = with lib.maintainers; [ saschagrunert ];
    platforms = lib.platforms.linux;
  };
}
})