From d3ccac10d251aa7808b77eac99256a2cb66c9d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 23 Jun 2021 00:02:11 +0200 Subject: [PATCH 1/3] python2Packages.pg8000: init at 1.12.5 --- pkgs/top-level/python2-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index bc37fd28db08..7e430a065814 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -370,6 +370,8 @@ with self; with super; { pathpy = callPackage ../development/python-modules/path.py/2.nix { }; + pg8000 = callPackage ../development/python-modules/pg8000/1_12.nix { }; + pillow = callPackage ../development/python-modules/pillow/6.nix { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; inherit (pkgs.xorg) libX11; From 9653f60340788b1f0eb1995b1a9732ebdf1d145e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 23 Jun 2021 00:04:07 +0200 Subject: [PATCH 2/3] dd-agent: use python2Packages.pg8000 It refers to the same version as python2Packages.pg8000_1_12. --- pkgs/tools/networking/dd-agent/integrations-core.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index edf7a8faaf86..e466be816e43 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_1_12 psycopg2 ]); + postgres = (ps: with ps; [ pg8000 psycopg2 ]); }; # All integrations (default + extra): From 74a89be4ddb856b76a0b607370660cda2fe49f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 23 Jun 2021 00:05:49 +0200 Subject: [PATCH 3/3] pythonPackages.pg8000_1_12: drop Versioned attributes in python-packages.nix should be avoided. --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29913ff47bc0..4747602f6345 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5186,8 +5186,6 @@ in { pg8000 = callPackage ../development/python-modules/pg8000 { }; - pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; - pgcli = callPackage ../development/tools/database/pgcli { }; pglast = callPackage ../development/python-modules/pglast { };