philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #104634 from ryantm/rage 

rage: 0.4.0 -> 0.5.0
gstqt5
Ryan Mulligan 2020-11-22 14:14:06 -08:00 committed by GitHub
parent f3bbd12c1b 31c770d065
commit e87f0c33df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/security/rage/default.nix
View File

@ -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 ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };