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: 1316e4a7457d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a7adfc6abe88
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 26, 2019

  1. Copy the full SHA
    5a5a597 View commit details
  2. Merge pull request #62068 from mmahut/62056

    ddclient: patch unpure /usr/bin/perl
    aanderse authored May 26, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a7adfc6 View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/tools/networking/ddclient/default.nix
6 changes: 4 additions & 2 deletions pkgs/tools/networking/ddclient/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perlPackages, iproute }:
{ stdenv, fetchurl, perlPackages, iproute, perl }:

perlPackages.buildPerlPackage rec {
name = "ddclient-${version}";
@@ -20,7 +20,9 @@ perlPackages.buildPerlPackage rec {
substituteInPlace ddclient \
--replace 'in the output of ifconfig' 'in the output of ip addr show' \
--replace 'ifconfig -a' '${iproute}/sbin/ip addr show' \
--replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg'
--replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' \
# Until we get the patchShebangs fixed (issue #55786) we need to patch this manually
--replace '/usr/bin/perl' '${perl}/bin/perl'
'';

installPhase = ''