From 7ce1c176d073c81ffff1c3eac6c1976d0764fa18 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 28 Aug 2023 09:51:28 -0400 Subject: [PATCH] hoard: 1.3.1 -> 1.4.2 Diff: https://github.com/Hyde46/hoard/compare/v1.3.1...v1.4.2 --- pkgs/tools/misc/hoard/default.nix | 28 ++++++++++++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index f44787924d9..4bdf7b7127b 100644 --- a/pkgs/tools/misc/hoard/default.nix +++ b/pkgs/tools/misc/hoard/default.nix @@ -1,27 +1,39 @@ -{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "hoard"; - version = "1.3.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Hyde46"; - repo = pname; + repo = "hoard"; rev = "v${version}"; - sha256 = "sha256-Gm3X6/g5JQJEl7wRvWcO4j5XpROhtfRJ72LNaUeZRGc="; + hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E="; }; - buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin Security; + cargoHash = "sha256-4EeeD1ySR4M1i2aaKJP/BNSn+t1l8ingiv2ZImFFn1A="; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-ZNhUqnsme1rczl3FdFBGGs+vBDFcFEELkPp0/udTfR4="; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "CLI command organizer written in rust"; homepage = "https://github.com/hyde46/hoard"; + changelog = "https://github.com/Hyde46/hoard/blob/${src.rev}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ builditluc ]; + maintainers = with maintainers; [ builditluc figsoda ]; + mainProgram = "hoard"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63f600f3dd6..a34102a1842 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26603,7 +26603,7 @@ with pkgs; hiraeth = callPackage ../servers/hiraeth { }; - hoard = callPackage ../tools/misc/hoard { inherit (darwin) Security; }; + hoard = callPackage ../tools/misc/hoard { }; home-assistant = callPackage ../servers/home-assistant { };