Skip to content

zstd: set meta.pkgConfigModules#436445

Merged
roberth merged 1 commit intoNixOS:masterfrom
sternenseemann:zstd-pkg-config
Aug 27, 2025
Merged

zstd: set meta.pkgConfigModules#436445
roberth merged 1 commit intoNixOS:masterfrom
sternenseemann:zstd-pkg-config

Conversation

@sternenseemann
Copy link
Member

I've chosen to use zstd from the pkgs fix point for the pkg-config test instead of using finalAttrs.finalPackage because this is effectively also done for all the other tests (they test bindings from the pkgs fix point which get their zstd from the pkgs fix point).

This will fix this regression on haskell-updates (since buildInputs is built based on meta.pkgConfigModules (long story)).

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

I've chosen to use zstd from the pkgs fix point for the pkg-config test
instead of using finalAttrs.finalPackage because this is effectively
also done for all the other tests (they test bindings from the pkgs fix
point which get their zstd from the pkgs fix point).
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. labels Aug 24, 2025
@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 436445
Commit: 801fad36ce3d08cb1b8300e79e3a8d77270a6c3f


x86_64-linux

⏩ 15 packages marked as broken and skipped:
  • haskellPackages.ghcjs-dom-hello
  • haskellPackages.ghcjs-dom-hello.data
  • haskellPackages.ghcjs-dom-hello.doc
  • haskellPackages.gi-javascriptcore4
  • haskellPackages.gi-javascriptcore4.doc
  • haskellPackages.gi-webkit2
  • haskellPackages.gi-webkit2.doc
  • haskellPackages.jsaddle-hello
  • haskellPackages.jsaddle-hello.doc
  • haskellPackages.jsaddle-webkit2gtk
  • haskellPackages.jsaddle-webkit2gtk.doc
  • haskellPackages.reflex-dom
  • haskellPackages.reflex-dom.doc
  • haskellPackages.webkit2gtk3-javascriptcore
  • haskellPackages.webkit2gtk3-javascriptcore.doc
❌ 12 packages failed to build:
  • haskellPackages.gi-adwaita
  • haskellPackages.gi-adwaita.doc
  • haskellPackages.gi-gdk4
  • haskellPackages.gi-gdk4.doc
  • haskellPackages.gi-gdkx114
  • haskellPackages.gi-gdkx114.doc
  • haskellPackages.gi-gsk
  • haskellPackages.gi-gsk.doc
  • haskellPackages.gi-gtk4
  • haskellPackages.gi-gtk4.doc
  • haskellPackages.gi-gtksource5
  • haskellPackages.gi-gtksource5.doc
✅ 28 packages built:
  • haskellPackages.Allure
  • haskellPackages.Allure.doc
  • haskellPackages.LambdaHack
  • haskellPackages.LambdaHack.doc
  • haskellPackages.WidgetRattus
  • haskellPackages.WidgetRattus.doc
  • haskellPackages.gi-javascriptcore
  • haskellPackages.gi-javascriptcore6
  • haskellPackages.gi-javascriptcore6.doc
  • haskellPackages.libremidi
  • haskellPackages.libremidi.doc
  • haskellPackages.monomer
  • haskellPackages.monomer-hagrid
  • haskellPackages.monomer-hagrid.doc
  • haskellPackages.monomer.doc
  • haskellPackages.reflex-sdl2
  • haskellPackages.reflex-sdl2.doc
  • haskellPackages.sdl-try-drivers
  • haskellPackages.sdl-try-drivers.doc
  • haskellPackages.sdl2
  • haskellPackages.sdl2-cairo
  • haskellPackages.sdl2-cairo.doc
  • haskellPackages.sdl2-gfx
  • haskellPackages.sdl2-gfx.doc
  • haskellPackages.sdl2-ttf
  • haskellPackages.sdl2-ttf.doc
  • haskellPackages.sdl2.data
  • haskellPackages.sdl2.doc

Error logs: `x86_64-linux`
haskellPackages.gi-gdk4
Dependency gi-cairo >=1.0 && <1.1: using gi-cairo-1.0.30
Dependency gi-gdkpixbuf >=2.0 && <2.1: using gi-gdkpixbuf-2.0.32
Dependency gi-gio >=2.0 && <2.1: using gi-gio-2.0.38
Dependency gi-glib >=2.0 && <2.1: using gi-glib-2.0.30
Dependency gi-gobject >=2.0 && <2.1: using gi-gobject-2.0.31
Dependency gi-pango >=1.0 && <1.1: using gi-pango-1.0.30
Dependency haskell-gi >=0.26.14 && <0.27: using haskell-gi-0.26.16
Dependency haskell-gi-base >=0.26 && <0.27: using haskell-gi-base-0.26.9
Dependency haskell-gi-overloading <1.1: using haskell-gi-overloading-1.0
Dependency text >=1.0 && <3: using text-2.1.1
Dependency transformers >=0.4 && <1: using transformers-0.6.1.0
Dependency gtk4: using version 4.18.6
Error: Setup:
'/nix/store/kpm72cx1jysgxw485i2gj2dwwqrisxdk-pkg-config-wrapper-0.29.2/bin/pkg-config'
exited with an error:
Package libwebp was not found in the pkg-config search path.
Perhaps you should add the directory containing `libwebp.pc'
to the PKG_CONFIG_PATH environment variable
Package 'libwebp', required by 'libtiff-4', not found

Seems like this needs to be done for other deps, too, to actually make it build?

@sternenseemann
Copy link
Member Author

Seems like this needs to be done for other deps, too, to actually make it build?

Indeed, didn't actually try. Seems like these just show up one by one how wonderful.

@sternenseemann
Copy link
Member Author

@wolfgangwalther just needs #436468

python-zstd = python3Packages.zstd;
haskell-zstd = haskellPackages.zstd;
haskell-hs-zstd = haskellPackages.hs-zstd;
pkg-config = testers.hasPkgConfigModules { package = zstd; };
Copy link
Contributor

Choose a reason for hiding this comment

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

Same argument as in https://github.com/NixOS/nixpkgs/pull/436468/files#r2296679493, I think we should at least do the right thing for this test.

Copy link
Member

Choose a reason for hiding this comment

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

@roberth
Copy link
Member

roberth commented Aug 27, 2025

I've chosen to use zstd from the pkgs fix point for the pkg-config test instead of using finalAttrs.finalPackage because this is effectively also done for all the other tests (they test bindings from the pkgs fix point which get their zstd from the pkgs fix point).

These tests serve different roles. The reverse dependencies test the package set, whereas this should be a test for an intrinsic property of the package. If we can include overrides in the test, we should make it coherent like that.

I'll merge this to unblock you, but this isn't quite right yet.

@roberth roberth merged commit 5c004ab into NixOS:master Aug 27, 2025
31 of 33 checks passed
@sternenseemann sternenseemann deleted the zstd-pkg-config branch August 27, 2025 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants