diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-02 00:04:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 00:04:43 +0000 |
| commit | e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5 (patch) | |
| tree | 9662884a7112c2a23a1ed52e775896182f967c11 /pkgs/tools/networking | |
| parent | aecf7c7bb9d978330ef40b0179fd25fb7f02d7b4 (diff) | |
| parent | ae1d03834ebe4881dca31da399e277657ba33779 (diff) | |
| download | nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.gz nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.bz2 nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.lz nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.xz nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.tar.zst nixpkgs-e879e7d54ee09c8bc8726d40ea2d31e8efdf93b5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/dnsproxy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/minidlna/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/pdsh/default.nix | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 5e868c12815..7c0bf5c4f59 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.45.1"; + version = "0.45.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sBLZHBbBUF2qpmgRbMahVOcoZOURZRMfW8hAebuxXRs="; + sha256 = "sha256-2lPGKLmLDP39qtyb88MiCBVjbztrBFqqy5hc7iOK3QE="; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 00cd85a4273..78066efab53 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext, nixosTests }: +{ lib, stdenv, fetchgit, autoreconfHook, ffmpeg, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext, nixosTests, zlib }: let pname = "minidlna"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ]; + buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext zlib ]; postInstall = '' mkdir -p $out/share/man/man{5,8} diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 531dfeeb4c4..43aa6f9f147 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: +{ lib, stdenv, fetchurl, autoreconfHook, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: stdenv.mkDerivation rec { pname = "pdsh"; @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { buildInputs = [ perl readline ssh ] ++ (lib.optional slurmSupport slurm); + nativeBuildInputs = [ autoreconfHook ]; + + # Do not use git to derive a version. + postPatch = '' + sed -i 's/m4_esyscmd(\[git describe.*/[${version}])/' configure.ac + ''; + preConfigure = '' configureFlagsArray=( "--infodir=$out/share/info" |