diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 11673bf8bc78..b4ac0ca184db 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -260,7 +260,7 @@ in {
         path = [ ];
         script = ''
           export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
-          ${pkgs.datadog-trace-agent}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml
+          ${datadogPkg}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml
         '';
       });
 
diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix
new file mode 100644
index 000000000000..26b9cf4f6a96
--- /dev/null
+++ b/pkgs/development/python-modules/pg8000/1_12.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytz
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "pg8000";
+  version = "1.12.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx";
+  };
+
+  propagatedBuildInputs = [ pytz six ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tlocke/pg8000;
+    description = "PostgreSQL interface library, for asyncio";
+    maintainers = with maintainers; [ garbas domenkozar ];
+    platforms = platforms.unix;
+  };
+
+}
+
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 5cf8341ffa31..d8e04f56146e 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ pytz six ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/mfenniak/pg8000;
+    homepage = https://github.com/tlocke/pg8000;
     description = "PostgreSQL interface library, for asyncio";
     maintainers = with maintainers; [ garbas domenkozar ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/dd-agent/6.nix b/pkgs/tools/networking/dd-agent/6.nix
index 944ba604ece9..30071e985a04 100644
--- a/pkgs/tools/networking/dd-agent/6.nix
+++ b/pkgs/tools/networking/dd-agent/6.nix
@@ -18,10 +18,10 @@ in buildGoPackage rec {
 
   subPackages = [
     "cmd/agent"
+    "cmd/cluster-agent"
     "cmd/dogstatsd"
     "cmd/py-launcher"
-    # Does not compile: go/src/github.com/DataDog/datadog-agent/cmd/cluster-agent/main.go:31:12: undefined: app.ClusterAgentCmd
-    #"cmd/cluster-agent"
+    "cmd/trace-agent"
   ];
   goDeps = ./deps.nix;
   goPackagePath = "github.com/${owner}/${repo}";
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
index 863402854aeb..ca6b3dcee420 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix
@@ -3,9 +3,9 @@
   {
     goPackagePath  = "bitbucket.org/ww/goautoneg";
     fetch = {
-      type = "hg";
-      url = "https://bitbucket.org/ww/goautoneg";
-      rev =  "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
+      type = "git";
+      url = "https://github.com/adjust/goautoneg";
+      rev =  "d788f35a0315672bc90f50a6145d1252a230ee0d";
       sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
     };
   }
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/DataDog/datadog-agent";
-      rev =  "f2d7ce69202c8212cae1ebf476d038b28f3a895e";
-      sha256 = "0by3qvj6468r3532x1q6ingf6hlgv4dk8g1aa0hmh9gm25dbfsg5";
+      rev =  "4aa90bd394b62b0d3e3f15703c6e459c1c477fbc";
+      sha256 = "13zvg8ykakq97bw0kd2gj4s9gfjpx23d3c51w1jpa1raqwhgqi8z";
     };
   }
   {
@@ -41,17 +41,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/DataDog/gopsutil";
-      rev =  "771928d86fa878b9d62f073a7a6f91ee0a358105";
-      sha256 = "0dr5a67jy2zh42dcndx981ca1wv0phc16zlimahjlr00qxam90xi";
+      rev =  "c8f74f1344dd41bc49ec4d3c2377c526aaedfd20";
+      sha256 = "0r8al83apxrq1v6s2mq0p8h3c4z4n5g7ax8vcvs70pq0czy2fvgp";
     };
   }
   {
-    goPackagePath  = "github.com/DataDog/tcptracer-bpf";
+    goPackagePath  = "github.com/DataDog/viper";
     fetch = {
       type = "git";
-      url = "https://github.com/DataDog/tcptracer-bpf";
-      rev =  "636ee01a99a4bd352329de98f40fb9fdf611d1c9";
-      sha256 = "13373wg1x90jydzgbblxpq2gg9b7ppk6nkjzhw8d27mxd047i74m";
+      url = "https://github.com/DataDog/viper";
+      rev =  "23ced3bc6b3751855704445e48da2c53075ade86";
+      sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m";
     };
   }
   {
@@ -59,8 +59,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/DataDog/zstd";
-      rev =  "2bf71ec4836011b92dc78df3b9ace6b40e65f7df";
-      sha256 = "0j0qmnzjxx86kavrb3qcashp2irzjbvip15df97k87pcfvl1gsig";
+      rev =  "2b373cbe6ac0c8e6960bbd18026ceb269eef89f5";
+      sha256 = "157kh7w173igxbypknmr8hc8934ykmnb02pkb76k1jwq4sphn8qj";
     };
   }
   {
@@ -77,8 +77,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/StackExchange/wmi";
-      rev =  "b12b22c5341f0c26d88c4d66176330500e84db68";
-      sha256 = "0kzkb4zllhrdiq0m9m5ka9i393r1hnx75lnd3hz5rg2fs0n3ym16";
+      rev =  "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
+      sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
     };
   }
   {
@@ -302,8 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/iovisor/gobpf";
-      rev =  "3b07770c6d5e2bd37e582ecd49460e6ef094f257";
-      sha256 = "0inv9vwjd8r365rdpf6z4kzs8b36890vrfkifw228mjlxxx8rg7f";
+      rev =  "98ebf56442afb10e1b43145127de3c1777ed7e95";
+      sha256 = "0m2aah77b1k2yf31za975mcix5n0jijqkqmhgakip00klihx383k";
     };
   }
   {
@@ -324,13 +324,22 @@
       sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
     };
   }
+  {
+    goPackagePath  = "github.com/kardianos/osext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kardianos/osext";
+      rev =  "ae77be60afb1dcacde03767a8c37337fad28ac14";
+      sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
+    };
+  }
   {
     goPackagePath  = "github.com/kubernetes-incubator/custom-metrics-apiserver";
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
-      rev =  "e61f72fec56ab519d74ebd396cd3fcf31b084558";
-      sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g";
+      rev =  "bb8bae16c5550f2aeef3151259a1b36078a0e544";
+      sha256 = "1f1n4dh9w2qfs704yw8nhbv50n6f9fxy8ndir96l37lnwd2dvj8p";
     };
   }
   {
@@ -473,8 +482,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev =  "8048a2e9c5773235122027dd585cf821b2af1249";
-      sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29";
+      rev =  "071446942108a03a13cf0717275ad3bdbcb691b4";
+      sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp";
     };
   }
   {
@@ -522,15 +531,6 @@
       sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
     };
   }
-  {
-    goPackagePath  = "github.com/spf13/viper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/viper";
-      rev =  "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
-      sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
-    };
-  }
   {
     goPackagePath  = "github.com/stretchr/testify";
     fetch = {
@@ -572,8 +572,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev =  "95c6576299259db960f6c5b9b69ea52422860fce";
-      sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316";
+      rev =  "a9d3bda3a223baa6bba6ef412cb273f0fd163c05";
+      sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9";
     };
   }
   {
@@ -617,8 +617,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/zorkian/go-datadog-api";
-      rev =  "6c08e2322af96e867e5715aedd6ea194c42cf44f";
-      sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw";
+      rev =  "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a";
+      sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk";
     };
   }
   {
diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
index 7541eee0a20e..b5010c28cb51 100644
--- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix
@@ -2,15 +2,14 @@
 
 buildGoPackage rec {
   name = "datadog-process-agent-${version}";
-  # NOTE: this is 6.5.0 + https://github.com/DataDog/datadog-process-agent/pull/185
-  version = "6.5.0";
+  version = "6.10.0";
   owner   = "DataDog";
   repo    = "datadog-process-agent";
 
   src = fetchFromGitHub {
     inherit owner repo;
-    rev    = "bd96c99c97e8639fd3ea72e61a492c0a74686abe";
-    sha256 = "0afdf344256jivzhdv3k9n9i4aik1yr805dnrc2i3d4di9w8vg8c";
+    rev    = "${version}";
+    sha256 = "16lr1gp6n0aph8zikk5kmaib9i5b1jbndxlxfi84bd9f8lhvmkhk";
   };
 
   goDeps = ./datadog-process-agent-deps.nix;
diff --git a/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix b/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix
deleted file mode 100644
index a51cf1839930..000000000000
--- a/pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "github.com/DataDog/datadog-agent";
-    fetch = {
-      type = "git";
-      url = "https://github.com/DataDog/datadog-agent";
-      rev =  "92733ff01547103d5286afc9e272d501cb18f761";
-      sha256 = "1mmb7gyin6c4l6pj0nw3kpmj8wvjm7c8n4h5frv26bhg84m15xhd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/DataDog/datadog-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/DataDog/datadog-go";
-      rev =  "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d";
-      sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki";
-    };
-  }
-  {
-    goPackagePath  = "github.com/StackExchange/wmi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/StackExchange/wmi";
-      rev =  "ea383cf3ba6ec950874b8486cd72356d007c768f";
-      sha256 = "1x3a3rdxccrzrnkld67p9ilm086v4w195rdhyw0bq39x1v1vzbln";
-    };
-  }
-  {
-    goPackagePath  = "github.com/cihub/seelog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cihub/seelog";
-      rev =  "d2c6e5aa9fbfdd1c624e140287063c7730654115";
-      sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p";
-    };
-  }
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-ini/ini";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-ini/ini";
-      rev =  "74bdc99692c3408cb103221e38675ce8fda0a718";
-      sha256 = "0ad93rznilmd1hw20nlkr7ywi3sbd299mynf4db20k5yl34r3498";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-ole/go-ole";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-ole/go-ole";
-      rev =  "de8695c8edbf8236f30d6e1376e20b198a028d42";
-      sha256 = "084caxl71v8lgg475whj2pz9mij3wk3gpbh3pfyf2dm66b6xrq2k";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev =  "d76fbc1373015ced59b43ac267f28d546b955683";
-      sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "1e59b77b52bf8e4b449a57e6f79f21226d571845";
-      sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
-    };
-  }
-  {
-    goPackagePath  = "github.com/philhofer/fwd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/philhofer/fwd";
-      rev =  "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
-      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/shirou/gopsutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shirou/gopsutil";
-      rev =  "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58";
-      sha256 = "04qbzj7r7ahq6s407lh9rb3xagbnaj5wp79siq49qkiz3101kfdb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/shirou/w32";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shirou/w32";
-      rev =  "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
-      sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "12b6f73e6084dad08a7c6e575284b177ecafbc71";
-      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tinylib/msgp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tinylib/msgp";
-      rev =  "362bfb3384d53ae4d5dd745983a4d70b6d23628c";
-      sha256 = "0b39cp417ndznkfwdqcbh89f9x3ml4rn7kf4l4als7vqrrwk7vrz";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9";
-      sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-yaml/yaml";
-      rev =  "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
-      sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
-    };
-  }
-]
\ No newline at end of file
diff --git a/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix b/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix
deleted file mode 100644
index bdd3491ed18f..000000000000
--- a/pkgs/tools/networking/dd-agent/datadog-trace-agent.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, buildGoPackage  }:
-
-buildGoPackage rec {
-  name = "datadog-trace-agent-${version}";
-  version = "6.5.0";
-  owner   = "DataDog";
-  repo    = "datadog-trace-agent";
-
-  src = fetchFromGitHub {
-    inherit owner repo;
-    rev    = "6.5.0";
-    sha256 = "0xhhcdridilhdwpmr9h3cqg5w4fh87l1jhvzg34k30gdh0g81afw";
-  };
-
-  goDeps = ./datadog-trace-agent-deps.nix;
-  goPackagePath = "github.com/${owner}/${repo}";
-
-  meta = with stdenv.lib; {
-    description = "Live trace collector for the DataDog Agent v6";
-    homepage    = https://www.datadoghq.com;
-    license     = licenses.bsd3;
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ rob ];
-  };
-}
diff --git a/pkgs/tools/networking/dd-agent/deps.nix b/pkgs/tools/networking/dd-agent/deps.nix
index cd26e3c6873a..5da6741c6407 100644
--- a/pkgs/tools/networking/dd-agent/deps.nix
+++ b/pkgs/tools/networking/dd-agent/deps.nix
@@ -3,9 +3,9 @@
   {
     goPackagePath  = "bitbucket.org/ww/goautoneg";
     fetch = {
-      type = "hg";
-      url = "https://bitbucket.org/ww/goautoneg";
-      rev =  "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
+      type = "git";
+      url = "https://github.com/adjust/goautoneg";
+      rev =  "d788f35a0315672bc90f50a6145d1252a230ee0d";
       sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
     };
   }
@@ -18,13 +18,22 @@
       sha256 = "0wva55yz5gs5gw23icz1z23hwhjw5vmijx4aa3fp3bq6pi63s873";
     };
   }
+  {
+    goPackagePath  = "github.com/DataDog/datadog-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/datadog-go";
+      rev =  "e67964b4021ad3a334e748e8811eb3cd6becbc6e";
+      sha256 = "1b2dzyk9c9icdwcyfiwh3djzh8gb5z4hmhp796ns7hh72cdnnys1";
+    };
+  }
   {
     goPackagePath  = "github.com/DataDog/gohai";
     fetch = {
       type = "git";
       url = "https://github.com/DataDog/gohai";
-      rev =  "508b4f7bfc834501c944ab00e99b6f0e760f5ea7";
-      sha256 = "0qnhckvj3sk9rwc3dxz48zhx5p8ajg71azhi3y1l7ac6ayzpsc7f";
+      rev =  "bc98f936c76570e79c1c7e739425ff22ab2ee4a3";
+      sha256 = "1r59b6qpjnv399hm6pqfklm47hapkjwy9cp92frb3mhfz0wf9djl";
     };
   }
   {
@@ -36,6 +45,15 @@
       sha256 = "09jgzxi08pkxllxk3f5qwipz96jxrw5v035fj2bkid1d4akn8y0b";
     };
   }
+  {
+    goPackagePath  = "github.com/DataDog/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/viper";
+      rev =  "23ced3bc6b3751855704445e48da2c53075ade86";
+      sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m";
+    };
+  }
   {
     goPackagePath  = "github.com/DataDog/zstd";
     fetch = {
@@ -54,6 +72,15 @@
       sha256 = "1m3ajjwpdmbzhn5iclhzgyknfncw06fnd5n91yxlf75qsq235rz3";
     };
   }
+  {
+    goPackagePath  = "github.com/Microsoft/hcsshim";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Microsoft/hcsshim";
+      rev =  "0acf63599bff447edf6bbfb8bbb38cb5fb33aa1e";
+      sha256 = "009jx133302pj0jf1bxsj4r5zy7j0lxmr7l53czi7930516b0rh3";
+    };
+  }
   {
     goPackagePath  = "github.com/NYTimes/gziphandler";
     fetch = {
@@ -144,6 +171,60 @@
       sha256 = "1cb7kib79xrzr8n91p6kskmn30ayqrhbqql2ppyf879967wbm8qy";
     };
   }
+  {
+    goPackagePath  = "github.com/containerd/cgroups";
+    fetch = {
+      type = "git";
+      url = "https://github.com/containerd/cgroups";
+      rev =  "3024bc7cc0c88af4b32d38a14444f38e65ab169f";
+      sha256 = "09jmzwl0zjzwhyd77pp8x3xwihcjxlxa9wamkx22rvd1pqlgszw7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/containerd/containerd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/containerd/containerd";
+      rev =  "9754871865f7fe2f4e74d43e2fc7ccd237edcbce";
+      sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya";
+    };
+  }
+  {
+    goPackagePath  = "github.com/containerd/continuity";
+    fetch = {
+      type = "git";
+      url = "https://github.com/containerd/continuity";
+      rev =  "c7c5070e6f6e090ab93b0a61eb921f2196fc3383";
+      sha256 = "0xyf9w4xn501jspl4r6ml84am90bfgljnjlbd4i1pxkm372qzvzf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/containerd/cri";
+    fetch = {
+      type = "git";
+      url = "https://github.com/containerd/cri";
+      rev =  "f3687c59470b76ee57c90d4b3dd92888dec58c2b";
+      sha256 = "00lasx5yylmgsj1f9znl3xyxm2bngj4xfj69vcwb4qzdy0vclc7w";
+    };
+  }
+  {
+    goPackagePath  = "github.com/containerd/fifo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/containerd/fifo";
+      rev =  "3d5202aec260678c48179c56f40e6f38a095738c";
+      sha256 = "11jp12vgfj0xg9m2w5cfay72fwrxb6w8za7rkcqw8yy8hypiqqxq";
+    };
+  }
+  {
+    goPackagePath  = "github.com/containerd/typeurl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/containerd/typeurl";
+      rev =  "a93fcdb778cd272c6e9b3028b2f42d813e785d40";
+      sha256 = "0aqnf5rzc5pldln0czhxlr0fqaf5553ab7wzsq85p90lg1ryqnd6";
+    };
+  }
   {
     goPackagePath  = "github.com/coreos/etcd";
     fetch = {
@@ -194,8 +275,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/docker/distribution";
-      rev =  "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89";
-      sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
+      rev =  "83389a148052d74ac602f5f1d62f86ff2f3c4aa5";
+      sha256 = "0ypps7340k1g1njcdbn83c9233hrki0mxyj66av1i55ji378ayyn";
     };
   }
   {
@@ -216,6 +297,15 @@
       sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
     };
   }
+  {
+    goPackagePath  = "github.com/docker/go-events";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/go-events";
+      rev =  "9461782956ad83b30282bf90e31fa6a70c255ba9";
+      sha256 = "0vn0kd0w253jwdk86gv1h6s8p6bzxiyif74xdzlb39zr6fdrr145";
+    };
+  }
   {
     goPackagePath  = "github.com/docker/go-units";
     fetch = {
@@ -225,6 +315,15 @@
       sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
     };
   }
+  {
+    goPackagePath  = "github.com/docker/spdystream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/docker/spdystream";
+      rev =  "bc6354cbbc295e925e4c611ffe90c1f287ee54db";
+      sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya";
+    };
+  }
   {
     goPackagePath  = "github.com/dsnet/compress";
     fetch = {
@@ -369,6 +468,24 @@
       sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418";
     };
   }
+  {
+    goPackagePath  = "github.com/godbus/dbus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/godbus/dbus";
+      rev =  "a389bdde4dd695d414e47b755e95e72b7826432c";
+      sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gogo/googleapis";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/googleapis";
+      rev =  "08a7655d27152912db7aaf4f983275eaf8d128ef";
+      sha256 = "0mzjclx31hkdgad0xjdihz23qphrsljkvzx5gnwn96m7agx6vkvr";
+    };
+  }
   {
     goPackagePath  = "github.com/gogo/protobuf";
     fetch = {
@@ -414,6 +531,15 @@
       sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
     };
   }
+  {
+    goPackagePath  = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev =  "4030bb1f1f0c35b30ca7009e9ebd06849dd45306";
+      sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+    };
+  }
   {
     goPackagePath  = "github.com/google/gofuzz";
     fetch = {
@@ -450,6 +576,15 @@
       sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
     };
   }
+  {
+    goPackagePath  = "github.com/gregjones/httpcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gregjones/httpcache";
+      rev =  "9cad4c3443a7200dd6400aef47183728de563a38";
+      sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s";
+    };
+  }
   {
     goPackagePath  = "github.com/hashicorp/consul";
     fetch = {
@@ -513,15 +648,6 @@
       sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630";
     };
   }
-  {
-    goPackagePath  = "github.com/howeyc/gopass";
-    fetch = {
-      type = "git";
-      url = "https://github.com/howeyc/gopass";
-      rev =  "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
-      sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
-    };
-  }
   {
     goPackagePath  = "github.com/imdario/mergo";
     fetch = {
@@ -554,8 +680,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/json-iterator/go";
-      rev =  "f2b4162afba35581b6d4a50d3b8f34e33c144682";
-      sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
+      rev =  "1624edc4454b8682399def8740d46db5e4362ba4";
+      sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s";
     };
   }
   {
@@ -581,8 +707,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
-      rev =  "e61f72fec56ab519d74ebd396cd3fcf31b084558";
-      sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g";
+      rev =  "85ebc283a57287a8fcb3ad4b488d633cd63ef7d8";
+      sha256 = "06m3xa9j46035bagv9r2ghsmdx6pr0r3lcj4hz1cx943dllj0n6v";
     };
   }
   {
@@ -711,6 +837,42 @@
       sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw";
     };
   }
+  {
+    goPackagePath  = "github.com/opencontainers/go-digest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/go-digest";
+      rev =  "279bed98673dd5bef374d3b6e4b09e2af76183bf";
+      sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opencontainers/image-spec";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/image-spec";
+      rev =  "d60099175f88c47cd379c4738d158884749ed235";
+      sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opencontainers/runc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/runc";
+      rev =  "baf6536d6259209c3edfa2b22237af82942d3dfa";
+      sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/opencontainers/runtime-spec";
+    fetch = {
+      type = "git";
+      url = "https://github.com/opencontainers/runtime-spec";
+      rev =  "d810dbc60d8c5aeeb3d054bd1132fab2121968ce";
+      sha256 = "0yqya0wslhv87nlidsmrw2720y3r3jpvqc2sh28y79ciyypxbk38";
+    };
+  }
   {
     goPackagePath  = "github.com/openshift/api";
     fetch = {
@@ -747,6 +909,33 @@
       sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
     };
   }
+  {
+    goPackagePath  = "github.com/petar/GoLLRB";
+    fetch = {
+      type = "git";
+      url = "https://github.com/petar/GoLLRB";
+      rev =  "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
+      sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
+    };
+  }
+  {
+    goPackagePath  = "github.com/peterbourgon/diskv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/peterbourgon/diskv";
+      rev =  "5f041e8faa004a95c88a202771f4cc3e991971e6";
+      sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev =  "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
+      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+    };
+  }
   {
     goPackagePath  = "github.com/pierrec/lz4";
     fetch = {
@@ -797,8 +986,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev =  "7600349dcfe1abd18d72d3a1770870d9800a7801";
-      sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
+      rev =  "89d80287644767070914e30199b4d959e491bd3d";
+      sha256 = "0nvbjr8nhkyakgjariskl3bvyb18723dzjmmxph6ppf4khi50j0w";
     };
   }
   {
@@ -833,8 +1022,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev =  "eeb1d38d69593f121e060d24d17f7b1f0936b203";
-      sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w";
+      rev =  "ccc1c1016bc5d10e803189ee43417c50cdde7f1b";
+      sha256 = "0dk7644fc86n0974a00m2w5nbhzcgs1jjnillic90044w7rycg66";
     };
   }
   {
@@ -846,6 +1035,15 @@
       sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
     };
   }
+  {
+    goPackagePath  = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev =  "3e01752db0189b9157070a0e1668a620f9a85da2";
+      sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c";
+    };
+  }
   {
     goPackagePath  = "github.com/spf13/afero";
     fetch = {
@@ -891,15 +1089,6 @@
       sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
     };
   }
-  {
-    goPackagePath  = "github.com/DataDog/viper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/DataDog/viper";
-      rev =  "23ced3bc6b3751855704445e48da2c53075ade86";
-      sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m";
-    };
-  }
   {
     goPackagePath  = "github.com/stretchr/objx";
     fetch = {
@@ -918,6 +1107,24 @@
       sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
     };
   }
+  {
+    goPackagePath  = "github.com/syndtr/gocapability";
+    fetch = {
+      type = "git";
+      url = "https://github.com/syndtr/gocapability";
+      rev =  "33e07d32887e1e06b7c025f27ce52f62c7990bc0";
+      sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev =  "af6442a0fcf6e2a1b824f70dd0c734f01e817751";
+      sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff";
+    };
+  }
   {
     goPackagePath  = "github.com/ugorji/go";
     fetch = {
@@ -954,6 +1161,15 @@
       sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
     };
   }
+  {
+    goPackagePath  = "golang.org/x/mobile";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mobile";
+      rev =  "bceb7ef27cc623473a5b664d2a3450576dddff0f";
+      sha256 = "0xky2417wm61j2p5ki3k4237fxyz8f5ds19nak0lm741s3xs2rqx";
+    };
+  }
   {
     goPackagePath  = "golang.org/x/net";
     fetch = {
@@ -963,6 +1179,15 @@
       sha256 = "1738bi8l50f0iq0il6h4qy1cgy39yh3q4gh1lwp5y5j7jyy33ccd";
     };
   }
+  {
+    goPackagePath  = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev =  "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
   {
     goPackagePath  = "golang.org/x/sys";
     fetch = {
@@ -1035,6 +1260,15 @@
       sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d";
     };
   }
+  {
+    goPackagePath  = "gopkg.in/square/go-jose.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/square/go-jose";
+      rev =  "ef984e69dd356202fd4e4910d4d9c24468bdf0b8";
+      sha256 = "0pxyrygc9mh6yn169rm6i3shax7zmmzps22px6mq3kl87zkk9b8h";
+    };
+  }
   {
     goPackagePath  = "gopkg.in/yaml.v2";
     fetch = {
@@ -1049,8 +1283,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/zorkian/go-datadog-api";
-      rev =  "6c08e2322af96e867e5715aedd6ea194c42cf44f";
-      sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw";
+      rev =  "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a";
+      sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk";
     };
   }
   {
@@ -1058,8 +1292,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/api";
-      rev =  "9e5ffd1f1320950b238cfce291b926411f0af722";
-      sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf";
+      rev =  "4e7be11eab3ffcfc1876898b8272df53785a9504";
+      sha256 = "0klwmkvsnim66y8mvcmkqql12fbr5cja4qgjzp36197i6i335b62";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/apiextensions-apiserver";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/apiextensions-apiserver";
+      rev =  "b499623aa7a31f7c85b37017e068b21206a68e25";
+      sha256 = "1c0z71f0wqkwkc5x730l9gmzibkqk6af4mg5l6ks9lk69cbpxk0a";
     };
   }
   {
@@ -1067,8 +1310,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/apimachinery";
-      rev =  "e386b2658ed20923da8cc9250e552f082899a1ee";
-      sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz";
+      rev =  "def12e63c512da17043b4f0293f52d1006603d9f";
+      sha256 = "0dghch5avwcy3zx5k005hi71i9bl3603pk927xdjr5jlajzwm9xd";
     };
   }
   {
@@ -1076,8 +1319,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/apiserver";
-      rev =  "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3";
-      sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg";
+      rev =  "d296c96c12b7d15d7fb5fea7a05fb165f8fd4014";
+      sha256 = "0a413zpkm8afhh0jab8zrwvd61kvackll85kcdb6gyinw7f6qv7x";
     };
   }
   {
@@ -1085,8 +1328,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/client-go";
-      rev =  "23781f4d6632d88e869066eaebb743857aa1ef9b";
-      sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v";
+      rev =  "f2f85107cac6fe04c30435ca0ac0c3318fd1b94c";
+      sha256 = "153a3q172kmpbp6cq5005dgasdw0x36pg9xz1mfgv966k8rwws74";
     };
   }
   {
@@ -1098,13 +1341,31 @@
       sha256 = "13ik6dri0f9fzs8p6987h6n3y2aqjz5cj957826xwkpv4fj2zgq8";
     };
   }
+  {
+    goPackagePath  = "k8s.io/kubernetes";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/kubernetes";
+      rev =  "bb9ffb1654d4a729bb4cec18ff088eacc153c239";
+      sha256 = "0c5xpxg7ns5irrr0ydk8n394yp3922i0m61l26qyc183phr32wxi";
+    };
+  }
   {
     goPackagePath  = "k8s.io/metrics";
     fetch = {
       type = "git";
       url = "https://github.com/kubernetes/metrics";
-      rev =  "0d9ea2ac660031c8f2726a735dda29441f396f99";
-      sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
+      rev =  "972ef826b8401c180b89cefc7457daa2d116daa9";
+      sha256 = "0ba9mfy253d4pcqdvialh2shs4d43l0q84pn3569wiib8cisbc68";
+    };
+  }
+  {
+    goPackagePath  = "k8s.io/utils";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kubernetes/utils";
+      rev =  "cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb";
+      sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk";
     };
   }
 ]
diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index e466be816e43..edf7a8faaf86 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -75,7 +75,7 @@ let
     mongo    = (ps: [ ps.pymongo ]);
     network  = (ps: [ ps.psutil ]);
     nginx    = (ps: []);
-    postgres = (ps: with ps; [ pg8000 psycopg2 ]);
+    postgres = (ps: with ps; [ pg8000_1_12 psycopg2 ]);
   };
 
   # All integrations (default + extra):
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1375f53ad6d4..91f9aaf23b30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16593,7 +16593,6 @@ in
     pythonPackages = datadog-integrations-core {};
   };
   datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
-  datadog-trace-agent = callPackage ../tools/networking/dd-agent/datadog-trace-agent.nix { };
   datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
     python = python27;
     extraIntegrations = extras;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99b2dc5ac384..7d213e148633 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3548,6 +3548,7 @@ in {
   periodictable = callPackage ../development/python-modules/periodictable { };
 
   pg8000 = callPackage ../development/python-modules/pg8000 { };
+  pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { };
 
   pgsanity = callPackage ../development/python-modules/pgsanity { };