diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-12-12 17:06:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-12 17:06:06 +0100 |
commit | 2cf32f976a205eff6d18b20bd799d017b46646ed (patch) | |
tree | ac0bd74b3aeb5345048229069c59f4a600d9a3dd | |
parent | 01c02c84d3f1536c695a2ec3ddb66b8a21be152b (diff) | |
parent | 58be1bf4577132ef8dcbf1efa6427a0679b9b634 (diff) |
Merge pull request #173384 from SuperSandro2000/ddclient-update
-rw-r--r-- | pkgs/applications/networking/sieve-connect/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/longview/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/munin/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/ddclient/default.nix | 32 | ||||
-rw-r--r-- | pkgs/tools/networking/imapsync/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/swaks/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/perl-packages.nix | 5 |
7 files changed, 23 insertions, 26 deletions
diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index d752dab1567e0..46fc2a7ae1701 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sieve-connect \ --prefix PERL5LIB : "${with perlPackages; makePerlPath [ - AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS + AuthenSASL Socket6 IOSocketINET6 IOSocketSSL NetSSLeay NetDNS TermReadKey TermReadLineGnu ]}" ''; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 5d05dfd1ebb67..d2cc7c040e5d9 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { LWPProtocolHttps MozillaCA CryptSSLeay - IOSocketInet6 + IOSocketINET6 LinuxDistribution JSONPP JSON diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 0bfc868167cb6..c05dbe28f2493 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { perlPackages.NetSSLeay perlPackages.NetServer perlPackages.LogLog4perl - perlPackages.IOSocketInet6 + perlPackages.IOSocketINET6 perlPackages.Socket6 perlPackages.URI perlPackages.DBFile @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { esac wrapProgram "$file" \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${with perlPackages; makePerlPath [ - LogLog4perl IOSocketInet6 Socket6 URI DBFile DateManip + LogLog4perl IOSocketINET6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetCIDR NetSNMP NetServer ListMoreUtils DBDPg LWP rrdtool ]}" diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index e4bb685b518e8..b39af19301005 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,48 +1,44 @@ -{ lib, fetchFromGitHub, perlPackages, iproute2, perl }: +{ lib, fetchFromGitHub, perlPackages, autoreconfHook, iproute2, perl }: perlPackages.buildPerlPackage rec { pname = "ddclient"; - version = "3.9.1"; + version = "3.10.0"; + + outputs = [ "out" ]; src = fetchFromGitHub { owner = "ddclient"; repo = "ddclient"; rev = "v${version}"; - sha256 = "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w"; + sha256 = "sha256-wWUkjXwVNZRJR1rXPn3IkDRi9is9vsRuNC/zq8RpB1E="; }; - # perl packages by default get devdoc which isn't present - outputs = [ "out" ]; - - buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP IOSocketInet6 ]; - - # Use iproute2 instead of ifconfig - preConfigure = '' + postPatch = '' touch Makefile.PL - substituteInPlace ddclient \ - --replace 'in the output of ifconfig' 'in the output of ip addr show' \ - --replace 'ifconfig -a' '${iproute2}/sbin/ip addr show' \ - --replace 'ifconfig $arg' '${iproute2}/sbin/ip addr show $arg' \ - --replace '/usr/bin/perl' '${perl}/bin/perl' # Until we get the patchShebangs fixed (issue #55786) we need to patch this manually ''; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = with perlPackages; [ IOSocketINET6 IOSocketSSL JSONPP ]; + installPhase = '' runHook preInstall + # patch sheebang ddclient script which only exists after buildPhase + preConfigure install -Dm755 ddclient $out/bin/ddclient - install -Dm644 -t $out/share/doc/ddclient COP* ChangeLog README.* RELEASENOTE + install -Dm644 -t $out/share/doc/ddclient COP* README.* ChangeLog.md runHook postInstall ''; - # there are no tests distributed with ddclient + # TODO: run upstream tests doCheck = false; meta = with lib; { description = "Client for updating dynamic DNS service entries"; homepage = "https://ddclient.net/"; license = licenses.gpl2Plus; - # Mostly since `iproute` is Linux only. platforms = platforms.linux; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index 5dd9ef122200a..5604145a182ee 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { EncodeIMAPUTF7 FileCopyRecursive FileTail - IOSocketInet6 + IOSocketINET6 IOTee JSONWebToken LWP diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 49ef0afc0603c..da53407e3cc71 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/swaks --set PERL5LIB \ "${with perlPackages; makePerlPath [ - NetSSLeay AuthenSASL NetDNS IOSocketInet6 + NetSSLeay AuthenSASL NetDNS IOSocketINET6 ]}" ''; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c9879db716507..c1d64a90c8e60 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12242,7 +12242,7 @@ let }; }; - IOSocketInet6 = buildPerlModule { + IOSocketINET6 = buildPerlModule { pname = "IO-Socket-INET6"; version = "2.72"; src = fetchurl { @@ -27816,7 +27816,7 @@ let hash = "sha256-RdIExtrXzZAXYIS/JCe6qM5QNoSlaZ6+sjbk0zvAuoY="; }; buildInputs = [ PodCoverage TestDifferences TestException TestFatal TestNoWarnings TestPod ]; - propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketInet6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP Readonly TextCSV ZonemasterLDNS libintl-perl ]; + propagatedBuildInputs = [ ClassAccessor Clone EmailValid FileShareDir FileSlurp IOSocketINET6 ListMoreUtils ModuleFind Moose MooseXSingleton NetIP Readonly TextCSV ZonemasterLDNS libintl-perl ]; preCheck = '' # disable dnssec test as it fails @@ -27927,6 +27927,7 @@ let DistZillaPluginNoTabsTests = self.DistZillaPluginTestNoTabs; EmailMIMEModifier = self.EmailMIME; ExtUtilsCommand = self.ExtUtilsMakeMaker; + IOSocketInet6 = self.IOSocketINET6; IOstringy = self.IOStringy; libintl_perl = self.libintl-perl; libintlperl = self.libintl-perl; |