Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

poppler: remove poppler_gi variant #223577

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from

Conversation

Artturin
Copy link
Member

there's no need to have a separate attr for a gi poppler

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@@ -114019,7 +114019,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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NixOS/haskell does this need some update in the tooling?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jtojnar
Copy link
Member

jtojnar commented Mar 28, 2023

Poppler actually consists of three (or four) different libraries: the native C++ API, GObject-based API and Qt-based API. gobject-introspection only really makes sense for the GObject API. Ideally, we would have packages that are non-overlapping.

there's no need to have a separate attr for a gi poppler
@Artturin
Copy link
Member Author

Artturin commented Apr 3, 2023

Added && suffix == "glib" to withIntrospection

pr to cabal2nix NixOS/cabal2nix#599

@Artturin Artturin marked this pull request as ready for review April 3, 2023 21:27
@@ -23089,10 +23089,6 @@ with pkgs;

poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should name this poppler-glib then.

@@ -86,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: rec {
nss
] ++ lib.optionals (qt5Support || qt6Support) [
qtbase
] ++ lib.optionals introspectionSupport [
] ++ lib.optionals withIntrospection [
# TODO: REMOVE
gobject-introspection
];

Copy link
Member

@jtojnar jtojnar Apr 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And change to only build GLIB in cmakeFlags when suffix is glib here.

@ofborg ofborg bot requested a review from jtojnar April 3, 2023 23:22
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 19, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: haskell 6.topic: python 8.has: clean-up 10.rebuild-darwin: 101-500 10.rebuild-linux: 101-500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants