Unverified Commit 6e6f778f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234006 from figsoda/pypi 

treewide/applications: use top-level fetchPypi
parents 140d4f0b 8014b08e

pkgs/applications/graphics/displaycal/default.nix

+4 −3
Original line number Diff line number Diff line 
{ lib

, python3

, xorg

, argyllcms

, fetchPypi

, wrapGAppsHook

, gtk3

, librsvg

, xorg

, argyllcms

}:



python3.pkgs.buildPythonApplication rec {
@@ -12,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { 
  version = "3.9.10";

  format = "setuptools";



  src = python3.pkgs.fetchPypi {

  src = fetchPypi {

    pname = "DisplayCAL";

    inherit version;

    hash = "sha256-oDHDVb0zuAC49yPfmNe7xuFKaA1BRZGr75XwsLqugHs=";

pkgs/applications/graphics/dosage/default.nix

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

{ lib, python3Packages, fetchPypi }:



python3Packages.buildPythonApplication rec {

  pname = "dosage";

  version = "2.17";



  src = python3Packages.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0";

  };

pkgs/applications/graphics/kcc/default.nix

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

, mkDerivationWith

, python3Packages

, fetchPypi

, p7zip

, archiveSupport ? true

}:
@@ -9,7 +10,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { 
  pname = "kcc";

  version = "5.5.1";



  src = python3Packages.fetchPypi {

  src = fetchPypi {

    inherit version;

    pname = "KindleComicConverter";

    sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";

pkgs/applications/graphics/veusz/default.nix

+5 −4
Original line number Diff line number Diff line 
{ python3Packages

, qtbase

{ lib

, python3Packages

, fetchPypi

, wrapQtAppsHook

, lib

, qtbase

}:



python3Packages.buildPythonApplication rec {

  pname = "veusz";

  version = "3.6.2";



  src = python3Packages.fetchPypi {

  src = fetchPypi {

    inherit pname version;

    sha256 = "whcaxF5LMEJNj8NSYeLpnb5uJboRl+vCQ1WxBrJjldE=";

  };

pkgs/applications/misc/meerk40t/default.nix

+1 −4
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ 
, wrapGAppsHook

}:



let

  inherit (python3.pkgs) buildPythonApplication buildPythonPackage fetchPypi;

in

buildPythonApplication rec {

python3.pkgs.buildPythonApplication rec {

  pname = "MeerK40t";

  version = "0.8.1000";

  format = "setuptools";