diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-23 12:40:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 12:40:13 +0000 |
| commit | 58752914f4b22a570ff7cba694df86aef20e255a (patch) | |
| tree | 13ed5492ea1c875253d18c4bcb981f9effe11ee2 /pkgs/tools/networking | |
| parent | f6c56619d7aa645772bf160c048b36d2269508c6 (diff) | |
| parent | 10a27d6d5296619de1a05538cd1d5b81b612b225 (diff) | |
| download | nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.gz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.bz2 nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.lz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.xz nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.tar.zst nixpkgs-58752914f4b22a570ff7cba694df86aef20e255a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/s6-dns/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/s6-networking/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 739fdc2e2fc..5036b1a87ea 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.2.0"; - sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7"; + version = "2.3.5.0"; + sha256 = "0h5p5dbkkdadahrp4pqhc3x9ds758i6djy49k5zrn7mm5k4722wz"; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index f8c479d5ce2..3f10b850ca7 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.3.1.2"; - sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr"; + version = "2.4.0.0"; + sha256 = "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq"; description = "A suite of small networking utilities for Unix systems"; @@ -59,7 +59,7 @@ buildPackage { # remove all s6 executables from build directory rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) rm minidentd - rm libs6net.* libstls.* + rm libs6net.* libstls.* libs6tls.* mv doc $doc/share/doc/s6-networking/html ''; |