From 4fbffe0a9f092c5d10f8a5ee01c5e089e4a90265 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 28 Mar 2023 16:23:36 +0300 Subject: [PATCH] poppler: remove poppler_gi variant there's no need to have a separate attr for a gi poppler --- pkgs/applications/editors/setzer/default.nix | 4 ++-- pkgs/applications/misc/metadata-cleaner/default.nix | 4 ++-- pkgs/applications/misc/pdf-quench/default.nix | 2 +- pkgs/applications/misc/pdfarranger/default.nix | 4 ++-- .../office/paperwork/openpaperwork-gtk.nix | 2 +- .../office/paperwork/paperwork-backend.nix | 4 ++-- pkgs/applications/office/pympress/default.nix | 4 ++-- .../development/haskell-modules/hackage-packages.nix | 12 ++++++------ pkgs/development/libraries/poppler/default.nix | 9 +++++++-- pkgs/development/python-modules/mat2/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- pkgs/top-level/pkg-config/pkg-config-data.json | 2 +- 13 files changed, 29 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 193d7a0416d02..599fba169f9a4 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -11,7 +11,7 @@ , gobject-introspection , gtksourceview4 , gspell -, poppler_gi +, poppler , webkitgtk , librsvg }: @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtksourceview4 gspell - poppler_gi + poppler webkitgtk librsvg ]; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 8d88612b728b5..0a85dc2d4e8d9 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -12,7 +12,7 @@ , meson , ninja , pkg-config -, poppler_gi +, poppler , wrapGAppsHook4 }: @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { gtk4 libadwaita librsvg - poppler_gi + poppler ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 0245fadb171a7..9c7c12443d8eb 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication { buildInputs = with pkgs; [ gtk3 goocanvas2 - poppler_gi + poppler ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pypdf2 ]; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index b0268f9c18c28..4edb70217ea5d 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib , wrapGAppsHook, intltool -, python3Packages, gtk3, poppler_gi +, python3Packages, gtk3, poppler }: python3Packages.buildPythonApplication rec { @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ]); buildInputs = [ - gtk3 poppler_gi + gtk3 poppler ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index f1eb43dbdbc8f..b4269f8f14ba7 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow pygobject3 - pkgs.poppler_gi + pkgs.poppler pkgs.gtk3 pkgs.libhandy distro diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index c7ddfa09e234d..c41b3d36c44e9 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -18,7 +18,7 @@ , openpaperwork-gtk , psutil , gtk3 -, poppler_gi +, poppler , gettext , which , shared-mime-info @@ -64,7 +64,7 @@ buildPythonPackage rec { pyocr pypillowfight levenshtein - poppler_gi + poppler scikit-learn termcolor whoosh diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 1343f2e8d392c..4c8ac986d7e73 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -5,7 +5,7 @@ , gtk3 , gobject-introspection , libcanberra-gtk3 -, poppler_gi +, poppler , withGstreamer ? stdenv.isLinux , withVLC ? stdenv.isLinux }: @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gtk3 - poppler_gi + poppler ] ++ lib.optional withGstreamer libcanberra-gtk3; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8e0e8c6bb792c..59631a68afbcf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -114113,7 +114113,7 @@ self: { "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, poppler_gi, text, transformers + , haskell-gi-overloading, poppler, text, transformers }: mkDerivation { pname = "gi-poppler"; @@ -114126,10 +114126,10 @@ self: { base bytestring containers gi-cairo gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ poppler_gi ]; + libraryPkgconfigDepends = [ poppler ]; description = "Poppler bindings"; license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) poppler_gi;}; + }) {inherit (pkgs) poppler;}; "gi-rsvg" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -227333,7 +227333,7 @@ self: { "poppler" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango - , poppler_gi + , poppler }: mkDerivation { pname = "poppler"; @@ -227344,14 +227344,14 @@ self: { libraryHaskellDepends = [ array base bytestring cairo containers glib gtk mtl ]; - libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler_gi ]; + libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Poppler"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; - inherit (pkgs) pango; inherit (pkgs) poppler_gi;}; + inherit (pkgs) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index d99e5150678e2..878e3128e0470 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -22,9 +22,11 @@ , scribus , texlive , zlib +, gobject-introspection +, buildPackages , withData ? true, poppler_data , qt5Support ? false, qt6Support ? false, qtbase ? null -, introspectionSupport ? false, gobject-introspection ? null +, withIntrospection ? stdenv.hostPlatform.emulatorAvailable buildPackages && suffix == "glib" , utils ? false, nss ? null , minimal ? false , suffix ? "glib" @@ -61,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: rec { ninja pkg-config python3 + ] ++ lib.optionals withIntrospection [ + gobject-introspection ]; buildInputs = [ @@ -86,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: rec { nss ] ++ lib.optionals (qt5Support || qt6Support) [ qtbase - ] ++ lib.optionals introspectionSupport [ + ] ++ lib.optionals withIntrospection [ + # TODO: REMOVE gobject-introspection ]; diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 3737bea082432..45221d9aa3516 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , gobject-introspection , librsvg -, poppler_gi +, poppler , mutagen , pygobject3 , pycairo @@ -72,7 +72,7 @@ buildPythonPackage rec { buildInputs = [ gdk-pixbuf librsvg - poppler_gi + poppler ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fdf5872ea8c47..b0c5ed056a8fa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1263,6 +1263,7 @@ mapAliases ({ pond = throw "pond has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 powerdns = pdns; # Added 2022-03-28 + poppler_gi = poppler; # Added 2023-03-27 portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10 # postgresql diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85f80ef6d5893..c12aca3b3fe21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23089,10 +23089,6 @@ with pkgs; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; - poppler_gi = lowPrio (poppler.override { - introspectionSupport = true; - }); - poppler_min = poppler.override { # TODO: maybe reduce even more # this is currently only used by texlive.bin. minimal = true; diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json index 758986390b227..44419f3aeccd2 100644 --- a/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/pkgs/top-level/pkg-config/pkg-config-data.json @@ -760,7 +760,7 @@ }, "poppler-glib": { "attrPath": [ - "poppler_gi" + "poppler" ] }, "python": {