Merge master into staging-next

2021-02-21 18:17:22 +00:00
parent cf22d5fee7 60450f6b8d
commit 93b17c1b4d
31 changed files with 716 additions and 645 deletions
@@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "jwt-cli";
-  version = "3.3.0";
+  version = "4.0.0";

  src = fetchFromGitHub {
    owner = "mike-engel";
    repo = pname;
    rev = version;
-    sha256 = "09zi55ffkhsckvqj84xnxn9bgfkrj9wnzqbh9hfsxzbk4xy7fc2h";
+    sha256 = "sha256-82Le0kdt/fnSQwsRRYHy4Jv9rsCPGf5dIWmoZE2cPxY=";
  };

-  cargoSha256 = "1k13pw202fr5mvd0ys39n3dxwcl3sd01j6izfb28k06b6pav3wc8";
+  cargoSha256 = "sha256-nk4nrsePiUirVPoOPehCOf5ZoGVj3jy7PnSZENnpcaM=";

  buildInputs = lib.optional stdenv.isDarwin Security;