git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #56567 from Izorkin/datadog-agent

datadog-agent: update go packages and sub-packages

commit51fdca9cad1e627d127dd1274798d2b4a2ad8326 authorWael Nasreddine <wael.nasreddine@gmail.com> dateTue 5 Mar 2019, 16:59 (8 years ago) parent5cc74fca8c2705
12 files changed+376−270
nixos/modules/services/monitoring/datadog-agent.nix+1−1 pkgs/development/python-modules/pg8000/1_12.nix+27 pkgs/development/python-modules/pg8000/default.nix+1−1 pkgs/tools/networking/dd-agent/6.nix+2−2 pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix+34−34 pkgs/tools/networking/dd-agent/datadog-process-agent.nix+3−4 pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nix−156 pkgs/tools/networking/dd-agent/datadog-trace-agent.nix−25 pkgs/tools/networking/dd-agent/deps.nix+306−45 pkgs/tools/networking/dd-agent/integrations-core.nix+1−1 pkgs/top-level/all-packages.nix−1 pkgs/top-level/python-packages.nix+1
nixos/modules/services/monitoring/datadog-agent.nix+1−1
@@ -260,7 +260,7 @@ in {
260260 path = [ ];
261261 script = ''
262262 export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
263− ${pkgs.datadog-trace-agent}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml
263+ ${datadogPkg}/bin/trace-agent -config /etc/datadog-agent/datadog.yaml
264264 '';
265265 });
266266
pkgs/development/python-modules/pg8000/1_12.nixnew file+27
@@ -0,0 +1,27 @@
1+{ stdenv
2+, buildPythonPackage
3+, fetchPypi
4+, pytz
5+, six
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "pg8000";
10+ version = "1.12.5";
11+
12+ src = fetchPypi {
13+ inherit pname version;
14+ sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx";
15+ };
16+
17+ propagatedBuildInputs = [ pytz six ];
18+
19+ meta = with stdenv.lib; {
20+ homepage = https://github.com/tlocke/pg8000;
21+ description = "PostgreSQL interface library, for asyncio";
22+ maintainers = with maintainers; [ garbas domenkozar ];
23+ platforms = platforms.unix;
24+ };
25+
26+}
27+
pkgs/development/python-modules/pg8000/default.nix+1−1
@@ -17,7 +17,7 @@ buildPythonPackage rec {
1717 propagatedBuildInputs = [ pytz six ];
1818
1919 meta = with stdenv.lib; {
20− homepage = https://github.com/mfenniak/pg8000;
20+ homepage = https://github.com/tlocke/pg8000;
2121 description = "PostgreSQL interface library, for asyncio";
2222 maintainers = with maintainers; [ garbas domenkozar ];
2323 platforms = platforms.unix;
pkgs/tools/networking/dd-agent/6.nix+2−2
@@ -18,10 +18,10 @@ in buildGoPackage rec {
1818
1919 subPackages = [
2020 "cmd/agent"
21+ "cmd/cluster-agent"
2122 "cmd/dogstatsd"
2223 "cmd/py-launcher"
23− # Does not compile: go/src/github.com/DataDog/datadog-agent/cmd/cluster-agent/main.go:31:12: undefined: app.ClusterAgentCmd
24− #"cmd/cluster-agent"
24+ "cmd/trace-agent"
2525 ];
2626 goDeps = ./deps.nix;
2727 goPackagePath = "github.com/${owner}/${repo}";
pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix+34−34
@@ -3,9 +3,9 @@
33 {
44 goPackagePath = "bitbucket.org/ww/goautoneg";
55 fetch = {
6− type = "hg";
7− url = "https://bitbucket.org/ww/goautoneg";
8− rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
6+ type = "git";
7+ url = "https://github.com/adjust/goautoneg";
8+ rev = "d788f35a0315672bc90f50a6145d1252a230ee0d";
99 sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
1010 };
1111 }
@@ -23,8 +23,8 @@
2323 fetch = {
2424 type = "git";
2525 url = "https://github.com/DataDog/datadog-agent";
26− rev = "f2d7ce69202c8212cae1ebf476d038b28f3a895e";
27− sha256 = "0by3qvj6468r3532x1q6ingf6hlgv4dk8g1aa0hmh9gm25dbfsg5";
26+ rev = "4aa90bd394b62b0d3e3f15703c6e459c1c477fbc";
27+ sha256 = "13zvg8ykakq97bw0kd2gj4s9gfjpx23d3c51w1jpa1raqwhgqi8z";
2828 };
2929 }
3030 {
@@ -41,17 +41,17 @@
4141 fetch = {
4242 type = "git";
4343 url = "https://github.com/DataDog/gopsutil";
44− rev = "771928d86fa878b9d62f073a7a6f91ee0a358105";
45− sha256 = "0dr5a67jy2zh42dcndx981ca1wv0phc16zlimahjlr00qxam90xi";
44+ rev = "c8f74f1344dd41bc49ec4d3c2377c526aaedfd20";
45+ sha256 = "0r8al83apxrq1v6s2mq0p8h3c4z4n5g7ax8vcvs70pq0czy2fvgp";
4646 };
4747 }
4848 {
49− goPackagePath = "github.com/DataDog/tcptracer-bpf";
49+ goPackagePath = "github.com/DataDog/viper";
5050 fetch = {
5151 type = "git";
52− url = "https://github.com/DataDog/tcptracer-bpf";
53− rev = "636ee01a99a4bd352329de98f40fb9fdf611d1c9";
54− sha256 = "13373wg1x90jydzgbblxpq2gg9b7ppk6nkjzhw8d27mxd047i74m";
52+ url = "https://github.com/DataDog/viper";
53+ rev = "23ced3bc6b3751855704445e48da2c53075ade86";
54+ sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m";
5555 };
5656 }
5757 {
@@ -59,8 +59,8 @@
5959 fetch = {
6060 type = "git";
6161 url = "https://github.com/DataDog/zstd";
62− rev = "2bf71ec4836011b92dc78df3b9ace6b40e65f7df";
63− sha256 = "0j0qmnzjxx86kavrb3qcashp2irzjbvip15df97k87pcfvl1gsig";
62+ rev = "2b373cbe6ac0c8e6960bbd18026ceb269eef89f5";
63+ sha256 = "157kh7w173igxbypknmr8hc8934ykmnb02pkb76k1jwq4sphn8qj";
6464 };
6565 }
6666 {
@@ -77,8 +77,8 @@
7777 fetch = {
7878 type = "git";
7979 url = "https://github.com/StackExchange/wmi";
80− rev = "b12b22c5341f0c26d88c4d66176330500e84db68";
81− sha256 = "0kzkb4zllhrdiq0m9m5ka9i393r1hnx75lnd3hz5rg2fs0n3ym16";
80+ rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
81+ sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
8282 };
8383 }
8484 {
@@ -302,8 +302,8 @@
302302 fetch = {
303303 type = "git";
304304 url = "https://github.com/iovisor/gobpf";
305− rev = "3b07770c6d5e2bd37e582ecd49460e6ef094f257";
306− sha256 = "0inv9vwjd8r365rdpf6z4kzs8b36890vrfkifw228mjlxxx8rg7f";
305+ rev = "98ebf56442afb10e1b43145127de3c1777ed7e95";
306+ sha256 = "0m2aah77b1k2yf31za975mcix5n0jijqkqmhgakip00klihx383k";
307307 };
308308 }
309309 {
@@ -324,13 +324,22 @@
324324 sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
325325 };
326326 }
327+ {
328+ goPackagePath = "github.com/kardianos/osext";
329+ fetch = {
330+ type = "git";
331+ url = "https://github.com/kardianos/osext";
332+ rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
333+ sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
334+ };
335+ }
327336 {
328337 goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver";
329338 fetch = {
330339 type = "git";
331340 url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
332− rev = "e61f72fec56ab519d74ebd396cd3fcf31b084558";
333− sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g";
341+ rev = "bb8bae16c5550f2aeef3151259a1b36078a0e544";
342+ sha256 = "1f1n4dh9w2qfs704yw8nhbv50n6f9fxy8ndir96l37lnwd2dvj8p";
334343 };
335344 }
336345 {
@@ -473,8 +482,8 @@
473482 fetch = {
474483 type = "git";
475484 url = "https://github.com/shirou/gopsutil";
476− rev = "8048a2e9c5773235122027dd585cf821b2af1249";
477− sha256 = "17ri1ijhvg6gxscaw4sy0r5pkcyiqdsf6nn2d4q36hd0nrswvk29";
485+ rev = "071446942108a03a13cf0717275ad3bdbcb691b4";
486+ sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp";
478487 };
479488 }
480489 {
@@ -522,15 +531,6 @@
522531 sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
523532 };
524533 }
525− {
526− goPackagePath = "github.com/spf13/viper";
527− fetch = {
528− type = "git";
529− url = "https://github.com/spf13/viper";
530− rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
531− sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
532− };
533− }
534534 {
535535 goPackagePath = "github.com/stretchr/testify";
536536 fetch = {
@@ -572,8 +572,8 @@
572572 fetch = {
573573 type = "git";
574574 url = "https://go.googlesource.com/sys";
575− rev = "95c6576299259db960f6c5b9b69ea52422860fce";
576− sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316";
575+ rev = "a9d3bda3a223baa6bba6ef412cb273f0fd163c05";
576+ sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9";
577577 };
578578 }
579579 {
@@ -617,8 +617,8 @@
617617 fetch = {
618618 type = "git";
619619 url = "https://github.com/zorkian/go-datadog-api";
620− rev = "6c08e2322af96e867e5715aedd6ea194c42cf44f";
621− sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw";
620+ rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a";
621+ sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk";
622622 };
623623 }
624624 {
pkgs/tools/networking/dd-agent/datadog-process-agent.nix+3−4
@@ -2,15 +2,14 @@
22
33buildGoPackage rec {
44 name = "datadog-process-agent-${version}";
5− # NOTE: this is 6.5.0 + https://github.com/DataDog/datadog-process-agent/pull/185
6− version = "6.5.0";
5+ version = "6.10.0";
76 owner = "DataDog";
87 repo = "datadog-process-agent";
98
109 src = fetchFromGitHub {
1110 inherit owner repo;
12− rev = "bd96c99c97e8639fd3ea72e61a492c0a74686abe";
13− sha256 = "0afdf344256jivzhdv3k9n9i4aik1yr805dnrc2i3d4di9w8vg8c";
11+ rev = "${version}";
12+ sha256 = "16lr1gp6n0aph8zikk5kmaib9i5b1jbndxlxfi84bd9f8lhvmkhk";
1413 };
1514
1615 goDeps = ./datadog-process-agent-deps.nix;
pkgs/tools/networking/dd-agent/datadog-trace-agent-deps.nixdeleted−156
@@ -1,156 +0,0 @@
1−# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
2−[
3− {
4− goPackagePath = "github.com/DataDog/datadog-agent";
5− fetch = {
6− type = "git";
7− url = "https://github.com/DataDog/datadog-agent";
8− rev = "92733ff01547103d5286afc9e272d501cb18f761";
9− sha256 = "1mmb7gyin6c4l6pj0nw3kpmj8wvjm7c8n4h5frv26bhg84m15xhd";
10− };
11− }
12− {
13− goPackagePath = "github.com/DataDog/datadog-go";
14− fetch = {
15− type = "git";
16− url = "https://github.com/DataDog/datadog-go";
17− rev = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d";
18− sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki";
19− };
20− }
21− {
22− goPackagePath = "github.com/StackExchange/wmi";
23− fetch = {
24− type = "git";
25− url = "https://github.com/StackExchange/wmi";
26− rev = "ea383cf3ba6ec950874b8486cd72356d007c768f";
27− sha256 = "1x3a3rdxccrzrnkld67p9ilm086v4w195rdhyw0bq39x1v1vzbln";
28− };
29− }
30− {
31− goPackagePath = "github.com/cihub/seelog";
32− fetch = {
33− type = "git";
34− url = "https://github.com/cihub/seelog";
35− rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115";
36− sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p";
37− };
38− }
39− {
40− goPackagePath = "github.com/davecgh/go-spew";
41− fetch = {
42− type = "git";
43− url = "https://github.com/davecgh/go-spew";
44− rev = "346938d642f2ec3594ed81d874461961cd0faa76";
45− sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
46− };
47− }
48− {
49− goPackagePath = "github.com/go-ini/ini";
50− fetch = {
51− type = "git";
52− url = "https://github.com/go-ini/ini";
53− rev = "74bdc99692c3408cb103221e38675ce8fda0a718";
54− sha256 = "0ad93rznilmd1hw20nlkr7ywi3sbd299mynf4db20k5yl34r3498";
55− };
56− }
57− {
58− goPackagePath = "github.com/go-ole/go-ole";
59− fetch = {
60− type = "git";
61− url = "https://github.com/go-ole/go-ole";
62− rev = "de8695c8edbf8236f30d6e1376e20b198a028d42";
63− sha256 = "084caxl71v8lgg475whj2pz9mij3wk3gpbh3pfyf2dm66b6xrq2k";
64− };
65− }
66− {
67− goPackagePath = "github.com/gogo/protobuf";
68− fetch = {
69− type = "git";
70− url = "https://github.com/gogo/protobuf";
71− rev = "d76fbc1373015ced59b43ac267f28d546b955683";
72− sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0";
73− };
74− }
75− {
76− goPackagePath = "github.com/golang/protobuf";
77− fetch = {
78− type = "git";
79− url = "https://github.com/golang/protobuf";
80− rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
81− sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
82− };
83− }
84− {
85− goPackagePath = "github.com/philhofer/fwd";
86− fetch = {
87− type = "git";
88− url = "https://github.com/philhofer/fwd";
89− rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
90− sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
91− };
92− }
93− {
94− goPackagePath = "github.com/pmezard/go-difflib";
95− fetch = {
96− type = "git";
97− url = "https://github.com/pmezard/go-difflib";
98− rev = "792786c7400a136282c1664665ae0a8db921c6c2";
99− sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
100− };
101− }
102− {
103− goPackagePath = "github.com/shirou/gopsutil";
104− fetch = {
105− type = "git";
106− url = "https://github.com/shirou/gopsutil";
107− rev = "70a1b78fe69202d93d6718fc9e3a4d6f81edfd58";
108− sha256 = "04qbzj7r7ahq6s407lh9rb3xagbnaj5wp79siq49qkiz3101kfdb";
109− };
110− }
111− {
112− goPackagePath = "github.com/shirou/w32";
113− fetch = {
114− type = "git";
115− url = "https://github.com/shirou/w32";
116− rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
117− sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
118− };
119− }
120− {
121− goPackagePath = "github.com/stretchr/testify";
122− fetch = {
123− type = "git";
124− url = "https://github.com/stretchr/testify";
125− rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
126− sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
127− };
128− }
129− {
130− goPackagePath = "github.com/tinylib/msgp";
131− fetch = {
132− type = "git";
133− url = "https://github.com/tinylib/msgp";
134− rev = "362bfb3384d53ae4d5dd745983a4d70b6d23628c";
135− sha256 = "0b39cp417ndznkfwdqcbh89f9x3ml4rn7kf4l4als7vqrrwk7vrz";
136− };
137− }
138− {
139− goPackagePath = "golang.org/x/sys";
140− fetch = {
141− type = "git";
142− url = "https://go.googlesource.com/sys";
143− rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9";
144− sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr";
145− };
146− }
147− {
148− goPackagePath = "gopkg.in/yaml.v2";
149− fetch = {
150− type = "git";
151− url = "https://github.com/go-yaml/yaml";
152− rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
153− sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
154− };
155− }
156−]
pkgs/tools/networking/dd-agent/datadog-trace-agent.nixdeleted−25
@@ -1,25 +0,0 @@
1−{ stdenv, fetchFromGitHub, buildGoPackage }:
2−
3−buildGoPackage rec {
4− name = "datadog-trace-agent-${version}";
5− version = "6.5.0";
6− owner = "DataDog";
7− repo = "datadog-trace-agent";
8−
9− src = fetchFromGitHub {
10− inherit owner repo;
11− rev = "6.5.0";
12− sha256 = "0xhhcdridilhdwpmr9h3cqg5w4fh87l1jhvzg34k30gdh0g81afw";
13− };
14−
15− goDeps = ./datadog-trace-agent-deps.nix;
16− goPackagePath = "github.com/${owner}/${repo}";
17−
18− meta = with stdenv.lib; {
19− description = "Live trace collector for the DataDog Agent v6";
20− homepage = https://www.datadoghq.com;
21− license = licenses.bsd3;
22− platforms = platforms.all;
23− maintainers = with maintainers; [ rob ];
24− };
25−}
pkgs/tools/networking/dd-agent/deps.nix+306−45
@@ -3,9 +3,9 @@
33 {
44 goPackagePath = "bitbucket.org/ww/goautoneg";
55 fetch = {
6− type = "hg";
7− url = "https://bitbucket.org/ww/goautoneg";
8− rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
6+ type = "git";
7+ url = "https://github.com/adjust/goautoneg";
8+ rev = "d788f35a0315672bc90f50a6145d1252a230ee0d";
99 sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
1010 };
1111 }
@@ -18,13 +18,22 @@
1818 sha256 = "0wva55yz5gs5gw23icz1z23hwhjw5vmijx4aa3fp3bq6pi63s873";
1919 };
2020 }
21+ {
22+ goPackagePath = "github.com/DataDog/datadog-go";
23+ fetch = {
24+ type = "git";
25+ url = "https://github.com/DataDog/datadog-go";
26+ rev = "e67964b4021ad3a334e748e8811eb3cd6becbc6e";
27+ sha256 = "1b2dzyk9c9icdwcyfiwh3djzh8gb5z4hmhp796ns7hh72cdnnys1";
28+ };
29+ }
2130 {
2231 goPackagePath = "github.com/DataDog/gohai";
2332 fetch = {
2433 type = "git";
2534 url = "https://github.com/DataDog/gohai";
26− rev = "508b4f7bfc834501c944ab00e99b6f0e760f5ea7";
27− sha256 = "0qnhckvj3sk9rwc3dxz48zhx5p8ajg71azhi3y1l7ac6ayzpsc7f";
35+ rev = "bc98f936c76570e79c1c7e739425ff22ab2ee4a3";
36+ sha256 = "1r59b6qpjnv399hm6pqfklm47hapkjwy9cp92frb3mhfz0wf9djl";
2837 };
2938 }
3039 {
@@ -36,6 +45,15 @@
3645 sha256 = "09jgzxi08pkxllxk3f5qwipz96jxrw5v035fj2bkid1d4akn8y0b";
3746 };
3847 }
48+ {
49+ goPackagePath = "github.com/DataDog/viper";
50+ fetch = {
51+ type = "git";
52+ url = "https://github.com/DataDog/viper";
53+ rev = "23ced3bc6b3751855704445e48da2c53075ade86";
54+ sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m";
55+ };
56+ }
3957 {
4058 goPackagePath = "github.com/DataDog/zstd";
4159 fetch = {
@@ -54,6 +72,15 @@
5472 sha256 = "1m3ajjwpdmbzhn5iclhzgyknfncw06fnd5n91yxlf75qsq235rz3";
5573 };
5674 }
75+ {
76+ goPackagePath = "github.com/Microsoft/hcsshim";
77+ fetch = {
78+ type = "git";
79+ url = "https://github.com/Microsoft/hcsshim";
80+ rev = "0acf63599bff447edf6bbfb8bbb38cb5fb33aa1e";
81+ sha256 = "009jx133302pj0jf1bxsj4r5zy7j0lxmr7l53czi7930516b0rh3";
82+ };
83+ }
5784 {
5885 goPackagePath = "github.com/NYTimes/gziphandler";
5986 fetch = {
@@ -144,6 +171,60 @@
144171 sha256 = "1cb7kib79xrzr8n91p6kskmn30ayqrhbqql2ppyf879967wbm8qy";
145172 };
146173 }
174+ {
175+ goPackagePath = "github.com/containerd/cgroups";
176+ fetch = {
177+ type = "git";
178+ url = "https://github.com/containerd/cgroups";
179+ rev = "3024bc7cc0c88af4b32d38a14444f38e65ab169f";
180+ sha256 = "09jmzwl0zjzwhyd77pp8x3xwihcjxlxa9wamkx22rvd1pqlgszw7";
181+ };
182+ }
183+ {
184+ goPackagePath = "github.com/containerd/containerd";
185+ fetch = {
186+ type = "git";
187+ url = "https://github.com/containerd/containerd";
188+ rev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce";
189+ sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya";
190+ };
191+ }
192+ {
193+ goPackagePath = "github.com/containerd/continuity";
194+ fetch = {
195+ type = "git";
196+ url = "https://github.com/containerd/continuity";
197+ rev = "c7c5070e6f6e090ab93b0a61eb921f2196fc3383";
198+ sha256 = "0xyf9w4xn501jspl4r6ml84am90bfgljnjlbd4i1pxkm372qzvzf";
199+ };
200+ }
201+ {
202+ goPackagePath = "github.com/containerd/cri";
203+ fetch = {
204+ type = "git";
205+ url = "https://github.com/containerd/cri";
206+ rev = "f3687c59470b76ee57c90d4b3dd92888dec58c2b";
207+ sha256 = "00lasx5yylmgsj1f9znl3xyxm2bngj4xfj69vcwb4qzdy0vclc7w";
208+ };
209+ }
210+ {
211+ goPackagePath = "github.com/containerd/fifo";
212+ fetch = {
213+ type = "git";
214+ url = "https://github.com/containerd/fifo";
215+ rev = "3d5202aec260678c48179c56f40e6f38a095738c";
216+ sha256 = "11jp12vgfj0xg9m2w5cfay72fwrxb6w8za7rkcqw8yy8hypiqqxq";
217+ };
218+ }
219+ {
220+ goPackagePath = "github.com/containerd/typeurl";
221+ fetch = {
222+ type = "git";
223+ url = "https://github.com/containerd/typeurl";
224+ rev = "a93fcdb778cd272c6e9b3028b2f42d813e785d40";
225+ sha256 = "0aqnf5rzc5pldln0czhxlr0fqaf5553ab7wzsq85p90lg1ryqnd6";
226+ };
227+ }
147228 {
148229 goPackagePath = "github.com/coreos/etcd";
149230 fetch = {
@@ -194,8 +275,8 @@
194275 fetch = {
195276 type = "git";
196277 url = "https://github.com/docker/distribution";
197− rev = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89";
198− sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
278+ rev = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5";
279+ sha256 = "0ypps7340k1g1njcdbn83c9233hrki0mxyj66av1i55ji378ayyn";
199280 };
200281 }
201282 {
@@ -216,6 +297,15 @@
216297 sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
217298 };
218299 }
300+ {
301+ goPackagePath = "github.com/docker/go-events";
302+ fetch = {
303+ type = "git";
304+ url = "https://github.com/docker/go-events";
305+ rev = "9461782956ad83b30282bf90e31fa6a70c255ba9";
306+ sha256 = "0vn0kd0w253jwdk86gv1h6s8p6bzxiyif74xdzlb39zr6fdrr145";
307+ };
308+ }
219309 {
220310 goPackagePath = "github.com/docker/go-units";
221311 fetch = {
@@ -225,6 +315,15 @@
225315 sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
226316 };
227317 }
318+ {
319+ goPackagePath = "github.com/docker/spdystream";
320+ fetch = {
321+ type = "git";
322+ url = "https://github.com/docker/spdystream";
323+ rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db";
324+ sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya";
325+ };
326+ }
228327 {
229328 goPackagePath = "github.com/dsnet/compress";
230329 fetch = {
@@ -369,6 +468,24 @@
369468 sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418";
370469 };
371470 }
471+ {
472+ goPackagePath = "github.com/godbus/dbus";
473+ fetch = {
474+ type = "git";
475+ url = "https://github.com/godbus/dbus";
476+ rev = "a389bdde4dd695d414e47b755e95e72b7826432c";
477+ sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9";
478+ };
479+ }
480+ {
481+ goPackagePath = "github.com/gogo/googleapis";
482+ fetch = {
483+ type = "git";
484+ url = "https://github.com/gogo/googleapis";
485+ rev = "08a7655d27152912db7aaf4f983275eaf8d128ef";
486+ sha256 = "0mzjclx31hkdgad0xjdihz23qphrsljkvzx5gnwn96m7agx6vkvr";
487+ };
488+ }
372489 {
373490 goPackagePath = "github.com/gogo/protobuf";
374491 fetch = {
@@ -414,6 +531,15 @@
414531 sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
415532 };
416533 }
534+ {
535+ goPackagePath = "github.com/google/btree";
536+ fetch = {
537+ type = "git";
538+ url = "https://github.com/google/btree";
539+ rev = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306";
540+ sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
541+ };
542+ }
417543 {
418544 goPackagePath = "github.com/google/gofuzz";
419545 fetch = {
@@ -450,6 +576,15 @@
450576 sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
451577 };
452578 }
579+ {
580+ goPackagePath = "github.com/gregjones/httpcache";
581+ fetch = {
582+ type = "git";
583+ url = "https://github.com/gregjones/httpcache";
584+ rev = "9cad4c3443a7200dd6400aef47183728de563a38";
585+ sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s";
586+ };
587+ }
453588 {
454589 goPackagePath = "github.com/hashicorp/consul";
455590 fetch = {
@@ -513,15 +648,6 @@
513648 sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630";
514649 };
515650 }
516− {
517− goPackagePath = "github.com/howeyc/gopass";
518− fetch = {
519− type = "git";
520− url = "https://github.com/howeyc/gopass";
521− rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8";
522− sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45";
523− };
524− }
525651 {
526652 goPackagePath = "github.com/imdario/mergo";
527653 fetch = {
@@ -554,8 +680,8 @@
554680 fetch = {
555681 type = "git";
556682 url = "https://github.com/json-iterator/go";
557− rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682";
558− sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
683+ rev = "1624edc4454b8682399def8740d46db5e4362ba4";
684+ sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s";
559685 };
560686 }
561687 {
@@ -581,8 +707,8 @@
581707 fetch = {
582708 type = "git";
583709 url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver";
584− rev = "e61f72fec56ab519d74ebd396cd3fcf31b084558";
585− sha256 = "1cgbn0yzvrqrxq4kwwz2d6vddi9py2z18dx33yjd8w85j9ghhg6g";
710+ rev = "85ebc283a57287a8fcb3ad4b488d633cd63ef7d8";
711+ sha256 = "06m3xa9j46035bagv9r2ghsmdx6pr0r3lcj4hz1cx943dllj0n6v";
586712 };
587713 }
588714 {
@@ -711,6 +837,42 @@
711837 sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw";
712838 };
713839 }
840+ {
841+ goPackagePath = "github.com/opencontainers/go-digest";
842+ fetch = {
843+ type = "git";
844+ url = "https://github.com/opencontainers/go-digest";
845+ rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf";
846+ sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
847+ };
848+ }
849+ {
850+ goPackagePath = "github.com/opencontainers/image-spec";
851+ fetch = {
852+ type = "git";
853+ url = "https://github.com/opencontainers/image-spec";
854+ rev = "d60099175f88c47cd379c4738d158884749ed235";
855+ sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q";
856+ };
857+ }
858+ {
859+ goPackagePath = "github.com/opencontainers/runc";
860+ fetch = {
861+ type = "git";
862+ url = "https://github.com/opencontainers/runc";
863+ rev = "baf6536d6259209c3edfa2b22237af82942d3dfa";
864+ sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7";
865+ };
866+ }
867+ {
868+ goPackagePath = "github.com/opencontainers/runtime-spec";
869+ fetch = {
870+ type = "git";
871+ url = "https://github.com/opencontainers/runtime-spec";
872+ rev = "d810dbc60d8c5aeeb3d054bd1132fab2121968ce";
873+ sha256 = "0yqya0wslhv87nlidsmrw2720y3r3jpvqc2sh28y79ciyypxbk38";
874+ };
875+ }
714876 {
715877 goPackagePath = "github.com/openshift/api";
716878 fetch = {
@@ -747,6 +909,33 @@
747909 sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
748910 };
749911 }
912+ {
913+ goPackagePath = "github.com/petar/GoLLRB";
914+ fetch = {
915+ type = "git";
916+ url = "https://github.com/petar/GoLLRB";
917+ rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4";
918+ sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0";
919+ };
920+ }
921+ {
922+ goPackagePath = "github.com/peterbourgon/diskv";
923+ fetch = {
924+ type = "git";
925+ url = "https://github.com/peterbourgon/diskv";
926+ rev = "5f041e8faa004a95c88a202771f4cc3e991971e6";
927+ sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
928+ };
929+ }
930+ {
931+ goPackagePath = "github.com/philhofer/fwd";
932+ fetch = {
933+ type = "git";
934+ url = "https://github.com/philhofer/fwd";
935+ rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
936+ sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
937+ };
938+ }
750939 {
751940 goPackagePath = "github.com/pierrec/lz4";
752941 fetch = {
@@ -797,8 +986,8 @@
797986 fetch = {
798987 type = "git";
799988 url = "https://github.com/prometheus/common";
800− rev = "7600349dcfe1abd18d72d3a1770870d9800a7801";
801− sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
989+ rev = "89d80287644767070914e30199b4d959e491bd3d";
990+ sha256 = "0nvbjr8nhkyakgjariskl3bvyb18723dzjmmxph6ppf4khi50j0w";
802991 };
803992 }
804993 {
@@ -833,8 +1022,8 @@
8331022 fetch = {
8341023 type = "git";
8351024 url = "https://github.com/shirou/gopsutil";
836− rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203";
837− sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w";
1025+ rev = "ccc1c1016bc5d10e803189ee43417c50cdde7f1b";
1026+ sha256 = "0dk7644fc86n0974a00m2w5nbhzcgs1jjnillic90044w7rycg66";
8381027 };
8391028 }
8401029 {
@@ -846,6 +1035,15 @@
8461035 sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
8471036 };
8481037 }
1038+ {
1039+ goPackagePath = "github.com/sirupsen/logrus";
1040+ fetch = {
1041+ type = "git";
1042+ url = "https://github.com/sirupsen/logrus";
1043+ rev = "3e01752db0189b9157070a0e1668a620f9a85da2";
1044+ sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c";
1045+ };
1046+ }
8491047 {
8501048 goPackagePath = "github.com/spf13/afero";
8511049 fetch = {
@@ -891,15 +1089,6 @@
8911089 sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
8921090 };
8931091 }
894− {
895− goPackagePath = "github.com/DataDog/viper";
896− fetch = {
897− type = "git";
898− url = "https://github.com/DataDog/viper";
899− rev = "23ced3bc6b3751855704445e48da2c53075ade86";
900− sha256 = "1zzf4mqpmk47p3395k2v8q6wi7lnqxr0l55vv4zk9gpqqyifbm9m";
901− };
902− }
9031092 {
9041093 goPackagePath = "github.com/stretchr/objx";
9051094 fetch = {
@@ -918,6 +1107,24 @@
9181107 sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
9191108 };
9201109 }
1110+ {
1111+ goPackagePath = "github.com/syndtr/gocapability";
1112+ fetch = {
1113+ type = "git";
1114+ url = "https://github.com/syndtr/gocapability";
1115+ rev = "33e07d32887e1e06b7c025f27ce52f62c7990bc0";
1116+ sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i";
1117+ };
1118+ }
1119+ {
1120+ goPackagePath = "github.com/tinylib/msgp";
1121+ fetch = {
1122+ type = "git";
1123+ url = "https://github.com/tinylib/msgp";
1124+ rev = "af6442a0fcf6e2a1b824f70dd0c734f01e817751";
1125+ sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff";
1126+ };
1127+ }
9211128 {
9221129 goPackagePath = "github.com/ugorji/go";
9231130 fetch = {
@@ -954,6 +1161,15 @@
9541161 sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44";
9551162 };
9561163 }
1164+ {
1165+ goPackagePath = "golang.org/x/mobile";
1166+ fetch = {
1167+ type = "git";
1168+ url = "https://go.googlesource.com/mobile";
1169+ rev = "bceb7ef27cc623473a5b664d2a3450576dddff0f";
1170+ sha256 = "0xky2417wm61j2p5ki3k4237fxyz8f5ds19nak0lm741s3xs2rqx";
1171+ };
1172+ }
9571173 {
9581174 goPackagePath = "golang.org/x/net";
9591175 fetch = {
@@ -963,6 +1179,15 @@
9631179 sha256 = "1738bi8l50f0iq0il6h4qy1cgy39yh3q4gh1lwp5y5j7jyy33ccd";
9641180 };
9651181 }
1182+ {
1183+ goPackagePath = "golang.org/x/sync";
1184+ fetch = {
1185+ type = "git";
1186+ url = "https://go.googlesource.com/sync";
1187+ rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
1188+ sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
1189+ };
1190+ }
9661191 {
9671192 goPackagePath = "golang.org/x/sys";
9681193 fetch = {
@@ -1035,6 +1260,15 @@
10351260 sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d";
10361261 };
10371262 }
1263+ {
1264+ goPackagePath = "gopkg.in/square/go-jose.v2";
1265+ fetch = {
1266+ type = "git";
1267+ url = "https://github.com/square/go-jose";
1268+ rev = "ef984e69dd356202fd4e4910d4d9c24468bdf0b8";
1269+ sha256 = "0pxyrygc9mh6yn169rm6i3shax7zmmzps22px6mq3kl87zkk9b8h";
1270+ };
1271+ }
10381272 {
10391273 goPackagePath = "gopkg.in/yaml.v2";
10401274 fetch = {
@@ -1049,8 +1283,8 @@
10491283 fetch = {
10501284 type = "git";
10511285 url = "https://github.com/zorkian/go-datadog-api";
1052− rev = "6c08e2322af96e867e5715aedd6ea194c42cf44f";
1053− sha256 = "16ha3azq9981hwpn18sd50ai6d1h85fsawbdxp352c4gi8bhj8zw";
1286+ rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a";
1287+ sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk";
10541288 };
10551289 }
10561290 {
@@ -1058,8 +1292,17 @@
10581292 fetch = {
10591293 type = "git";
10601294 url = "https://github.com/kubernetes/api";
1061− rev = "9e5ffd1f1320950b238cfce291b926411f0af722";
1062− sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf";
1295+ rev = "4e7be11eab3ffcfc1876898b8272df53785a9504";
1296+ sha256 = "0klwmkvsnim66y8mvcmkqql12fbr5cja4qgjzp36197i6i335b62";
1297+ };
1298+ }
1299+ {
1300+ goPackagePath = "k8s.io/apiextensions-apiserver";
1301+ fetch = {
1302+ type = "git";
1303+ url = "https://github.com/kubernetes/apiextensions-apiserver";
1304+ rev = "b499623aa7a31f7c85b37017e068b21206a68e25";
1305+ sha256 = "1c0z71f0wqkwkc5x730l9gmzibkqk6af4mg5l6ks9lk69cbpxk0a";
10631306 };
10641307 }
10651308 {
@@ -1067,8 +1310,8 @@
10671310 fetch = {
10681311 type = "git";
10691312 url = "https://github.com/kubernetes/apimachinery";
1070− rev = "e386b2658ed20923da8cc9250e552f082899a1ee";
1071− sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz";
1313+ rev = "def12e63c512da17043b4f0293f52d1006603d9f";
1314+ sha256 = "0dghch5avwcy3zx5k005hi71i9bl3603pk927xdjr5jlajzwm9xd";
10721315 };
10731316 }
10741317 {
@@ -1076,8 +1319,8 @@
10761319 fetch = {
10771320 type = "git";
10781321 url = "https://github.com/kubernetes/apiserver";
1079− rev = "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3";
1080− sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg";
1322+ rev = "d296c96c12b7d15d7fb5fea7a05fb165f8fd4014";
1323+ sha256 = "0a413zpkm8afhh0jab8zrwvd61kvackll85kcdb6gyinw7f6qv7x";
10811324 };
10821325 }
10831326 {
@@ -1085,8 +1328,8 @@
10851328 fetch = {
10861329 type = "git";
10871330 url = "https://github.com/kubernetes/client-go";
1088− rev = "23781f4d6632d88e869066eaebb743857aa1ef9b";
1089− sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v";
1331+ rev = "f2f85107cac6fe04c30435ca0ac0c3318fd1b94c";
1332+ sha256 = "153a3q172kmpbp6cq5005dgasdw0x36pg9xz1mfgv966k8rwws74";
10901333 };
10911334 }
10921335 {
@@ -1098,13 +1341,31 @@
10981341 sha256 = "13ik6dri0f9fzs8p6987h6n3y2aqjz5cj957826xwkpv4fj2zgq8";
10991342 };
11001343 }
1344+ {
1345+ goPackagePath = "k8s.io/kubernetes";
1346+ fetch = {
1347+ type = "git";
1348+ url = "https://github.com/kubernetes/kubernetes";
1349+ rev = "bb9ffb1654d4a729bb4cec18ff088eacc153c239";
1350+ sha256 = "0c5xpxg7ns5irrr0ydk8n394yp3922i0m61l26qyc183phr32wxi";
1351+ };
1352+ }
11011353 {
11021354 goPackagePath = "k8s.io/metrics";
11031355 fetch = {
11041356 type = "git";
11051357 url = "https://github.com/kubernetes/metrics";
1106− rev = "0d9ea2ac660031c8f2726a735dda29441f396f99";
1107− sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71";
1358+ rev = "972ef826b8401c180b89cefc7457daa2d116daa9";
1359+ sha256 = "0ba9mfy253d4pcqdvialh2shs4d43l0q84pn3569wiib8cisbc68";
1360+ };
1361+ }
1362+ {
1363+ goPackagePath = "k8s.io/utils";
1364+ fetch = {
1365+ type = "git";
1366+ url = "https://github.com/kubernetes/utils";
1367+ rev = "cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb";
1368+ sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk";
11081369 };
11091370 }
11101371]
pkgs/tools/networking/dd-agent/integrations-core.nix+1−1
@@ -75,7 +75,7 @@ let
7575 mongo = (ps: [ ps.pymongo ]);
7676 network = (ps: [ ps.psutil ]);
7777 nginx = (ps: []);
78− postgres = (ps: with ps; [ pg8000 psycopg2 ]);
78+ postgres = (ps: with ps; [ pg8000_1_12 psycopg2 ]);
7979 };
8080
8181 # All integrations (default + extra):
pkgs/top-level/all-packages.nix−1
@@ -16593,7 +16593,6 @@ in
1659316593 pythonPackages = datadog-integrations-core {};
1659416594 };
1659516595 datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
16596− datadog-trace-agent = callPackage ../tools/networking/dd-agent/datadog-trace-agent.nix { };
1659716596 datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
1659816597 python = python27;
1659916598 extraIntegrations = extras;
pkgs/top-level/python-packages.nix+1
@@ -3548,6 +3548,7 @@ in {
35483548 periodictable = callPackage ../development/python-modules/periodictable { };
35493549
35503550 pg8000 = callPackage ../development/python-modules/pg8000 { };
3551+ pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { };
35513552
35523553 pgsanity = callPackage ../development/python-modules/pgsanity { };
35533554