Merge pull request #286395 from marsam/update-rage

rage: 0.9.2 -> 0.10.0
This commit is contained in:
Mario Rodas 2024-02-05 18:52:55 -05:00 committed by GitHub
commit 7aeb86c1fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 17 deletions

View File

@ -3,47 +3,45 @@
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, installShellFiles , installShellFiles
, Foundation , darwin
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rage"; pname = "rage";
version = "0.9.2"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "str4d"; owner = "str4d";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hFuuwmwe0ti4Y8mSJyNqUIhZjFC6qtv6W5cwtNjPUFQ="; hash = "sha256-7PfNDFDuvQ9T3BeA15FuY1jAprGLsyglWXcNrZvtPAE=";
}; };
cargoHash = "sha256-1gtLWU6uiWzUfYy9y3pb2vcnUC3H+Mf9rglmqNd989M="; cargoHash = "sha256-5aLT0JfeFj0fZP/1sHXulCQtoquHYriapMdPtN+fxko=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
]; ];
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
Foundation darwin.apple_sdk.frameworks.Foundation
]; ];
# cargo test has an x86-only dependency # cargo test has an x86-only dependency
doCheck = stdenv.hostPlatform.isx86; doCheck = stdenv.hostPlatform.isx86;
postBuild = ''
cargo run --example generate-docs
cargo run --example generate-completions
'';
postInstall = '' postInstall = ''
installManPage target/manpages/* installManPage target/*/release/manpages/man1/*
installShellCompletion target/completions/*.{bash,fish,zsh} installShellCompletion \
--bash target/*/release/completions/*.bash \
--fish target/*/release/completions/*.fish \
--zsh target/*/release/completions/_*
''; '';
meta = with lib; { meta = with lib; {
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/raw/v${version}/rage/CHANGELOG.md"; changelog = "https://github.com/str4d/rage/blob/v${version}/rage/CHANGELOG.md";
license = with licenses; [ asl20 mit ]; # either at your option license = with licenses; [ asl20 mit ]; # either at your option
maintainers = with maintainers; [ marsam ryantm ]; maintainers = with maintainers; [ marsam ryantm ];
mainProgram = "rage"; mainProgram = "rage";

View File

@ -7750,10 +7750,6 @@ with pkgs;
inherit (pkgs.darwin.apple_sdk.libs) utmp; inherit (pkgs.darwin.apple_sdk.libs) utmp;
}; };
rage = callPackage ../tools/security/rage {
inherit (darwin.apple_sdk.frameworks) Foundation;
};
rar2fs = callPackage ../tools/filesystems/rar2fs { }; rar2fs = callPackage ../tools/filesystems/rar2fs { };
rocmPackages = rocmPackages_5; rocmPackages = rocmPackages_5;