[staging-next] shadow: only use tcb where available #210259
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
musl and UClibc, the other Linux libcs supported in Nixpkgs, don't have NSS, so tcb can't be built for them.
Fixes pkgsMusl.shadow. Fixes: 0e32191 ("shadow: add tcb support")
alyssais
changed the title
ofborg
bot
added
10.rebuild-darwin: 0
10.rebuild-linux: 1-10
10.rebuild-linux: 1
labels
Izorkin
approved these changes
Jan 12, 2023
| @@ -6,7 +6,7 @@ | |||
| , libxcrypt | |||
| , glibcCross ? null | |||
| , pam ? null | |||
| , withTcb ? stdenv.isLinux, tcb | |||
| , withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb | |||
There was a problem hiding this comment.
The problem with this is, that when we change the platform of tcb for some reason, we could trigger a mass rebuild or silently disable a feature without realizing it. Using isGnu here would duplicate code but IMO I would prefer it.
ncfavier
reviewed
Jan 24, 2023
| platforms = platforms.linux; | ||
| platforms = systems.inspect.patterns.isGnu; |
There was a problem hiding this comment.
Heads up: this broke the https://search.nixos.org import (so it hasn't updated in a week). I made a PR with a quick fix: NixOS/nixos-search#602. Eventually we should figure out how to display patterns properly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Fixes pkgsMusl.shadow. tcb requires NSS, which e.g. musl and uclibc don't have.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes