diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix deleted file mode 100644 index abeb83c9271c..000000000000 --- a/pkgs/applications/printing/pappl/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, avahi -, cups -, gnutls -, libjpeg -, libpng -, libusb1 -, pkg-config -, withPAMSupport ? true, pam -, zlib -}: - -stdenv.mkDerivation rec { - pname = "pappl"; - version = "1.4.6"; - - src = fetchFromGitHub { - owner = "michaelrsweet"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-d7QD6Kz4tBVHGFPBYcvRSzW+EtsNgpfweFvCx3ovfWE="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - cups - libjpeg - libpng - libusb1 - zlib - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - # upstream mentions these are not needed for Mac - # see: https://github.com/michaelrsweet/pappl#requirements - avahi - gnutls - ] ++ lib.optionals withPAMSupport [ - pam - ]; - - # testing requires some networking - # doCheck = true; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/pappl-makeresheader --help - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "C-based framework/library for developing CUPS Printer Applications"; - mainProgram = "pappl-makeresheader"; - homepage = "https://github.com/michaelrsweet/pappl"; - license = licenses.asl20; - platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/pa/pappl/package.nix b/pkgs/by-name/pa/pappl/package.nix new file mode 100644 index 000000000000..2e9ecc8150ca --- /dev/null +++ b/pkgs/by-name/pa/pappl/package.nix @@ -0,0 +1,74 @@ +{ + lib, + stdenv, + fetchFromGitHub, + avahi, + cups, + gnutls, + libjpeg, + libpng, + libusb1, + pkg-config, + withPAMSupport ? true, + pam, + zlib, +}: + +stdenv.mkDerivation rec { + pname = "pappl"; + version = "1.4.7"; + + src = fetchFromGitHub { + owner = "michaelrsweet"; + repo = "pappl"; + rev = "refs/tags/v${version}"; + hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; + }; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + cups + libjpeg + libpng + libusb1 + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # upstream mentions these are not needed for Mac + # see: https://github.com/michaelrsweet/pappl#requirements + avahi + gnutls + ] + ++ lib.optionals withPAMSupport [ + pam + ]; + + # testing requires some networking + # doCheck = true; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/pappl-makeresheader --help + ''; + + enableParallelBuilding = true; + + meta = { + description = "C-based framework/library for developing CUPS Printer Applications"; + changelog = "https://github.com/michaelrsweet/pappl/blob/v${version}/CHANGES.md"; + mainProgram = "pappl-makeresheader"; + homepage = "https://github.com/michaelrsweet/pappl"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; # should also work for darwin, but requires additional work + maintainers = [ lib.maintainers.NotAShelf ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfc..5043f7151a73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10956,8 +10956,6 @@ with pkgs; papertrail = callPackage ../tools/text/papertrail { }; - pappl = callPackage ../applications/printing/pappl { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { };