Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 84c81a49294c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa34e9712265
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 1, 2020

  1. dhcpcd: fix RA time unit confusion 

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

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Jan 1, 2020
    Copy the full SHA
    e474db2 View commit details

Commits on Jan 2, 2020

  1. Merge pull request #76798 from andersk/dhcpcd-ra-time-units 

    dhcpcd: fix RA time unit confusion
    @flokli
    flokli authored Jan 2, 2020
    Copy the full SHA
    fa34e97 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/tools/networking/dhcpcd/default.nix
10 changes: 9 additions & 1 deletion pkgs/tools/networking/dhcpcd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }:
{ stdenv, fetchurl, fetchpatch, pkgconfig, udev, runtimeShellPackage,
runtimeShell }:

stdenv.mkDerivation rec {
# when updating this to >=7, check, see previous reverts:
@@ -21,6 +22,13 @@ stdenv.mkDerivation rec {
substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell}
'';

patches = [
(fetchpatch {
url = "https://roy.marples.name/cgit/dhcpcd.git/patch/?id=114870290a8d3d696bc4049c32eef3eed03d6070";
sha256 = "0kzpwjh2gzvl5lvlnw6lis610p67nassk3apns68ga2pyxlky8qb";
})
];

preConfigure = "patchShebangs ./configure";

configureFlags = [