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

dhcpcd: fix RA time unit confusion #76798

Merged
merged 1 commit into from Jan 2, 2020
Merged

Conversation

@andersk
Copy link
Contributor

@andersk andersk commented Jan 1, 2020

Motivation for this change

Fixes #76710 (channel blocker). Submitted upstream as rsmarples/dhcpcd#12.

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.
Notify maintainers

cc @edolstra @fpletz

@fpletz
fpletz approved these changes Jan 1, 2020
Copy link
Member

@fpletz fpletz left a comment

Awesome! Thanks a lot! 🎉

Fixes #76710.  Submitted upstream as rsmarples/dhcpcd#12.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk andersk force-pushed the andersk:dhcpcd-ra-time-units branch from 517e2fb to e474db2 Jan 1, 2020
@andersk
Copy link
Contributor Author

@andersk andersk commented Jan 1, 2020

This now uses fetchpatch to get the patch from upstream, where it was just committed.

@ofborg ofborg bot requested a review from fpletz Jan 1, 2020
@flokli
Copy link
Contributor

@flokli flokli commented Jan 2, 2020

@GrahamcOfBorg test ipv6

@flokli flokli merged commit fa34e97 into NixOS:master Jan 2, 2020
17 checks passed
17 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
dhcpcd on aarch64-linux Success
Details
dhcpcd on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
tests.ipv6 on aarch64-linux Success
Details
tests.ipv6 on x86_64-linux Success
Details
@flokli
Copy link
Contributor

@flokli flokli commented Jan 2, 2020

Thanks!

@nlewo
Copy link
Member

@nlewo nlewo commented Jan 2, 2020

Awesome! thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.