Unverified Commit 342c730a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #233990 from wegank/development-fetchpypi 

treewide: development: use top-level fetchPypi
parents 73a02268 d7619eff

pkgs/development/compilers/lesscpy/default.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, python3Packages }:

{ lib, python3Packages, fetchPypi }:



python3Packages.buildPythonApplication rec {

  pname   = "lesscpy";

  version = "0.13.0";



  src = python3Packages.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    sha256 = "1bbjag13kawnjdn7q4flfrkd0a21rgn9ycfqsgfdmg658jsx1ipk";

  };

pkgs/development/misc/resholve/deps.nix

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, callPackage

, fetchFromGitHub

, python27

, fetchPypi

, ...

}:
@@ -47,7 +48,7 @@ rec { 
    pname = "six";

    version = "1.16.0";



    src = python27.pkgs.fetchPypi {

    src = fetchPypi {

      inherit pname version;

      sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";

    };
@@ -64,7 +65,7 @@ rec { 
    pname = "typing";

    version = "3.10.0.0";



    src = python27.pkgs.fetchPypi {

    src = fetchPypi {

      inherit pname version;

      sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";

    };

pkgs/development/python-modules/dashing/default.nix

+2 −1
Original line number Diff line number Diff line 
{ lib

, python3

, fetchPypi

}:



python3.pkgs.buildPythonPackage rec {
@@ -9,7 +10,7 @@ python3.pkgs.buildPythonPackage rec { 


  disabled = python3.pythonOlder "3.7";



  src = python3.pkgs.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs=";

  };

pkgs/development/python-modules/memory_profiler/default.nix

+2 −1
Original line number Diff line number Diff line 
{ lib

, python

, fetchPypi

}:



python.pkgs.buildPythonPackage rec {

  pname = "memory_profiler";

  version = "0.55.0";



  src = python.pkgs.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    sha256 = "1hdgh5f59bya079w4ahx4l0hf4gc5yvaz44irp5x57cj9hkpp92z";

  };

pkgs/development/python-modules/pyqtwebengine/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib, stdenv, pythonPackages, pkg-config

{ lib, stdenv, pythonPackages, fetchPypi, pkg-config

, qmake, qtbase, qtsvg, qtwebengine

, wrapQtAppsHook

, darwin

}:



let

  inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder;

  inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 sip pyqt-builder;

  inherit (darwin) autoSignDarwinBinariesHook;

in buildPythonPackage rec {

  pname = "PyQtWebEngine";
@@ -14,7 +14,7 @@ in buildPythonPackage rec { 


  disabled = isPy27;



  src = pythonPackages.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f";

  };