WIP p11-kit: use meson #73341

FRidh · 2019-11-13T13:21:05Z

Motivation for this change

Things done

Notify maintainers

cc @

FRidh · 2019-11-13T13:25:41Z

pkgs/development/libraries/p11-kit/default.nix

-
-  configureFlags = [
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"


there does not appear to be a meson option for this one

FRidh · 2019-11-13T13:26:49Z

While I like using meson, I have one worry though with these migrations. Because meson is needed it pushes the requirement on Python and packages such as setuptools increasingly lower in our dependency tree.

jtojnar · 2019-11-13T16:01:04Z

pkgs/development/libraries/p11-kit/default.nix

-    "--without-trust-paths"
+  mesonFlags = [
+    "-Dsystem_config=${placeholder "out"}/etc"
+    "-Dsystemd=disabled"
  ]; # TODO: store trust anchors in a directory common to Nix and NixOS

  enableParallelBuilding = true;


This can be removed. Meson builds in parallel by default.

So can installFlags. ninja install does not allow overriding variables.

jtojnar · 2019-11-13T16:03:00Z

pkgs/development/libraries/p11-kit/default.nix

@@ -16,17 +16,12 @@ stdenv.mkDerivation rec {
  outputs = [ "out" "dev"];
  outputBin = "dev";

-  nativeBuildInputs = [ autoreconfHook pkgconfig which ];


Is which used by the build? Meson’s find_program should not need it.

jtojnar · 2019-11-13T17:09:23Z

pkgs/development/libraries/p11-kit/default.nix

-  configureFlags = [
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--without-trust-paths"


Is this option no longer necessary with Meson?

jtojnar · 2019-11-13T17:09:52Z

pkgs/development/libraries/p11-kit/default.nix

@@ -16,17 +16,12 @@ stdenv.mkDerivation rec {
  outputs = [ "out" "dev"];
  outputBin = "dev";

-  nativeBuildInputs = [ autoreconfHook pkgconfig which ];
+  nativeBuildInputs = [ meson pkgconfig which ninja ];
  buildInputs = [ gettext libffi libiconv libtasn1 ];


Do we need gettext at run time, or should this go to nativeBuildInputs?

Conveniently there's info about gettext at https://p11-glue.github.io/p11-glue/p11-kit/manual/devel-building.html#devel-building-unix

Oh, then it should actually be libintl.

jtojnar · 2019-11-13T17:13:58Z

pkgs/development/libraries/p11-kit/default.nix

-    "--localstatedir=/var"
-    "--without-trust-paths"
+  mesonFlags = [
+    "-Dsystem_config=${placeholder "out"}/etc"


This should probably be

Suggested change

"-Dsystem_config=${placeholder "out"}/etc"

"-Dsystem_config=${placeholder "out"}/etc/pkcs11"

https://github.com/p11-glue/p11-kit/blob/ef2716d18e1098effb8f3a90653c6264b2fec426/meson.build#L288-L291

No matter what, we will need to patch https://github.com/p11-glue/p11-kit/blob/17b2edb1354c5d5080172af45ce55408c5e51d59/p11-kit/meson.build#L27-L28 to /etc/…, or (probably better) drop -Dsystem_config and patch https://github.com/p11-glue/p11-kit/blob/17b2edb1354c5d5080172af45ce55408c5e51d59/p11-kit/meson.build#L320 to $out/etc.

jtojnar · 2019-11-13T17:49:39Z

$out/libexec/p11-kit/trust-extract-compat is missing from the meson package. Not sure if we still need it.

Also there might be the problem with pc file, if some other packages try to install to p11_module_configs:

--- /nix/store/l22ix8k31ciwj7pq3y4pif9bikw2wvxb-p11-kit-0.23.16.1-dev/lib/pkgconfig/p11-kit-1.pc
+++ /nix/store/ava1pzrv96lghd6xg2xy2wsynrj3fc4l-p11-kit-0.23.18.1-dev/lib/pkgconfig/p11-kit-1.pc
@@ -1,23 +1,14 @@
-prefix=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1
-exec_prefix=${prefix}
-libdir=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1/lib
-includedir=/nix/store/l22ix8k31ciwj7pq3y4pif9bikw2wvxb-p11-kit-0.23.16.1-dev/include
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-pkgdatadir=${datarootdir}/p11-kit
-sysconfdir=/etc
-p11_module_configs=${pkgdatadir}/modules
-p11_module_path=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1/lib/pkcs11
-p11_trust_paths=
-proxy_module=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1/lib/p11-kit-proxy.so
+prefix=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1
+libdir=${prefix}/lib
+includedir=/nix/store/ava1pzrv96lghd6xg2xy2wsynrj3fc4l-p11-kit-0.23.18.1-dev/include
 
-# This is for compatibility. Other packages were using this to determine
-# the directory they should install their module configs to, so override
-# this and redirect them to the new location
-p11_system_config_modules=${pkgdatadir}/modules
+p11_module_configs=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/share/p11-kit/modules
+p11_module_path=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/lib/pkcs11
+proxy_module=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/lib/p11-kit-proxy.so
+p11_system_config_modules=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/share/p11-kit/modules
 
 Name: p11-kit
 Description: Library and proxy module for properly loading and sharing PKCS#11 modules.
-Version: 0.23.16
+Version: 0.23.18
 Libs: -L${libdir} -lp11-kit
 Cflags: -I${includedir}/p11-kit-1

c0bw3b · 2019-11-13T18:43:16Z

Building with meson is not upstream default or recommendation for this package.
What would we gain?

worldofpeace · 2019-11-13T19:37:32Z

Building with meson is not upstream default or recommendation for this package.
What would we gain?

It just seems it isn't documented. And we gain meson 😄 I think there's quite a few meson nerds in NixOS that go to great lengths to make the ports very successful.

worldofpeace · 2019-11-13T19:42:21Z

$out/libexec/p11-kit/trust-extract-compat is missing from the meson package. Not sure if we still need it.

Also there might be the problem with pc file, if some other packages try to install to p11_module_configs:

--- /nix/store/l22ix8k31ciwj7pq3y4pif9bikw2wvxb-p11-kit-0.23.16.1-dev/lib/pkgconfig/p11-kit-1.pc
+++ /nix/store/ava1pzrv96lghd6xg2xy2wsynrj3fc4l-p11-kit-0.23.18.1-dev/lib/pkgconfig/p11-kit-1.pc
@@ -1,23 +1,14 @@
-prefix=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1
-exec_prefix=${prefix}
-libdir=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1/lib
-includedir=/nix/store/l22ix8k31ciwj7pq3y4pif9bikw2wvxb-p11-kit-0.23.16.1-dev/include
-datarootdir=${prefix}/share
-datadir=${datarootdir}
-pkgdatadir=${datarootdir}/p11-kit
-sysconfdir=/etc
-p11_module_configs=${pkgdatadir}/modules
-p11_module_path=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1/lib/pkcs11
-p11_trust_paths=
-proxy_module=/nix/store/s3i35d5fyssal0h6v6p9ljvcx0q6ky3q-p11-kit-0.23.16.1/lib/p11-kit-proxy.so
+prefix=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1
+libdir=${prefix}/lib
+includedir=/nix/store/ava1pzrv96lghd6xg2xy2wsynrj3fc4l-p11-kit-0.23.18.1-dev/include
 
-# This is for compatibility. Other packages were using this to determine
-# the directory they should install their module configs to, so override
-# this and redirect them to the new location
-p11_system_config_modules=${pkgdatadir}/modules
+p11_module_configs=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/share/p11-kit/modules
+p11_module_path=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/lib/pkcs11
+proxy_module=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/lib/p11-kit-proxy.so
+p11_system_config_modules=/nix/store/b5d8cv4v688jp7lgnkjl6n81475va3vn-p11-kit-0.23.18.1/share/p11-kit/modules
 
 Name: p11-kit
 Description: Library and proxy module for properly loading and sharing PKCS#11 modules.
-Version: 0.23.16
+Version: 0.23.18
 Libs: -L${libdir} -lp11-kit
 Cflags: -I${includedir}/p11-kit-1

Yeah, they seem to be very hardcoded.

https://github.com/p11-glue/p11-kit/blob/17b2edb1354c5d5080172af45ce55408c5e51d59/p11-kit/meson.build#L292

Maybe we can send them a patch so it's compatible with us.
I could do this if needed.

stale · 2020-09-10T01:47:03Z

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

stale · 2021-06-04T14:02:39Z

I marked this as stale due to inactivity. → More info

FRidh added the 2.status: work-in-progress label Nov 13, 2019

p11-kit: use meson

c66835b

FRidh force-pushed the p11-kit branch from 4840efa to c66835b Compare November 13, 2019 13:25

FRidh removed the 2.status: work-in-progress label Nov 13, 2019

FRidh added this to WIP in Staging via automation Nov 13, 2019

FRidh moved this from WIP to Needs review in Staging Nov 13, 2019

FRidh requested a review from worldofpeace November 13, 2019 13:25

FRidh commented Nov 13, 2019

View reviewed changes

ofborg bot added 10.rebuild-darwin: 501+ 10.rebuild-darwin: 501-1000 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ labels Nov 13, 2019

jtojnar reviewed Nov 13, 2019

View reviewed changes

FRidh moved this from Needs review to WIP in Staging Mar 6, 2020

FRidh added the 2.status: work-in-progress label Mar 13, 2020

FRidh changed the title ~~p11-kit: use meson~~ WIP p11-kit: use meson Mar 13, 2020

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Sep 10, 2020

ryantm added the 2.status: merge conflict label Oct 3, 2020

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 3, 2020

ryantm marked this pull request as draft October 23, 2020 03:04

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 4, 2021

ajs124 mentioned this pull request Jun 7, 2021

Firefox shows public certificate authorities as “not recognized by Mozilla” #126065

Closed

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 22, 2022

jtojnar mentioned this pull request Jan 22, 2022

p11-kit: 0.24.0 -> 0.24.1 #155523

Merged

13 tasks

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 31, 2022

NickCao mentioned this pull request Jul 21, 2023

p11-kit: build with meson #244633

Merged

12 tasks

Artturin closed this Jul 29, 2023

Staging automation moved this from WIP to Done Jul 29, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP p11-kit: use meson #73341

WIP p11-kit: use meson #73341

FRidh commented Nov 13, 2019 •

edited

FRidh Nov 13, 2019

FRidh commented Nov 13, 2019

jtojnar Nov 13, 2019

jtojnar Nov 13, 2019

jtojnar Nov 13, 2019

jtojnar Nov 13, 2019

jtojnar Nov 13, 2019

worldofpeace Nov 13, 2019

jtojnar Jan 22, 2022

jtojnar Nov 13, 2019

jtojnar Nov 13, 2019

jtojnar commented Nov 13, 2019

c0bw3b commented Nov 13, 2019 •

edited

worldofpeace commented Nov 13, 2019

worldofpeace commented Nov 13, 2019 •

edited

stale bot commented Sep 10, 2020

stale bot commented Jun 4, 2021

	"-Dsystem_config=${placeholder "out"}/etc"
	"-Dsystem_config=${placeholder "out"}/etc/pkcs11"

WIP p11-kit: use meson #73341

WIP p11-kit: use meson #73341

Conversation

FRidh commented Nov 13, 2019 • edited

Motivation for this change

Things done

Notify maintainers

Choose a reason for hiding this comment

FRidh commented Nov 13, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jtojnar commented Nov 13, 2019

c0bw3b commented Nov 13, 2019 • edited

worldofpeace commented Nov 13, 2019

worldofpeace commented Nov 13, 2019 • edited

stale bot commented Sep 10, 2020

stale bot commented Jun 4, 2021

FRidh commented Nov 13, 2019 •

edited

c0bw3b commented Nov 13, 2019 •

edited

worldofpeace commented Nov 13, 2019 •

edited