From fcb1b2271876011a30d48c282e74016c08b5c144 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 15 Aug 2022 00:01:50 +0100 Subject: [PATCH] nix/pkgs/netbox: use more upstream deps (requests!) --- nix/pkgs/netbox/python-packages.nix | 178 ++++++++++++++-------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/nix/pkgs/netbox/python-packages.nix b/nix/pkgs/netbox/python-packages.nix index fce8cdec82..c181f7598a 100644 --- a/nix/pkgs/netbox/python-packages.nix +++ b/nix/pkgs/netbox/python-packages.nix @@ -169,34 +169,34 @@ self: super: { self."webencodings" ]; }; - "certifi" = super.buildPythonPackage rec { - pname = "certifi"; - version = "2022.6.15"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/e9/06/d3d367b7af6305b16f0d28ae2aaeb86154fa91f144f036c2d5002a5a202b/certifi-2022.6.15-py3-none-any.whl"; - sha256 = "04l46xlyyyg7cwdvk2h7s93kbb1qci7l2scbbzbijiz8amfl31py"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; - "charset-normalizer" = super.buildPythonPackage rec { - pname = "charset-normalizer"; - version = "2.0.12"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/06/b3/24afc8868eba069a7f03650ac750a778862dc34941a4bebeb58706715726/charset_normalizer-2.0.12-py3-none-any.whl"; - sha256 = "1pxim0sfz7gq157k9kv88kxxzvgnid1ip0maxas3jyxipnzfv0b8"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; + #"certifi" = super.buildPythonPackage rec { + # pname = "certifi"; + # version = "2022.6.15"; + # src = fetchurl { + # url = "https://files.pythonhosted.org/packages/e9/06/d3d367b7af6305b16f0d28ae2aaeb86154fa91f144f036c2d5002a5a202b/certifi-2022.6.15-py3-none-any.whl"; + # sha256 = "04l46xlyyyg7cwdvk2h7s93kbb1qci7l2scbbzbijiz8amfl31py"; + # }; + # format = "wheel"; + # doCheck = false; + # buildInputs = []; + # checkInputs = []; + # nativeBuildInputs = []; + # propagatedBuildInputs = []; + #}; + #"charset-normalizer" = super.buildPythonPackage rec { + # pname = "charset-normalizer"; + # version = "2.0.12"; + # src = fetchurl { + # url = "https://files.pythonhosted.org/packages/06/b3/24afc8868eba069a7f03650ac750a778862dc34941a4bebeb58706715726/charset_normalizer-2.0.12-py3-none-any.whl"; + # sha256 = "1pxim0sfz7gq157k9kv88kxxzvgnid1ip0maxas3jyxipnzfv0b8"; + # }; + # format = "wheel"; + # doCheck = false; + # buildInputs = []; + # checkInputs = []; + # nativeBuildInputs = []; + # propagatedBuildInputs = []; + #}; "click" = super.buildPythonPackage rec { pname = "click"; version = "8.1.3"; @@ -640,20 +640,20 @@ self: super: { self."setuptools" ]; }; - "idna" = super.buildPythonPackage rec { - pname = "idna"; - version = "3.3"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/04/a2/d918dcd22354d8958fe113e1a3630137e0fc8b44859ade3063982eacd2a4/idna-3.3-py3-none-any.whl"; - sha256 = "1zrm4xnjas13byafi11ma2q8h5rr1fmjwvi41xp5k07sgw2dvnc4"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; + #"idna" = super.buildPythonPackage rec { + # pname = "idna"; + # version = "3.3"; + # src = fetchurl { + # url = "https://files.pythonhosted.org/packages/04/a2/d918dcd22354d8958fe113e1a3630137e0fc8b44859ade3063982eacd2a4/idna-3.3-py3-none-any.whl"; + # sha256 = "1zrm4xnjas13byafi11ma2q8h5rr1fmjwvi41xp5k07sgw2dvnc4"; + # }; + # format = "wheel"; + # doCheck = false; + # buildInputs = []; + # checkInputs = []; + # nativeBuildInputs = []; + # propagatedBuildInputs = []; + #}; "importlib-metadata" = super.buildPythonPackage rec { pname = "importlib-metadata"; version = "4.12.0"; @@ -1059,25 +1059,25 @@ self: super: { self."packaging" ]; }; - "requests" = super.buildPythonPackage rec { - pname = "requests"; - version = "2.28.0"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/41/5b/2209eba8133fc081d3ffff02e1f6376e3117e52bb16f674721a83e67e68e/requests-2.28.0-py3-none-any.whl"; - sha256 = "0vrbrsprsjd6vl76slzk8k47iy8bml1avlq3ggqk1rmwgw9n2y5w"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = [ - self."certifi" - self."charset-normalizer" - self."idna" - self."urllib3" - ]; - }; + #"requests" = super.buildPythonPackage rec { + # pname = "requests"; + # version = "2.28.0"; + # src = fetchurl { + # url = "https://files.pythonhosted.org/packages/41/5b/2209eba8133fc081d3ffff02e1f6376e3117e52bb16f674721a83e67e68e/requests-2.28.0-py3-none-any.whl"; + # sha256 = "0vrbrsprsjd6vl76slzk8k47iy8bml1avlq3ggqk1rmwgw9n2y5w"; + # }; + # format = "wheel"; + # doCheck = false; + # buildInputs = []; + # checkInputs = []; + # nativeBuildInputs = []; + # propagatedBuildInputs = [ + # self."certifi" + # self."charset-normalizer" + # self."idna" + # self."urllib3" + # ]; + #}; "requests-oauthlib" = super.buildPythonPackage rec { pname = "requests-oauthlib"; version = "1.3.1"; @@ -1189,20 +1189,20 @@ self: super: { self."six" ]; }; - "six" = super.buildPythonPackage rec { - pname = "six"; - version = "1.16.0"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl"; - sha256 = "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; + #"six" = super.buildPythonPackage rec { + # pname = "six"; + # version = "1.16.0"; + # src = fetchurl { + # url = "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl"; + # sha256 = "0m02dsi8lvrjf4bi20ab6lm7rr6krz7pg6lzk3xjs2l9hqfjzfwa"; + # }; + # format = "wheel"; + # doCheck = false; + # buildInputs = []; + # checkInputs = []; + # nativeBuildInputs = []; + # propagatedBuildInputs = []; + #}; "social-auth-app-django" = super.buildPythonPackage rec { pname = "social-auth-app-django"; version = "5.0.0"; @@ -1343,20 +1343,20 @@ self: super: { nativeBuildInputs = []; propagatedBuildInputs = []; }; - "urllib3" = super.buildPythonPackage rec { - pname = "urllib3"; - version = "1.26.9"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/ec/03/062e6444ce4baf1eac17a6a0ebfe36bb1ad05e1df0e20b110de59c278498/urllib3-1.26.9-py2.py3-none-any.whl"; - sha256 = "051c8x2xchkhcrvagwzw4p4jx6j6ym4cdlcvgik6yw5i7zay9v24"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; + #"urllib3" = super.buildPythonPackage rec { + # pname = "urllib3"; + # version = "1.26.9"; + # src = fetchurl { + # url = "https://files.pythonhosted.org/packages/ec/03/062e6444ce4baf1eac17a6a0ebfe36bb1ad05e1df0e20b110de59c278498/urllib3-1.26.9-py2.py3-none-any.whl"; + # sha256 = "051c8x2xchkhcrvagwzw4p4jx6j6ym4cdlcvgik6yw5i7zay9v24"; + # }; + # format = "wheel"; + # doCheck = false; + # buildInputs = []; + # checkInputs = []; + # nativeBuildInputs = []; + # propagatedBuildInputs = []; + #}; "watchdog" = super.buildPythonPackage rec { pname = "watchdog"; version = "2.1.9";