diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 26ae27dff6b2..1e0164e10cf4 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,21 +1,21 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }: rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "1wwndzy4xxbar9r67z8g7pp0s1xsxk5xaarh4h6hc0kh411zglrq"; + sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc="; }; - cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6"; + cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postBuild = '' cargo run --example generate-docs @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability"; homepage = "https://github.com/str4d/rage"; changelog = "https://github.com/str4d/rage/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + license = with licenses; [ asl20 mit ]; # either at your option + maintainers = with maintainers; [ marsam ryantm ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f25a6df78ede..5a4e623d213d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,9 +3510,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - rage = callPackage ../tools/security/rage { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rage = callPackage ../tools/security/rage { }; rar2fs = callPackage ../tools/filesystems/rar2fs { };