From 35690e335f937fd1f13f0e3cd131d2282fa62469 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 25 May 2023 19:03:52 +0300 Subject: [PATCH] treewide/tools: use top-level fetchPypi --- pkgs/tools/audio/patray/default.nix | 3 ++- pkgs/tools/audio/spotdl/default.nix | 3 ++- pkgs/tools/backup/borgbackup/default.nix | 3 ++- pkgs/tools/backup/borgmatic/default.nix | 3 ++- pkgs/tools/backup/gh2md/default.nix | 3 ++- pkgs/tools/backup/grab-site/default.nix | 4 ++-- pkgs/tools/backup/rdiff-backup/default.nix | 4 ++-- pkgs/tools/backup/zfs-autobackup/default.nix | 4 ++-- pkgs/tools/filesystems/ceph/default.nix | 3 ++- pkgs/tools/graphics/graph-cli/default.nix | 3 ++- pkgs/tools/graphics/shot-scraper/default.nix | 3 ++- pkgs/tools/networking/circus/default.nix | 4 ++-- pkgs/tools/networking/moodle-dl/default.nix | 4 ++-- pkgs/tools/networking/picosnitch/default.nix | 3 ++- pkgs/tools/networking/s4cmd/default.nix | 4 ++-- pkgs/tools/networking/updog/default.nix | 4 ++-- pkgs/tools/package-management/auditwheel/default.nix | 3 ++- pkgs/tools/security/ghdorker/default.nix | 3 ++- pkgs/tools/security/kerbrute/default.nix | 4 ++-- pkgs/tools/security/onlykey-agent/default.nix | 3 ++- pkgs/tools/security/onlykey-cli/default.nix | 4 ++-- pkgs/tools/security/sshuttle/default.nix | 3 ++- pkgs/tools/security/vulnix/default.nix | 3 ++- pkgs/tools/system/krakenx/default.nix | 4 ++-- pkgs/tools/system/s-tui/default.nix | 3 ++- pkgs/tools/text/csvkit/default.nix | 5 +++-- pkgs/tools/text/fanficfare/default.nix | 4 ++-- pkgs/tools/text/rst2html5/default.nix | 4 ++-- pkgs/tools/video/vcsi/default.nix | 4 ++-- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 30 files changed, 61 insertions(+), 45 deletions(-) diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/tools/audio/patray/default.nix index eceb8c8b17bc..ff7b55689b8f 100644 --- a/pkgs/tools/audio/patray/default.nix +++ b/pkgs/tools/audio/patray/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , qt5 }: @@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "patray"; version = "0.1.1"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit version pname; sha256 = "0vaapn2p4257m1d5nbnwnh252b7lhl00560gr9pqh2b7xqm1bh6g"; }; diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 43e3b009da3e..cd856770f79d 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , fetchFromGitHub , ffmpeg }: @@ -9,7 +10,7 @@ let packageOverrides = self: super: { ytmusicapi = super.ytmusicapi.overridePythonAttrs (old: rec { version = "0.25.1"; - src = self.fetchPypi { + src = fetchPypi { inherit (old) pname; inherit version; hash = "sha256-uc/fgDetSYaCRzff0SzfbRhs3TaKrfE2h6roWkkj8yQ="; diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index f9dcc517521a..5aaffabd9325 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -12,6 +12,7 @@ , installShellFiles , nixosTests , fetchpatch +, fetchPypi }: python3.pkgs.buildPythonApplication rec { @@ -19,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { version = "1.2.3"; format = "pyproject"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-4yQY+GM8lvqWgTUqVutjuY4pQgNHLBFKUkJwnTaWZ4U="; }; diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index db88c6a05989..ea85df188b81 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -3,6 +3,7 @@ , borgbackup , coreutils , python3Packages +, fetchPypi , systemd , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , installShellFiles @@ -14,7 +15,7 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; version = "1.7.9"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-v3Qxwy7V6rqX90G4/Xp6mVTUkrqDXmudgh3th0GCjuk="; }; diff --git a/pkgs/tools/backup/gh2md/default.nix b/pkgs/tools/backup/gh2md/default.nix index 5306080aa6be..e0c21678acf3 100644 --- a/pkgs/tools/backup/gh2md/default.nix +++ b/pkgs/tools/backup/gh2md/default.nix @@ -1,12 +1,13 @@ { lib , python3Packages +, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "gh2md"; version = "2.0.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "7a277939d4781f4ca741eccb74fc70f0aa85811185da52219878129cba7f1d77"; }; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 168343b4083a..ee30ab3037a4 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,11 +1,11 @@ -{ lib, python38, fetchFromGitHub }: +{ lib, python38, fetchPypi, fetchFromGitHub }: let python = python38.override { self = python; packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; - src = super.fetchPypi { + src = fetchPypi { inherit (oldAttrs) pname; inherit version; hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 3307ba08b118..5892ddbe0106 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, librsync }: +{ lib, python3Packages, fetchPypi, librsync }: let pypkgs = python3Packages; @@ -8,7 +8,7 @@ pypkgs.buildPythonApplication rec { pname = "rdiff-backup"; version = "2.0.5"; - src = pypkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s="; }; diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/tools/backup/zfs-autobackup/default.nix index 92f371ca9c32..a7453119a9d0 100644 --- a/pkgs/tools/backup/zfs-autobackup/default.nix +++ b/pkgs/tools/backup/zfs-autobackup/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: let pythonPackages = python3Packages; @@ -8,7 +8,7 @@ pythonPackages.buildPythonApplication rec { pname = "zfs_autobackup"; version = "3.1"; - src = pythonPackages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "42c22001717b3d7cfdae6297fedc11b2dd1eb2a4bd25b6bb1c9232dd3b70ad67"; }; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 43f11b37cbef..605f505dd5bc 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -3,6 +3,7 @@ , runCommand , fetchurl , fetchFromGitHub +, fetchPypi # Build time , cmake @@ -166,7 +167,7 @@ let packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.4.46"; - src = super.fetchPypi { + src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/tools/graphics/graph-cli/default.nix index d23e86a1fac3..c504d6b27156 100644 --- a/pkgs/tools/graphics/graph-cli/default.nix +++ b/pkgs/tools/graphics/graph-cli/default.nix @@ -1,12 +1,13 @@ { lib , python3Packages +, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "graph-cli"; version = "0.1.18"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit version; pname = "graph_cli"; sha256 = "sha256-0mxOc8RJ3GNgSbppLylIViqfYf6zwJ49pltnsyQUpSA="; diff --git a/pkgs/tools/graphics/shot-scraper/default.nix b/pkgs/tools/graphics/shot-scraper/default.nix index ff10e8f3b7cd..e083014f8a98 100644 --- a/pkgs/tools/graphics/shot-scraper/default.nix +++ b/pkgs/tools/graphics/shot-scraper/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: python3.pkgs.buildPythonApplication rec { @@ -9,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { disabled = python3.pkgs.pythonOlder "3.6"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-YfWiy44rCRXK5xVkmA9X7pAlDhZrk6nS9vbC2eYvjbg="; }; diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 9749378f714b..2fca65a32c7b 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -1,4 +1,4 @@ -{ lib, python3 }: +{ lib, python3, fetchPypi }: let python = python3.override { @@ -8,7 +8,7 @@ let }; }; - inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado mock six; + inherit (python.pkgs) buildPythonApplication iowait psutil pyzmq tornado mock six; in buildPythonApplication rec { diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/tools/networking/moodle-dl/default.nix index b4f3dfa0aaa6..f819fe819284 100644 --- a/pkgs/tools/networking/moodle-dl/default.nix +++ b/pkgs/tools/networking/moodle-dl/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "moodle-dl"; version = "2.2.2.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-76JU/uYJH7nVWCR+d8vvjYCCSMfe/8R9l756AmzZPHU="; }; diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/tools/networking/picosnitch/default.nix index 03df8639d182..937ddc5b97a5 100644 --- a/pkgs/tools/networking/picosnitch/default.nix +++ b/pkgs/tools/networking/picosnitch/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi , bcc }: @@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "picosnitch"; version = "0.12.0"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "b87654b4b92e28cf5418388ba1d3165b9fa9b17ba91af2a1a942f059128f68bc"; }; diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 95dc02cb5cd4..1f4dc14d27f7 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "s4cmd"; version = "2.1.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0d4mx98i3qhvlmr9x898mjvf827smzx6x5ji6daiwgjdlxc60mj2"; }; diff --git a/pkgs/tools/networking/updog/default.nix b/pkgs/tools/networking/updog/default.nix index 22942891d6a0..7fb8e0bfec37 100644 --- a/pkgs/tools/networking/updog/default.nix +++ b/pkgs/tools/networking/updog/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "updog"; version = "1.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "7n/ddjF6eJklo+T79+/zBxSHryebc2W9gxwxsb2BbF4="; }; diff --git a/pkgs/tools/package-management/auditwheel/default.nix b/pkgs/tools/package-management/auditwheel/default.nix index 72d40cdfa5b9..6ea176ab1ca4 100644 --- a/pkgs/tools/package-management/auditwheel/default.nix +++ b/pkgs/tools/package-management/auditwheel/default.nix @@ -2,6 +2,7 @@ , bzip2 , patchelf , python3 +, fetchPypi , gnutar , unzip }: @@ -11,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { version = "5.1.2"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-PuWDABSTHqhK9c0GXGN7ZhTvoD2biL2Pv8kk5+0B1ro="; }; diff --git a/pkgs/tools/security/ghdorker/default.nix b/pkgs/tools/security/ghdorker/default.nix index c6882fb110a8..28336c30ea15 100644 --- a/pkgs/tools/security/ghdorker/default.nix +++ b/pkgs/tools/security/ghdorker/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: python3.pkgs.buildPythonApplication rec { @@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { version = "0.3.2"; format = "setuptools"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU="; }; diff --git a/pkgs/tools/security/kerbrute/default.nix b/pkgs/tools/security/kerbrute/default.nix index 997f3b63437e..dbadde6129d8 100644 --- a/pkgs/tools/security/kerbrute/default.nix +++ b/pkgs/tools/security/kerbrute/default.nix @@ -1,10 +1,10 @@ -{ lib, python3 }: +{ lib, python3, fetchPypi }: python3.pkgs.buildPythonApplication rec { pname = "kerbrute"; version = "0.0.2"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA="; }; diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/tools/security/onlykey-agent/default.nix index 86095191973f..8d1f00388adb 100644 --- a/pkgs/tools/security/onlykey-agent/default.nix +++ b/pkgs/tools/security/onlykey-agent/default.nix @@ -1,5 +1,6 @@ { lib , python3Packages +, fetchPypi , onlykey-cli }: @@ -46,7 +47,7 @@ python3Packages.buildPythonApplication rec { pname = "onlykey-agent"; version = "1.1.13"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-GAb6crtW6rLAbFtdi6fAGCPjXpKFhravguoGjuNcIxc="; }; diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index 4aed6b3235c0..bed910da3f77 100644 --- a/pkgs/tools/security/onlykey-cli/default.nix +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "onlykey-cli"; version = "1.2.9"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit version; pname = "onlykey"; sha256 = "sha256-92CzDZgtmww0eABtjeBo6HNQ00sijWakjXLPJiOXY/A="; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index f109886c9ca8..fa222cf5fe14 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , python3Packages +, fetchPypi , makeWrapper , coreutils , iptables @@ -13,7 +14,7 @@ python3Packages.buildPythonApplication rec { pname = "sshuttle"; version = "1.1.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-9aPtHlqxITx6bfhgr0HxqQOrLK+/73Hzcazc/yHmnuY="; }; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index a698a0a1527e..7f6d29891f0c 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,5 +1,6 @@ { lib , python3Packages +, fetchPypi , nix , ronn }: @@ -8,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "vulnix"; version = "1.10.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "07v3ddvvhi3bslwrlin45kz48i3va2lzd6ny0blj5i2z8z40qcfm"; }; diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix index e5b1e3ec1c94..a5a2f7e2ef0d 100644 --- a/pkgs/tools/system/krakenx/default.nix +++ b/pkgs/tools/system/krakenx/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "krakenx"; version = "0.0.3"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "1khw1rxra5hn7hwp16i6kgj89znq8vjsyly3r2dxx2z2bddil000"; }; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 06ab69167b2c..29b37aa0b0fd 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , python3Packages +, fetchPypi , nix-update-script , s-tui , testers @@ -10,7 +11,7 @@ python3Packages.buildPythonPackage rec { pname = "s-tui"; version = "1.1.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "sha256-soVrmzlVy0zrqvOclR7SfPphp4xAEHv+xdr0NN19ye0="; }; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 96383fa87f9e..cb742f7f0c70 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchPypi }: let @@ -7,7 +8,7 @@ let packageOverrides = self: super: { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.4.46"; - src = super.fetchPypi { + src = fetchPypi { pname = "SQLAlchemy"; inherit version; hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; @@ -28,7 +29,7 @@ python.pkgs.buildPythonApplication rec { version = "1.1.1"; format = "setuptools"; - src = python.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-vt23t49rIq2+1urVrV3kv7Md0sVfMhGyorO2VSkEkiM="; }; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index dec0a1949225..0ec80b290b90 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { pname = "FanFicFare"; version = "4.8.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "0h20cw9z6k3z42fhl48pfxcqrk3i45zp4f4xm6pz7jqjzi17h9fk"; }; diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 5ae0caa34e13..61b75130fe1b 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchPypi }: python3Packages.buildPythonPackage rec { pname = "rst2html5"; version = "2.0"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; hash = "sha256-Ejjja/fm6wXTf9YtjCYZsNDB8X5oAtyPoUIsYFDuZfc="; }; diff --git a/pkgs/tools/video/vcsi/default.nix b/pkgs/tools/video/vcsi/default.nix index f4f3043f34fb..ad09d57d7918 100644 --- a/pkgs/tools/video/vcsi/default.nix +++ b/pkgs/tools/video/vcsi/default.nix @@ -1,10 +1,10 @@ -{ lib, python3Packages, ffmpeg }: +{ lib, python3Packages, fetchPypi, ffmpeg }: python3Packages.buildPythonApplication rec { pname = "vcsi"; version = "7.0.13"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "01qwbb2l8gwf622zzhh0kzdzw3njvsdwmndwn01i9bn4qm5cas8r"; }; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index c7fa54791210..b737eb6643a8 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, glibcLocales, docker-compose_1 }: +{ lib, python3, fetchPypi, glibcLocales, docker-compose_1 }: let docker_compose = changeVersion (with localPython.pkgs; docker-compose_1.override { inherit colorama pyyaml six dockerpty docker jsonschema requests websocket-client paramiko; @@ -25,7 +25,7 @@ let PYTHONPATH="tests/lib3:$PYTHONPATH" ${localPython.interpreter} -m test_all runHook postCheck ''; - src = localPython.pkgs.fetchPypi { + src = fetchPypi { pname = "PyYAML"; inherit version; hash = "sha256-YHd0y7oocyv6gCtUuqdIQhX1MJkQVbtWLvvtWy8gpF4=";