From 0bc85c6eaa76490cff2815510c94605d04ce229e Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Mon, 21 Feb 2022 22:26:16 +0000 Subject: [PATCH 1/2] maintainers: add samw (cherry picked from commit 1f7bdfdc2075d23b8d69055307f8b77e489b3722) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a65074ca4de9..e0dfa3131a21 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11309,6 +11309,12 @@ githubId = 107703; name = "Samuel Rivas"; }; + samw = { + email = "sam@wlcx.cc"; + github = "wlcx"; + githubId = 3065381; + name = "Sam Willcocks"; + }; samyak = { name = "Samyak Sarnayak"; email = "samyak201@gmail.com"; From 2cabcacc41f7c7b911e403aa6e0c4d1c1dbe4744 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Mon, 21 Feb 2022 22:30:39 +0000 Subject: [PATCH 2/2] pngpaste: init at 0.2.3 (cherry picked from commit cbe518b29381638d07ac72c321a2ae1b328d8bfe) --- pkgs/os-specific/darwin/pngpaste/default.nix | 37 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/darwin/pngpaste/default.nix diff --git a/pkgs/os-specific/darwin/pngpaste/default.nix b/pkgs/os-specific/darwin/pngpaste/default.nix new file mode 100644 index 000000000000..99ae8048f7fd --- /dev/null +++ b/pkgs/os-specific/darwin/pngpaste/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, AppKit, Cocoa }: + +let + pname = "pngpaste"; + version = "0.2.3"; +in stdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "jcsalterego"; + repo = pname; + rev = version; + sha256 = "uvajxSelk1Wfd5is5kmT2fzDShlufBgC0PDCeabEOSE="; + }; + + buildInputs = [ AppKit Cocoa ]; + + installPhase = '' + mkdir -p $out/bin + cp pngpaste $out/bin + ''; + + meta = with lib; { + description = "Paste image files from clipboard to file on MacOS"; + longDescription = '' + Paste PNG into files on MacOS, much like pbpaste does for text. + Supported input formats are PNG, PDF, GIF, TIF, JPEG. + Supported output formats are PNG, GIF, JPEG, TIFF. Output + formats are determined by the provided filename extension, + falling back to PNG. + ''; + homepage = "https://github.com/jcsalterego/pngpaste"; + changelog = "https://github.com/jcsalterego/pngpaste/raw/${version}/CHANGELOG.md"; + platforms = platforms.darwin; + license = licenses.bsd2; + maintainers = with maintainers; [ samw ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61787449d62d..6c2d80ffbd0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9458,6 +9458,10 @@ with pkgs; libpng = libpng12; }; + pngpaste = callPackage ../os-specific/darwin/pngpaste { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; + pngtools = callPackage ../tools/graphics/pngtools { }; pngpp = callPackage ../development/libraries/png++ { };