diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
| commit | dc33419285c09720de70fe8edf5434736a2462b9 (patch) | |
| tree | 58b20bca2075a06ad5b720c6ebf0dc55635e6b10 /pkgs/tools/networking | |
| parent | b59847b848079ba872e18b5f0683c1bff7e924ba (diff) | |
| parent | b56c66e7e8565b16a4964840ef40243e07f78e84 (diff) | |
| download | nixpkgs-dc33419285c09720de70fe8edf5434736a2462b9.tar nixpkgs-dc33419285c09720de70fe8edf5434736a2462b9.tar.gz nixpkgs-dc33419285c09720de70fe8edf5434736a2462b9.tar.bz2 nixpkgs-dc33419285c09720de70fe8edf5434736a2462b9.tar.lz nixpkgs-dc33419285c09720de70fe8edf5434736a2462b9.tar.xz nixpkgs-dc33419285c09720de70fe8edf5434736a2462b9.tar.zst nixpkgs-dc33419285c09720de70fe8edf5434736a2462b9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/isync/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/privoxy/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/tinyproxy/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 49efeac02a9..9ce1183d060 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 331295ffd1f..10a25d5bf8b 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "privoxy"; version = "3.0.28"; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index 1a476676a25..7d3c49db7b7 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, asciidoc, libxml2, libxslt, docbook_xsl }: -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { pname = "tinyproxy"; version = "1.10.0"; |