From 7fa897d4a48bd3bafe75b9747ffeb6841e75b6bc Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Tue, 29 Sep 2020 19:24:36 -0400 Subject: [PATCH 1/2] maintainers: add berbiche --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2c6a06ff010..33e34fbab33 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9706,4 +9706,14 @@ fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; }]; }; + berbiche = { + name = "Nicolas Berbiche"; + email = "nicolas@normie.dev"; + github = "berbiche"; + githubId = 20448408; + keys = [{ + longkeyid = "rsa4096/0xB461292445C6E696"; + fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; + }]; + }; } From f4ede1e1ba06372797a4df9730203aad2b9cb7b4 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Wed, 30 Sep 2020 12:44:06 -0400 Subject: [PATCH 2/2] bottom: init at 0.4.7 Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com> --- pkgs/tools/system/bottom/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/system/bottom/default.nix diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix new file mode 100644 index 00000000000..498ab1136fa --- /dev/null +++ b/pkgs/tools/system/bottom/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "bottom"; + version = "0.4.7"; + + src = fetchFromGitHub { + owner = "ClementTsang"; + repo = pname; + rev = version; + sha256 = "rDcJ5XF7L13MKZ8/J4sYD+UqC+HkZvxRtDkY9IVLH50="; + }; + + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; + + cargoSha256 = "XeX6QM0a628mcaptNZkKAvDnGfW5tx+aWNBpMyjz44M="; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A cross-platform graphical process/system monitor with a customizable interface"; + homepage = "https://github.com/ClementTsang/bottom"; + license = licenses.mit; + maintainers = with maintainers; [ berbiche ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b627285e408..4f682e198bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28175,4 +28175,6 @@ in fac-build = callPackage ../development/tools/build-managers/fac {}; + bottom = callPackage ../tools/system/bottom {}; + }