Merge pull request #240564 from gaelreyrol/biscuit-cli-update-0.4.0

biscuit-cli: 0.2.0 -> 0.4.0

pkgs/tools/security/biscuit-cli/default.nix

@@ -1,25 +1,42 @@
-{ lib, fetchFromGitHub, rustPlatform }:
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, testers
+, nix-update-script
+, biscuit-cli
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "biscuit-cli";
-  version = "0.2.0-next-pre20230103";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "biscuit-auth";
     repo = "biscuit-cli";
-    rev = "0ecf1ec4c98a90b1bf3614558a029b47c57288df";
-    sha256 = "sha256-ADJWqx70IwuvCBeK9rb9WBIsD+oQROQSduSQ8Bu8mfk=";
+    rev = version;
+    sha256 = "sha256-Fd5wBvQe7S/UZ42FMlU+f9qTwcLIMnQrCWVRoHxOx64=";
   };
 
-  cargoLock = {
-    outputHashes."biscuit-auth-3.0.0-alpha4" = "sha256-4SzOupoD33D0KHZyVLriGzUHy9XXnWK1pbgqOjJH4PI=";
-    lockFile = ./Cargo.lock;
+  cargoHash = "sha256-SHRqdKRAHkWK/pEVFYo3d+r761K4j9BkTg2angQOubk=";
+
+  # Version option does not report the correct version
+  # https://github.com/biscuit-auth/biscuit-cli/issues/44
+  patches = [ ./version-0.4.0.patch ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      inherit version;
+      package = biscuit-cli;
+      command = "biscuit --version";
+    };
   };
 
-  meta = {
+  meta = with lib; {
     description = "CLI to generate and inspect biscuit tokens";
     homepage = "https://www.biscuitsec.org/";
-    maintainers = [ lib.maintainers.shlevy ];
-    license = lib.licenses.bsd3;
+    maintainers = with maintainers; [ shlevy gaelreyrol ];
+    license = licenses.bsd3;
+    mainProgram = "biscuit";
   };
 }

pkgs/tools/security/biscuit-cli/version-0.4.0.patch

@@ -0,0 +1,13 @@
+diff --git a/src/cli.rs b/src/cli.rs
+index f40cfc7..d587eeb 100644
+--- a/src/cli.rs
++++ b/src/cli.rs
+@@ -89,7 +89,7 @@ fn parse_param(kv: &str) -> Result<Param, std::io::Error> {
+ 
+ /// biscuit creation and inspection CLI. Run `biscuit --help` to see what's available.
+ #[derive(Parser)]
+-#[clap(version = "0.2.0", author = "Clément D. <clement@delafargue.name>")]
++#[clap(version = "0.4.0", author = "Clément D. <clement@delafargue.name>")]
+ pub struct Opts {
+     #[clap(subcommand)]
+     pub subcmd: SubCommand,