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.

Sign up for GitHub

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

Jump to bottom

dhcpcd: No need to hack around broken patchShebangs anymore #46542

Merged
merged 1 commit into from Sep 11, 2018
Merged

dhcpcd: No need to hack around broken patchShebangs anymore #46542

merged 1 commit into from Sep 11, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Now that #43833 has landed.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@Ericson2314 Ericson2314 mentioned this pull request Sep 11, 2018
Merged
9 tasks
@matthewbauer
Copy link
Member

I wonder if runtimeShellPackage should be automatically in build inputs? This could lead to less surprises as it has historically just worked when not cross compiling.

@Ericson2314
Copy link
Member Author

Ericson2314 commented Sep 11, 2018 •
edited

So by the "principle of least authority" I'm usually cautious about adding auto deps. It complicates bootstrapping (c.f. crossLibcStdenv for building libc) too. But I'd be OK with it as part of a strictDeps transition or something.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: dhcpcd

Partial log (click to expand)

shrinking /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/sbin/dhcpcd
shrinking /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/lib/dhcpcd/dev/udev.so
gzipping man pages under /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/share/man/
/nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8
strip is /nix/store/rf59n87kcrrnrnw3l3s94q879m8vaspm-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/lib  /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/libexec  /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/sbin
patching script interpreter paths in /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8
/nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/libexec/dhcpcd-run-hooks: interpreter directive changed from "/bin/sh" to "/nix/store/c7jw834if7hnq8blv8yw0zbw4dj5wpck-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8...
moving /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/sbin/* to /nix/store/jc3jh4fgdb0mw4y6yimiya4gygwbr257-dhcpcd-7.0.8/bin

@Ericson2314 Ericson2314 merged commit cb8fb7e into NixOS:staging Sep 11, 2018
@Ericson2314 Ericson2314 deleted the dhcpcd-cleanup branch September 11, 2018 20:40
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: dhcpcd

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: dhcpcd

Partial log (click to expand)

shrinking /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/lib/dhcpcd/dev/udev.so
shrinking /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/sbin/dhcpcd
gzipping man pages under /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/share/man/
strip is /nix/store/lw308kxqcm9frx4vlfjh30da1x4gsmwx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/lib  /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/libexec  /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/sbin
patching script interpreter paths in /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8
/nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/libexec/dhcpcd-run-hooks: interpreter directive changed from "/bin/sh" to "/nix/store/4y6cwvlhgijd84z5q0y6cdar81kjrljp-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8...
moving /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/sbin/* to /nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8/bin
/nix/store/vfksnj3xv9sf78bl2bs65z5v451l1qd4-dhcpcd-7.0.8

@matthewbauer matthewbauer mentioned this pull request Sep 16, 2018
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@shlevy shlevy Awaiting requested review from shlevy

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ericson2314 @matthewbauer @GrahamcOfBorg