Skip to content
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

darwin.adv_cmds: fix build #103180

Merged
merged 1 commit into from Nov 10, 2020
Merged

darwin.adv_cmds: fix build #103180

merged 1 commit into from Nov 10, 2020

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Nov 9, 2020

Also disable pgrep that depends on pkill

Motivation for this change

Closes: #82640

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Also disable pgrep that depends on pkill
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 9, 2020
@ofborg ofborg bot requested a review from matthewbauer November 9, 2020 01:42
@veprbl veprbl requested a review from nomeata November 9, 2020 14:25
Copy link
Contributor

@nomeata nomeata left a comment

Choose a reason for hiding this comment

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

Thanks! Unfortunately, I can’t easily reproduce the issues that I was having (I don’t have access to a darwin machine, and this was on CI for a project where I cannot just test this patch.)

@veprbl
Copy link
Member Author

veprbl commented Nov 9, 2020

So installation was broken when implemented 4f52264, but I suppose it would only fail the build after #72347. Other places seem to have been fixed (e.g. ed61487):

# grep -r 'install -D $f' .   
./pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix:        install -D $f $out/usr/bin/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix:        install -D $f $out/bin/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix:        install -D $f $out/bin/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/text_cmds/default.nix:        install -D $f $out/bin/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix:        install -D $f $out/bin/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix:          install -D $f $out/share/man/man$n/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix:        install -D $f $out/bin/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix:        install -D $f $out/bin/$(basename $f)
./pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix:        install -D $f $out/bin/$(basename $f)
#
# grep -r 'install -D $file' .
#

@veprbl veprbl merged commit 7c1e712 into NixOS:master Nov 10, 2020
@veprbl veprbl deleted the pr/darwin_adv_cmds_fix branch November 10, 2020 18:26
veprbl added a commit that referenced this pull request Nov 11, 2020
Also disable pgrep that depends on pkill

(cherry picked from commit f0efe2d)
cc #103180
@veprbl veprbl added the 8.has: port to stable A PR already has a backport to the stable release. label Nov 11, 2020
@veprbl veprbl restored the pr/darwin_adv_cmds_fix branch December 1, 2020 16:46
@veprbl veprbl deleted the pr/darwin_adv_cmds_fix branch December 1, 2020 16:50
cole-h pushed a commit that referenced this pull request Mar 7, 2021
Still includes `coreutils` in `checkInputs`.

macOS: disables some pexpect tests which depend on pkill/pgrep
(see #103180).
rvem pushed a commit to serokell/nixpkgs that referenced this pull request Nov 8, 2022
Also disable pgrep that depends on pkill

(cherry picked from commit f0efe2d)
cc NixOS#103180
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

darwin.adv_cmds fails to build
2 participants