diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 5b3f087f701..f469c04044b 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, python3, fetchPypi, fetchFromGitHub, installShellFiles }: let version = "2.44.1"; @@ -14,7 +14,7 @@ let # put packages that needs to be overridden in the py package scope py = import ./python-packages.nix { - inherit stdenv lib src version python3; + inherit stdenv lib src version python3 fetchPypi; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 5417425c06f..fae5a33fea4 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, python3, lib, src, version }: +{ stdenv, python3, fetchPypi, lib, src, version }: let buildAzureCliPackage = with py.pkgs; buildPythonPackage; @@ -8,7 +8,7 @@ let package.overrideAttrs(oldAttrs: rec { inherit version; - src = py.pkgs.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version hash extension; }; @@ -315,7 +315,7 @@ let azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { version = "1.1.1"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; @@ -326,7 +326,7 @@ let azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-0Lti2L+OGWuQPzlxukr6RI5P4U6DlOv83ZQdhNYuyv4="; @@ -336,7 +336,7 @@ let azure-storage-blob = super.azure-storage-blob.overrideAttrs(oldAttrs: rec { version = "1.5.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-8YeoeOehkfTgmBWZBPcrQUbPcOGquvZISrS6cvxvJSw="; @@ -345,7 +345,7 @@ let azure-storage-common = super.azure-storage-common.overrideAttrs(oldAttrs: rec { version = "1.4.2"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE="; @@ -354,7 +354,7 @@ let azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { version = "0.14.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-Q1gGq7EZ/JvYjD7y0mp3kEy15QKZI84UQTdlIBoQLMs="; @@ -367,7 +367,7 @@ let azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { version = "0.5.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ="; @@ -377,7 +377,7 @@ let azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs(oldAttrs: rec { version = "0.3.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-fN1IuZ9fjxgRZv6qh9gg6v6KYpnKlXfnoLqfZCDXoRY="; @@ -387,7 +387,7 @@ let azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { version = "0.2.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-OQ5brhweEIrtN2iP4I5NacdC9t3YUiGIVhhqSs3FMuI="; @@ -397,7 +397,7 @@ let azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { version = "1.1.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; @@ -413,7 +413,7 @@ let azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs(oldAttrs: rec { version = "4.0.0b3"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; @@ -423,7 +423,7 @@ let azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { version = "4.8.0b2"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; @@ -436,7 +436,7 @@ let azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec { version = "0.2.1"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-THlg0JT1hH2aRWwYuKPI5gxCjjCAo5BfHJQ9gbpjUaQ="; @@ -453,7 +453,7 @@ let azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs(oldAttrs: rec { version = "0.5.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw="; @@ -470,7 +470,7 @@ let adal = super.adal.overridePythonAttrs(oldAttrs: rec { version = "1.2.7"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE="; @@ -483,7 +483,7 @@ let msal = super.msal.overridePythonAttrs(oldAttrs: rec { version = "1.20.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-eDRM1MkdYTSlk7Xj5FVB5mbje3R/+KYxbDZo3R5qtrI="; @@ -493,7 +493,7 @@ let semver = super.semver.overridePythonAttrs(oldAttrs: rec { version = "2.13.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8="; @@ -512,7 +512,7 @@ let knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.10.1"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; @@ -522,7 +522,7 @@ let argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec { version = "2.0.0"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-Y3KteMidZiA1EBQYriU2aERbORdVz+lOpS8bnSJCWyA="; @@ -533,7 +533,7 @@ let name = "sshtunnel-${version}"; version = "0.1.5"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-yBP9zajoHDk2/+rEfLac+y0fXnetDeZWxtq1au69kkk="; diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix index 669f54c3559..9378e5dfb17 100644 --- a/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/pkgs/tools/admin/gimme-aws-creds/default.nix @@ -1,6 +1,7 @@ { lib , installShellFiles , python3 +, fetchPypi , fetchFromGitHub , nix-update-script , testers @@ -13,7 +14,7 @@ let fido2 = super.fido2.overridePythonAttrs (oldAttrs: rec { version = "0.9.3"; format = "setuptools"; - src = self.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw="; @@ -23,7 +24,7 @@ let okta = super.okta.overridePythonAttrs (oldAttrs: rec { version = "0.0.4"; format = "setuptools"; - src = self.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-U+eSxo02hP9BQLTLHAKvOCEJA2j4EQ/eVMC9tjhEkzI="; diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix index ec9a657461a..47b458e9cc0 100644 --- a/pkgs/tools/admin/s3bro/default.nix +++ b/pkgs/tools/admin/s3bro/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: python3.pkgs.buildPythonApplication rec { @@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { version = "2.8"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-+OqcLbXilbY4h/zRAkvRd8taVIOPyiScOAcDyPZ4RUw="; }; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 109f038d972..0c5b7da1827 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , python3 +, fetchPypi , openssl # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. @@ -11,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; version = "3006.1"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-lVh71hHepq/7aQjQ7CaGy37bhMFBRLSFF3bxJ6YOxbk="; }; diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix index a6f511fe115..ad1bf81ed9c 100644 --- a/pkgs/tools/admin/sewer/default.nix +++ b/pkgs/tools/admin/sewer/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "sewer"; version = "0.8.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0s8f0w6nv8dcs5yw7rn49981b3c9mnnx4f6wzqw4zha0rpp60z22"; }; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 51e2fe98b0b..cf908ba3355 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, bash }: +{ lib, python3Packages, fetchPypi, bash }: python3Packages.buildPythonApplication rec { pname = "simp_le-client"; version = "0.17.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0m1jynar4calaffp2zdxr5yy9vnhw2qf2hsfxwzfwf8fqb5h7bjb"; };