From a2c2795e1c4d13f56457e40ced52561f07b6e29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 30 May 2022 05:54:00 +0200
Subject: [PATCH 1/4] xpra: remove ipaddress
---
pkgs/tools/X11/xpra/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 69f7dcb469af..21e37a2eb405 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -135,7 +135,6 @@ in buildPythonApplication rec {
dbus-python
gst-python
idna
- ipaddress
lz4
netifaces
numpy
From 9a5fde8383182ae7c0f32df427081b2b2288a32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 30 May 2022 05:54:09 +0200
Subject: [PATCH 2/4] azure-cli: remove backport ipaddress
---
pkgs/tools/admin/azure-cli/default.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 01cb5081cf4f..b4d1d6dd7b76 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -159,7 +159,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
javaproperties
jsondiff
# urllib3[secure]
- ipaddress
# shell completion
argcomplete
];
From c9a2b12db5b59997702e04e888ee0252faed2f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 30 May 2022 05:54:24 +0200
Subject: [PATCH 3/4] duplicity: remove backport ipaddress, remove always false
condition
---
pkgs/tools/backup/duplicity/default.nix | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 4d83b693075b..8c6b6d9466be 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -78,15 +78,12 @@ pythonPackages.buildPythonApplication rec {
idna
pygobject3
fasteners
- ipaddress
lockfile
paramiko
pyasn1
pycrypto
pydrive
future
- ] ++ lib.optionals (!isPy3k) [
- enum
];
checkInputs = [
From b134a28381d140eb2f43928cef2022199ae8c1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 30 May 2022 05:55:10 +0200
Subject: [PATCH 4/4] dd-agent: remove backport ipaddress
---
pkgs/tools/networking/dd-agent/5.nix | 1 -
1 file changed, 1 deletion(-)
diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix
index 744fd482ab18..57ab6ed97b90 100644
--- a/pkgs/tools/networking/dd-agent/5.nix
+++ b/pkgs/tools/networking/dd-agent/5.nix
@@ -18,7 +18,6 @@ let
six
requests
websocket-client
- ipaddress
docker_pycreds
uptime
] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];