-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
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
nativeCheckInputs #206742
nativeCheckInputs #206742
Conversation
I agree with the general idea of this. |
0c37622
to
edcc6c8
Compare
See NixOS#194634 (comment) for details. PRs: - NixOS#211401 - NixOS#211161 - NixOS#206742 - NixOS#211687
See #194634 (comment) for details. PRs: - #211401 - #211161 - #206742 - #211687
@symphorien For downstream package sets which aim to target both the |
A possible solution is:
(this will fail on 23.05 older than this PR, and because the version string is different on channels and on git repositories I don't think you can make it work reliably). |
This unbreaks package tests on the current nixpkgs-unstable branch, as `buildPythonPackage` has been adjusted to rename `checkInputs` to `nativeCheckInputs`, breaking existing checkInputs specifications because of `strictDeps = 1;`. For more information, check out the corresponding PR at [1]. This implements the proposed workaround[2] for supporting both the current nixos-unstable and the last release branch (NixOS 22.11). [1]: NixOS/nixpkgs#206742 [2]: NixOS/nixpkgs#206742 (comment) Signed-off-by: Leon Schuermann <leon@is.currently.online>
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
See NixOS#194634 (comment) for details. PRs: - NixOS#211401 - NixOS#211161 - NixOS#206742 - NixOS#211687
This unbreaks package tests on the current nixpkgs-unstable branch, as `buildPythonPackage` has been adjusted to rename `checkInputs` to `nativeCheckInputs`, breaking existing checkInputs specifications because of `strictDeps = 1;`. For more information, check out the corresponding PR at [1]. This implements the proposed workaround[2] for supporting both the current nixos-unstable and the last release branch (NixOS 22.11). [1]: NixOS/nixpkgs#206742 [2]: NixOS/nixpkgs#206742 (comment) Co-authored-by: Thomas Watson <twatson52@icloud.com> Signed-off-by: Leon Schuermann <leon@is.currently.online>
This unbreaks package tests on the current nixpkgs-unstable branch, as `buildPythonPackage` has been adjusted to rename `checkInputs` to `nativeCheckInputs`, breaking existing checkInputs specifications because of `strictDeps = 1;`. For more information, check out the corresponding PR at [1]. This implements the proposed workaround[2] for supporting both the current nixos-unstable and the last release branch (NixOS 22.11). [1]: NixOS/nixpkgs#206742 [2]: NixOS/nixpkgs#206742 (comment) Signed-off-by: Leon Schuermann <leon@is.currently.online>
See NixOS/nixpkgs#206742 for details.
Description of changes
Fixes #161570
tl;dr: checkInputs used to be added to nativeBuildInputs, which means they are added to PATH but one cannot link to them when strictDeps is set. As linking to check-only libs is possible (quite common for ocaml for example) we need to distinguish
(same for installCheck)
The PR contains manual commits to adapt the builders (mkDerivation, buildPythonPackage notably), a commit to use the new feature in ocamlPackages.batteries, and a treewide search-and-replace from checkInputs to nativeCheckInputs.
as a result hashes are unchanged except for the reverse-dependencies of ocamlPackages.batteries (8).
Supersedes https://github.com/NixOS/nixpkgs/pull/185406/files
This PR will inevitably accumulate merge conflicts. When it obtains enough positive reviews, I will regenerate the treewide commit and merge immediately. Maybe this can be done just after staging-next is merged?
Things done
sandbox = true
set 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.sh
to update generated release notes