From 082968923081a72a04db3adab29d8f55e5ef0a31 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:39:31 +0300 Subject: [PATCH 1/4] pappl: 1.4.6 -> 1.4.7 https://github.com/michaelrsweet/pappl/releases/tag/v1.4.7 --- pkgs/applications/printing/pappl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index abeb83c9271c..7655ce5d3de8 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pappl"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d7QD6Kz4tBVHGFPBYcvRSzW+EtsNgpfweFvCx3ovfWE="; + sha256 = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; outputs = [ "out" "dev" ]; From 91d64e1154010426cfce7d73de0ec099b5c47ac9 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:45:07 +0300 Subject: [PATCH 2/4] pappl: modernize derivation; add changelog --- pkgs/applications/printing/pappl/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 7655ce5d3de8..a9b778ab32ac 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "michaelrsweet"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; + repo = "pappl"; + rev = "refs/tagsv${version}"; + hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; outputs = [ "out" "dev" ]; @@ -52,12 +52,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + 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 = licenses.asl20; - platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; # should also work for darwin, but requires additional work + maintainers = [lib.maintainers.NotAShelf]; }; } From 740ad128e263394fba709b23685f723dd289a948 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:46:15 +0300 Subject: [PATCH 3/4] pappl: format via nixfmt --- pkgs/applications/printing/pappl/default.nix | 62 ++++++++++++-------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index a9b778ab32ac..54343e4e08c3 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv, fetchFromGitHub -, avahi -, cups -, gnutls -, libjpeg -, libpng -, libusb1 -, pkg-config -, withPAMSupport ? true, pam -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + avahi, + cups, + gnutls, + libjpeg, + libpng, + libusb1, + pkg-config, + withPAMSupport ? true, + pam, + zlib, }: stdenv.mkDerivation rec { @@ -21,26 +25,32 @@ stdenv.mkDerivation rec { hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; - outputs = [ "out" "dev" ]; + 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 - ]; + 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; @@ -59,6 +69,6 @@ stdenv.mkDerivation rec { 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]; + maintainers = [ lib.maintainers.NotAShelf ]; }; } From 4e8643ac1580f3ce6920233581454716fc30a365 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:47:51 +0300 Subject: [PATCH 4/4] pappl: migrate to by-name --- .../printing/pappl/default.nix => by-name/pa/pappl/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/printing/pappl/default.nix => by-name/pa/pappl/package.nix} (97%) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/by-name/pa/pappl/package.nix similarity index 97% rename from pkgs/applications/printing/pappl/default.nix rename to pkgs/by-name/pa/pappl/package.nix index 54343e4e08c3..2e9ecc8150ca 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/by-name/pa/pappl/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "michaelrsweet"; repo = "pappl"; - rev = "refs/tagsv${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d60050bd692d..ffc3a33f7a81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10962,8 +10962,6 @@ with pkgs; papertrail = callPackage ../tools/text/papertrail { }; - pappl = callPackage ../applications/printing/pappl { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { };