diff options
-rw-r--r-- | pkgs/by-name/ra/rage/package.nix (renamed from pkgs/tools/security/rage/default.nix) | 24 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 11 insertions, 17 deletions
diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/by-name/ra/rage/package.nix index 44b67e96a1e0..bd3fb0a2ead0 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/by-name/ra/rage/package.nix @@ -3,47 +3,45 @@ , rustPlatform , fetchFromGitHub , installShellFiles -, Foundation +, darwin }: rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - hash = "sha256-hFuuwmwe0ti4Y8mSJyNqUIhZjFC6qtv6W5cwtNjPUFQ="; + hash = "sha256-7PfNDFDuvQ9T3BeA15FuY1jAprGLsyglWXcNrZvtPAE="; }; - cargoHash = "sha256-1gtLWU6uiWzUfYy9y3pb2vcnUC3H+Mf9rglmqNd989M="; + cargoHash = "sha256-5aLT0JfeFj0fZP/1sHXulCQtoquHYriapMdPtN+fxko="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ - Foundation + darwin.apple_sdk.frameworks.Foundation ]; # cargo test has an x86-only dependency doCheck = stdenv.hostPlatform.isx86; - postBuild = '' - cargo run --example generate-docs - cargo run --example generate-completions - ''; - postInstall = '' - installManPage target/manpages/* - installShellCompletion target/completions/*.{bash,fish,zsh} + installManPage target/*/release/manpages/man1/* + installShellCompletion \ + --bash target/*/release/completions/*.bash \ + --fish target/*/release/completions/*.fish \ + --zsh target/*/release/completions/_* ''; meta = with lib; { 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/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 maintainers = with maintainers; [ marsam ryantm ]; mainProgram = "rage"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 441a1439b1c1..ae1ddbfdd6f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7750,10 +7750,6 @@ with pkgs; inherit (pkgs.darwin.apple_sdk.libs) utmp; }; - rage = callPackage ../tools/security/rage { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - rar2fs = callPackage ../tools/filesystems/rar2fs { }; rocmPackages = rocmPackages_5; |