git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #104634 from ryantm/rage

rage: 0.4.0 -> 0.5.0

commite87f0c33df2a13c537379520583b4042b81bc5a7 authorRyan Mulligan <ryan@ryantm.com> dateSun 22 Nov 2020, 14:14 (6 years ago) parentf3bbd1231c770d
2 files changed+8−10
pkgs/tools/security/rage/default.nix+7−7 pkgs/top-level/all-packages.nix+1−3
pkgs/tools/security/rage/default.nix+7−7
@@ -1,21 +1,21 @@
1−{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }:
1+{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "rage";
5− version = "0.4.0";
5+ version = "0.5.0";
66
77 src = fetchFromGitHub {
88 owner = "str4d";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "1wwndzy4xxbar9r67z8g7pp0s1xsxk5xaarh4h6hc0kh411zglrq";
11+ sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc=";
1212 };
1313
14− cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6";
14+ cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs=";
1515
1616 nativeBuildInputs = [ installShellFiles ];
1717
18− buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
18+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
1919
2020 postBuild = ''
2121 cargo run --example generate-docs
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
3131 description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
3232 homepage = "https://github.com/str4d/rage";
3333 changelog = "https://github.com/str4d/rage/releases/tag/v${version}";
34− license = licenses.asl20;
35− maintainers = [ maintainers.marsam ];
34+ license = with licenses; [ asl20 mit ]; # either at your option
35+ maintainers = with maintainers; [ marsam ryantm ];
3636 };
3737}
pkgs/top-level/all-packages.nix+1−3
@@ -3510,9 +3510,7 @@ in
35103510 inherit (darwin.apple_sdk.frameworks) Security;
35113511 };
35123512
3513− rage = callPackage ../tools/security/rage {
3514− inherit (darwin.apple_sdk.frameworks) Security;
3515− };
3513+ rage = callPackage ../tools/security/rage { };
35163514
35173515 rar2fs = callPackage ../tools/filesystems/rar2fs { };
35183516