From 64eb5ec86305e6547d5a7a37efda936584fbbafc Mon Sep 17 00:00:00 2001 From: 2gn <101851090+2gn@users.noreply.github.com> Date: Thu, 30 Jun 2022 22:34:17 +0900 Subject: [PATCH 1/2] maintainer: add myself --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8a177be26d7c..c780d0e9dfd4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -97,6 +97,12 @@ github = "1000teslas"; githubId = 47207223; }; + _2gn = { + name = "Hiram Tanner"; + email = "101851090+2gn@users.noreply.github.com"; + github = "2gn"; + githubId = 101851090; + }; _3699n = { email = "nicholas@nvk.pm"; github = "3699n"; From 47d35130e118eb160e967b505db9c3586e2be0cb Mon Sep 17 00:00:00 2001 From: 2gn <101851090+2gn@users.noreply.github.com> Date: Thu, 30 Jun 2022 22:34:58 +0900 Subject: [PATCH 2/2] pngloss: init at unstable-2020-11-25 --- pkgs/tools/graphics/pngloss/default.nix | 35 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/graphics/pngloss/default.nix diff --git a/pkgs/tools/graphics/pngloss/default.nix b/pkgs/tools/graphics/pngloss/default.nix new file mode 100644 index 000000000000..eafd77054e40 --- /dev/null +++ b/pkgs/tools/graphics/pngloss/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, zlib }: + +stdenv.mkDerivation rec { + pname = "pngloss"; + version = "unstable-2020-11-25"; + + src = fetchFromGitHub { + owner = "foobaz"; + repo = pname; + rev = "559f09437e1c797a1eaf08dfdcddd9b082f0e09c"; + sha256 = "sha256-dqrrzbLu4znyWOlTDIf56O3efxszetiP+CdFiy2PBd4="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libpng + zlib + ]; + + installPhase = '' + runHook preInstall + + install -D ./src/pngloss $out/bin/pngloss + + runHook postInstall + ''; + + meta = with lib; { + description = "Lossy compression of PNG images"; + homepage = "https://github.com/foobaz/pngloss"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ _2gn ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ed604e43d89..4ecebe7f5717 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9370,6 +9370,8 @@ with pkgs; p0f = callPackage ../tools/security/p0f { }; + pngloss = callPackage ../tools/graphics/pngloss { }; + pngout = callPackage ../tools/graphics/pngout { }; patch = gnupatch;