mirror of
https://github.com/ryantm/agenix.git
synced 2024-11-01 00:29:56 +03:00
Merge branch 'rien/master' fix suppory for aarch64
This commit is contained in:
commit
ddb81b8bda
2 changed files with 17 additions and 11 deletions
|
@ -1,6 +1,9 @@
|
||||||
{writeShellScriptBin, runtimeShell, pkgs} :
|
{writeShellScriptBin, runtimeShell, pkgs} :
|
||||||
let
|
let
|
||||||
rage = pkgs.callPackage ./rage.nix {};
|
# we need at least rage 0.5.0 to support ssh keys
|
||||||
|
rage = if pkgs.rage.version < "0.5.0"
|
||||||
|
then pkgs.callPackage ./rage.nix {}
|
||||||
|
else pkgs.rage;
|
||||||
ageBin = "${rage}/bin/rage";
|
ageBin = "${rage}/bin/rage";
|
||||||
in
|
in
|
||||||
writeShellScriptBin "agenix" ''
|
writeShellScriptBin "agenix" ''
|
||||||
|
|
|
@ -1,25 +1,28 @@
|
||||||
{stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }:
|
{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "rage";
|
pname = "rage";
|
||||||
version = "unstable-2020-09-05";
|
version = "0.5.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "str4d";
|
owner = "str4d";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "8368992e60cbedb2d6b725c3e25440e65d8544d1";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-ICcApZQrR4hGxo/RcFMktenE4dswAXA2/nJ5D++O2ig=";
|
sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-QwNtp7Hxsiads3bh8NRra25RdPbIdjp+pSWTllAvdmQ=";
|
cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [
|
buildInputs = with darwin; stdenv.lib.optionals stdenv.isDarwin [
|
||||||
darwin.Security
|
Security
|
||||||
darwin.apple_sdk.frameworks.Foundation
|
Foundation
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# cargo test has an x86-only dependency
|
||||||
|
doCheck = stdenv.hostPlatform.isx86;
|
||||||
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
cargo run --example generate-docs
|
cargo run --example generate-docs
|
||||||
cargo run --example generate-completions
|
cargo run --example generate-completions
|
||||||
|
@ -34,7 +37,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability";
|
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";
|
homepage = "https://github.com/str4d/rage";
|
||||||
changelog = "https://github.com/str4d/rage/releases/tag/v${version}";
|
changelog = "https://github.com/str4d/rage/releases/tag/v${version}";
|
||||||
license = licenses.asl20;
|
license = with licenses; [ asl20 mit ]; # either at your option
|
||||||
maintainers = [ maintainers.marsam ];
|
maintainers = with maintainers; [ marsam ryantm ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue