From 42255e72642f8ad144ed47a1373a423523a7fd50 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 31 Jul 2023 10:26:01 +1200 Subject: [PATCH 1/2] maintainers: add jtbx --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b59117cebab8..d8641435a5b3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8259,6 +8259,12 @@ name = "John Soo"; githubId = 10039785; }; + jtbx = { + email = "jtbx@duck.com"; + name = "Jeremy Baxter"; + github = "jtbx"; + githubId = 92071952; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; From 9f6754b7ae4b30307133300e6975b9702f6763d3 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sat, 29 Jul 2023 19:51:12 +1200 Subject: [PATCH 2/2] farge: init at 1.0.9 Co-authored-by: Pol Dellaiera --- pkgs/tools/misc/farge/default.nix | 46 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/misc/farge/default.nix diff --git a/pkgs/tools/misc/farge/default.nix b/pkgs/tools/misc/farge/default.nix new file mode 100644 index 000000000000..6b4dcb64efcd --- /dev/null +++ b/pkgs/tools/misc/farge/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, bash +, bc +, feh +, grim +, imagemagick +, slurp +, wl-clipboard +, xcolor +, waylandSupport ? true +, x11Support ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "farge"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = "sdushantha"; + repo = "farge"; + rev = "2ff6669e2350644d4f0b1bd84526efe5eae3c302"; + hash = "sha256-vCMuFMGcI4D4EzbSsXeNGKNS6nBFkfTcAmSzb9UMArc="; + }; + + buildInputs = [ bash bc feh imagemagick ] + ++ lib.optionals waylandSupport [ grim slurp wl-clipboard ] + ++ lib.optionals x11Support [ xcolor ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -m755 farge $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "A tool that shows the color value of a given pixel on your screen"; + homepage = "https://github.com/sdushantha/farge"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jtbx ]; + mainProgram = "farge"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8843f7d8664c..364d205ee20f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7875,6 +7875,8 @@ with pkgs; faraday-cli = callPackage ../tools/security/faraday-cli { }; + farge = callPackage ../tools/misc/farge { }; + fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize { };