From f56f725f8c15710680b2b09e07289724b2580849 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 4 Feb 2024 04:20:00 +0000 Subject: rage: 0.9.2 -> 0.10.0 Diff: https://github.com/str4d/rage/compare/v0.9.2...v0.10.0 Changelog: https://github.com/str4d/rage/blob/v0.10.0/rage/CHANGELOG.md --- pkgs/tools/security/rage/default.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 44b67e96a1e0..edd9f335eded 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -8,16 +8,16 @@ 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 @@ -30,20 +30,18 @@ rustPlatform.buildRustPackage rec { # 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"; -- cgit 1.4.1 From 2a9e0d51195e69c7bcdd7bbf13703ae2c27c483e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 4 Feb 2024 04:20:00 +0000 Subject: rage: migrate to by-name --- pkgs/by-name/ra/rage/package.nix | 49 ++++++++++++++++++++++++++++++++++++ pkgs/tools/security/rage/default.nix | 49 ------------------------------------ pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 49 insertions(+), 53 deletions(-) create mode 100644 pkgs/by-name/ra/rage/package.nix delete mode 100644 pkgs/tools/security/rage/default.nix (limited to 'pkgs/tools') diff --git a/pkgs/by-name/ra/rage/package.nix b/pkgs/by-name/ra/rage/package.nix new file mode 100644 index 000000000000..bd3fb0a2ead0 --- /dev/null +++ b/pkgs/by-name/ra/rage/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, installShellFiles +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rage"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "str4d"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7PfNDFDuvQ9T3BeA15FuY1jAprGLsyglWXcNrZvtPAE="; + }; + + cargoHash = "sha256-5aLT0JfeFj0fZP/1sHXulCQtoquHYriapMdPtN+fxko="; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + # cargo test has an x86-only dependency + doCheck = stdenv.hostPlatform.isx86; + + postInstall = '' + 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/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/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix deleted file mode 100644 index edd9f335eded..000000000000 --- a/pkgs/tools/security/rage/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, installShellFiles -, Foundation -}: - -rustPlatform.buildRustPackage rec { - pname = "rage"; - version = "0.10.0"; - - src = fetchFromGitHub { - owner = "str4d"; - repo = pname; - rev = "v${version}"; - hash = "sha256-7PfNDFDuvQ9T3BeA15FuY1jAprGLsyglWXcNrZvtPAE="; - }; - - cargoHash = "sha256-5aLT0JfeFj0fZP/1sHXulCQtoquHYriapMdPtN+fxko="; - - nativeBuildInputs = [ - installShellFiles - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - Foundation - ]; - - # cargo test has an x86-only dependency - doCheck = stdenv.hostPlatform.isx86; - - postInstall = '' - 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/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 a6bfd4367986..98b68229f0c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7755,10 +7755,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; -- cgit 1.4.1