p11-kit: Fix builds on non-NixOS systems (single-user install) #278099
Conversation
| @@ -63,6 +63,13 @@ stdenv.mkDerivation rec { | |||
| ])) | |||
| ]; | |||
|
|
|||
| # Tests run in fakeroot for non-root users | |||
| preCheck = '' | |||
| if [ "$(id -u)" != "0" ]; then | |||
There was a problem hiding this comment.
Does this break things if we set this variable always? Otherwise people on just nixos cannot know, if it continue to works on other platforms.
Alsop lease follow the contributing guide when naming your commits.
There was a problem hiding this comment.
Thanks for such a speedy review!
Alsop lease follow the contributing guide when naming your commits.
Apologies, I believe it now follows the convention!
Does this break things if we set this variable always? Otherwise people on just nixos cannot know, if it continue to works on other platforms.
I haven't thought about this change too much, I'm just reverting it back to how it was before 3ca33e5#diff-6e5cbf6c584d88a4b8326fc03daf8650866eed33b1651b38ab379da599f57109L72-L77.
There was a problem hiding this comment.
It would skip the tests from running when building on NixOS/multi-user as well.
jonathanlking
force-pushed
the
fix/p11-kit-meson-regression
branch
from
dcebe7b
to
2dbde03
Compare
|
Also please target the staging branch, since this will cause a mass rebuild. |
jonathanlking
force-pushed
the
fix/p11-kit-meson-regression
branch
from
2dbde03
to
81dd140
Compare
github-actions
bot
added
6.topic: python
6.topic: nixos
6.topic: haskell
8.has: module (update)
6.topic: rust
6.topic: golang
6.topic: jupyter
jonathanlking
force-pushed
the
fix/p11-kit-meson-regression
branch
from
81dd140
to
5ab9d67
Compare
github-actions
bot
removed
6.topic: python
6.topic: nixos
6.topic: haskell
8.has: module (update)
6.topic: rust
6.topic: golang
6.topic: jupyter
Add back FAKED_MODE environment variable. This was removed in 3ca33e5, which caused tests to be run (and fail) that were previously skipped.
jonathanlking
force-pushed
the
fix/p11-kit-meson-regression
branch
from
5ab9d67
to
a9323a3
Compare
|
Thanks. |
jtojnar
changed the title
Add back FAKED_MODE environment variable. This was removed in 3ca33e5, which caused tests to be run (and fail) that were previously skipped. nixpkgs upstreaming PR: NixOS#278099
Description of changes
Discussed in #96715.
In 3ca33e5 the
FAKED_MODEenvironment variable was no longer set. This causes tests to be run (and fail) that were previously skipped, see https://github.com/p11-glue/p11-kit/blob/81715a26a36599562793f5fe103b6bee1a141fdb/p11-kit/test-conf.c#L472-L473.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.