From a29912c701d863a6619e9c2b9547522fa6c2b161 Mon Sep 17 00:00:00 2001 From: dalance Date: Thu, 9 May 2019 02:00:59 +0900 Subject: [PATCH 1/2] maintainers: add dalance --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7654a1917ed..8bc92ff08d8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1100,6 +1100,11 @@ github = "cwoac"; name = "Oliver Matthews"; }; + dalance = { + email = "dalance@gmail.com"; + github = "dalance"; + name = "Naoya Hatta"; + }; DamienCassou = { email = "damien@cassou.me"; github = "DamienCassou"; From dd3b53ce79aad64c664be5d01caaaa8a7cfbcdd7 Mon Sep 17 00:00:00 2001 From: dalance Date: Thu, 9 May 2019 02:01:20 +0900 Subject: [PATCH 2/2] procs: init at 0.8.5 --- pkgs/tools/admin/procs/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/admin/procs/default.nix diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix new file mode 100644 index 00000000000..7c1e743a06e --- /dev/null +++ b/pkgs/tools/admin/procs/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "procs"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = pname; + rev = "v${version}"; + sha256 = "0ihww2sm9hnh748723lr1cxw9zyi9nfxbbiij5a465mypa2p7w0v"; + }; + + cargoSha256 = "1aq2nhspb9kp9mzj5550xph09qvd0ahlw246hcx2mqkr4frh64x0"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A modern replacement for ps written in Rust"; + homepage = "https://github.com/dalance/procs"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.dalance ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57ba1ab44dc..5ec511e4cee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1739,6 +1739,10 @@ in pyznap = python3Packages.callPackage ../tools/backup/pyznap {}; + procs = callPackage ../tools/admin/procs { + inherit (darwin.apple_sdk.frameworks) Security; + }; + scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { };