Merge branch 'master' into closure-size

14 files changed, 302 insertions, 46 deletions

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 3acf921cd794d..dca92c565af97 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, libcap, readline, texinfo }:
+{ stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr }:
 
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "2.1.1";
-  
+  version = "2.2";
+
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4";
+    sha256 = "1194maargy4hpl2a3vy5mbrrswzajjdn92p4w17gbb9vlq7q5zfk";
   };
-  
-  buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap;
+
+  buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap;
+  nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = [
-    "--sysconfdir=$(out)/etc"
     "--chronyvardir=$(out)/var/lib/chrony"
   ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git;
     license = licenses.gpl2;
     platforms = with platforms; linux ++ freebsd ++ openbsd;
-    maintainers = [ maintainers.rickynils ];
+    maintainers = with maintainers; [ rickynils fpletz ];
 
     longDescription = ''
       Chronyd is a daemon which runs in background on the system. It obtains measurements via the network of the system clock’s offset relative to time servers on other systems and adjusts the system time accordingly. For isolated systems, the user can periodically enter the correct time by hand (using Chronyc). In either case, Chronyd determines the rate at which the computer gains or loses time, and compensates for this. Chronyd implements the NTP protocol and can act as either a client or a server.
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 98ea4c82304ba..6b4c1f556437f 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2015.68";
+  name = "dropbear-2015.70";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "0ii4lq19b3k06fn25zc5sbbk698s56ldrbg1vcf4pzjgj0g7rsjm";
+    sha256 = "0mzj1gwamxmk8rab4xmcvldcxdvs5zczim2hdza3dwfhy4ywra32";
   };
 
   dontDisableStatic = enableStatic;
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index e78dfa5b2cae6..aa52e4f3ae240 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -12,19 +12,15 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  propagatedBuildInputs = [
-    pythonPackages.gdata
-    pythonPackages.IMAPClient
-    pythonPackages.Logbook
-    pythonPackages.argparse
-  ];
+  propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook
+    argparse ];
 
   startScript = ./gmvault.py;
 
   patchPhase = ''
     cat ${startScript} > etc/scripts/gmvault
     chmod +x etc/scripts/gmvault
-    substituteInPlace setup.py --replace "Logbook==0.4.1" "Logbook==0.4.2"
+    substituteInPlace setup.py --replace "==" ">="
   '';
 
   meta = {
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index 82e26ad85c9d8..f99a3de90468b 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ libnfnetlink ];
 
-  installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
+  installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 07bd9fd8c1a24..3c1d41a133bad 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   # All files installed to /etc are just static data that can go in the store
-  makeFlags = "PREFIX=$(out) ETCDIR=$(out)/etc";
+  makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
 
   postInstall = ''
     ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat		$out/etc/netsniff-ng/country4.dat
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index e7176ba90b3b3..e780865ab3b58 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.7";
+  name = "openvpn-2.3.8";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz";
+    sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     --enable-systemd
     --enable-iproute2
     IPROUTE=${iproute}/sbin/ip
+  '' + optionalString stdenv.isDarwin ''
+    --disable-plugin-auth-pam
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index e82b7b8050ef4..836f3e1e60ca7 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -1,17 +1,14 @@
 { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow
-, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial
-, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock }:
+, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial, python
+, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock, zope_interface }:
 
 # FAILURES: The "running build_ext" phase fails to compile Twisted
 # plugins, because it tries to write them into Twisted's (immutable)
 # store path. The problem appears to be non-fatal, but there's probably
 # some loss of functionality because of it.
 
-let
+buildPythonPackage rec {
   name = "tahoe-lafs-1.10.0";
-in
-buildPythonPackage {
-  inherit name;
   namePrefix = "";
 
   src = fetchurl {
@@ -19,7 +16,7 @@ buildPythonPackage {
     sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw";
   };
 
-  configurePhase = ''
+  patchPhase = ''
     sed -i "src/allmydata/util/iputil.py" \
         -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g"
 
@@ -29,45 +26,43 @@ buildPythonPackage {
     do
       sed -i "$i" -e"s/localhost/127.0.0.1/g"
     done
+
+    sed -i 's/"zope.interface.*"/"zope.interface"/' src/allmydata/_auto_deps.py
+    sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py
   '';
 
-  buildInputs = [ unzip ]
-    ++ [ numpy ]; # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2
+  # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2
+  buildInputs = [ unzip numpy mock ];
 
   # The `backup' command requires `sqlite3'.
   propagatedBuildInputs =
     [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3
-      darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 mock
+      darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface
     ];
 
-  # The test suite is run in `postInstall'.
-  doCheck = false;
-
   postInstall = ''
     # Install the documentation.
     mkdir -p "$out/share/doc/${name}"
     cp -rv "docs/"* "$out/share/doc/${name}"
     find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \;
+  '';
 
-    # Run the tests once everything is installed.
-    export PYTHON_EGG_CACHE="$TMPDIR"
-    python setup.py build
-    python setup.py trial
+  checkPhase = ''
+    # TODO: broken with wheels
+    #${python.interpreter} setup.py trial
   '';
 
   meta = {
     description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system";
-
     longDescription = ''
       Tahoe-LAFS is a secure, decentralized, fault-tolerant filesystem.
       This filesystem is encrypted and spread over multiple peers in
       such a way that it remains available even when some of the peers
       are unavailable, malfunctioning, or malicious.
     '';
-
     homepage = http://allmydata.org/;
     license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
-    maintainers = [ lib.maintainers.simons  ];
+    maintainers = [ lib.maintainers.simons ];
     platforms = lib.platforms.gnu;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix
index 3d5ed7b34cae2..f8f37e05a72ea 100644
--- a/pkgs/tools/networking/philter/default.nix
+++ b/pkgs/tools/networking/philter/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Mail sorter for Maildirs";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 
   passthru = {
diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix
index a0a0efa85baf9..2a72a530cab9c 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/pkgs/tools/networking/ripmime/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Attachment extractor for MIME messages";
     maintainers = with maintainers; [ raskin ];
     homepage = http://www.pldaniels.com/ripmime/;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 
   passthru = {
diff --git a/pkgs/tools/networking/statsd/default.nix b/pkgs/tools/networking/statsd/default.nix
new file mode 100644
index 0000000000000..1143d55269f39
--- /dev/null
+++ b/pkgs/tools/networking/statsd/default.nix
@@ -0,0 +1,13 @@
+{ recurseIntoAttrs, callPackage, nodejs
+}:
+
+let
+  self = recurseIntoAttrs (
+    callPackage <nixpkgs/pkgs/top-level/node-packages.nix> {
+      inherit nodejs self;
+      generated = callPackage ./node-packages.nix { inherit self; };
+      overrides = {
+        "statsd" = { passthru.nodePackages = self; };
+      };
+    });
+in self.statsd
diff --git a/pkgs/tools/networking/statsd/node-packages.json b/pkgs/tools/networking/statsd/node-packages.json
new file mode 100644
index 0000000000000..f75224e79f920
--- /dev/null
+++ b/pkgs/tools/networking/statsd/node-packages.json
@@ -0,0 +1,6 @@
+[
+  "statsd"
+, "statsd-librato-backend"
+, "stackdriver-statsd-backend"
+, "statsd-influxdb-backend"
+]
diff --git a/pkgs/tools/networking/statsd/node-packages.nix b/pkgs/tools/networking/statsd/node-packages.nix
new file mode 100644
index 0000000000000..6cf9e8478d788
--- /dev/null
+++ b/pkgs/tools/networking/statsd/node-packages.nix
@@ -0,0 +1,244 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."commander"."1.3.1" =
+    self.by-version."commander"."1.3.1";
+  by-version."commander"."1.3.1" = self.buildNodePackage {
+    name = "commander-1.3.1";
+    version = "1.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
+      name = "commander-1.3.1.tgz";
+      sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
+    };
+    deps = {
+      "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."connection-parse"."0.0.x" =
+    self.by-version."connection-parse"."0.0.7";
+  by-version."connection-parse"."0.0.7" = self.buildNodePackage {
+    name = "connection-parse-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
+      name = "connection-parse-0.0.7.tgz";
+      sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hashring"."1.0.1" =
+    self.by-version."hashring"."1.0.1";
+  by-version."hashring"."1.0.1" = self.buildNodePackage {
+    name = "hashring-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
+      name = "hashring-1.0.1.tgz";
+      sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
+    };
+    deps = {
+      "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
+      "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."keypress"."0.1.x" =
+    self.by-version."keypress"."0.1.0";
+  by-version."keypress"."0.1.0" = self.buildNodePackage {
+    name = "keypress-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+      name = "keypress-0.1.0.tgz";
+      sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-syslog"."1.1.7" =
+    self.by-version."node-syslog"."1.1.7";
+  by-version."node-syslog"."1.1.7" = self.buildNodePackage {
+    name = "node-syslog-1.1.7";
+    version = "1.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
+      name = "node-syslog-1.1.7.tgz";
+      sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sequence"."2.2.1" =
+    self.by-version."sequence"."2.2.1";
+  by-version."sequence"."2.2.1" = self.buildNodePackage {
+    name = "sequence-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
+      name = "sequence-2.2.1.tgz";
+      sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."simple-lru-cache"."0.0.x" =
+    self.by-version."simple-lru-cache"."0.0.2";
+  by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage {
+    name = "simple-lru-cache-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
+      name = "simple-lru-cache-0.0.2.tgz";
+      sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stackdriver-statsd-backend"."*" =
+    self.by-version."stackdriver-statsd-backend"."0.2.3";
+  by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage {
+    name = "stackdriver-statsd-backend-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
+      name = "stackdriver-statsd-backend-0.2.3.tgz";
+      sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
+  by-spec."statsd"."*" =
+    self.by-version."statsd"."0.7.2";
+  by-version."statsd"."0.7.2" = self.buildNodePackage {
+    name = "statsd-0.7.2";
+    version = "0.7.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
+      name = "statsd-0.7.2.tgz";
+      sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+      "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
+      "hashring-1.0.1" = self.by-version."hashring"."1.0.1";
+      "winser-0.1.6" = self.by-version."winser"."0.1.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "statsd" = self.by-version."statsd"."0.7.2";
+  by-spec."statsd-influxdb-backend"."*" =
+    self.by-version."statsd-influxdb-backend"."0.6.0";
+  by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage {
+    name = "statsd-influxdb-backend-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
+      name = "statsd-influxdb-backend-0.6.0.tgz";
+      sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.6.0";
+  by-spec."statsd-librato-backend"."*" =
+    self.by-version."statsd-librato-backend"."0.1.7";
+  by-version."statsd-librato-backend"."0.1.7" = self.buildNodePackage {
+    name = "statsd-librato-backend-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
+      name = "statsd-librato-backend-0.1.7.tgz";
+      sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.7";
+  by-spec."winser"."=0.1.6" =
+    self.by-version."winser"."0.1.6";
+  by-version."winser"."0.1.6" = self.buildNodePackage {
+    name = "winser-0.1.6";
+    version = "0.1.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
+      name = "winser-0.1.6.tgz";
+      sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
+    };
+    deps = {
+      "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
+      "commander-1.3.1" = self.by-version."commander"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+}
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 29b920295585e..ecd98d8155fa8 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.22";
+  version = "5.26";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0gxqiiksc5p65s67f53yxa2hb8w4hfcgd0s20jrcslw1jjk2imla";
+    sha256 = "09i7gizisa04l0gygwbyd3dnzpjmq3ii6c009z4qvv8y05lx941c";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix
index 57dd43cbb4447..e95cba18e1098 100644
--- a/pkgs/tools/networking/tftp-hpa/default.nix
+++ b/pkgs/tools/networking/tftp-hpa/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "TFTP tools - a lot of fixes on top of BSD TFTP";
     maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     license = licenses.bsd3;
     homepage = http://www.kernel.org/pub/software/network/tftp/;
   };