diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-01 00:00:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-01 00:00:01 +0200 |
| commit | abf56a5bd44c73895e369845f7a069ffabe287cb (patch) | |
| tree | 01b1ed16b5e11b2cc8de221446907bc3bfd394a3 /pkgs/tools | |
| parent | e29329970ef7744bd99d191b5623f2cd88b32fee (diff) | |
| parent | b693ed6219e0d326c7333acb5793c68fdcf3249c (diff) | |
| download | nixpkgs-abf56a5bd44c73895e369845f7a069ffabe287cb.tar nixpkgs-abf56a5bd44c73895e369845f7a069ffabe287cb.tar.gz nixpkgs-abf56a5bd44c73895e369845f7a069ffabe287cb.tar.bz2 nixpkgs-abf56a5bd44c73895e369845f7a069ffabe287cb.tar.lz nixpkgs-abf56a5bd44c73895e369845f7a069ffabe287cb.tar.xz nixpkgs-abf56a5bd44c73895e369845f7a069ffabe287cb.tar.zst nixpkgs-abf56a5bd44c73895e369845f7a069ffabe287cb.zip | |
Merge pull request #258185 from gaelreyrol/biscuit-cli-upgrade-0.4.1
biscuit-cli: 0.4.0 -> 0.4.1
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/biscuit-cli/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/security/biscuit-cli/version-0.4.0.patch | 13 |
2 files changed, 3 insertions, 20 deletions
diff --git a/pkgs/tools/security/biscuit-cli/default.nix b/pkgs/tools/security/biscuit-cli/default.nix index d7150ff353f..74dac8b5658 100644 --- a/pkgs/tools/security/biscuit-cli/default.nix +++ b/pkgs/tools/security/biscuit-cli/default.nix @@ -8,20 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "biscuit-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "biscuit-auth"; repo = "biscuit-cli"; rev = version; - sha256 = "sha256-Fd5wBvQe7S/UZ42FMlU+f9qTwcLIMnQrCWVRoHxOx64="; + sha256 = "sha256-Mvrv3BU0Pw85fs8IbjMKSQLIhtU6SKoLC0cuGdhfAYs="; }; - 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 ]; + cargoHash = "sha256-tgmM0rswIFrpFyupaASTXYvIyhVu0fXJJN+hg0p+vrQ="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/security/biscuit-cli/version-0.4.0.patch b/pkgs/tools/security/biscuit-cli/version-0.4.0.patch deleted file mode 100644 index d2ed06f211c..00000000000 --- a/pkgs/tools/security/biscuit-cli/version-0.4.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -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, |