cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #233990 from wegank/development-fetchpypi

Browse source 
treewide: development: use top-level fetchPypi
This commit is contained in:
Weijia Wang 2023-05-25 16:54:14 +03:00 committed by GitHub
commit 342c730a0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 54 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/lesscpy/default.nix
View file

@ -1,10 +1,10 @@
{ stdenv, lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "lesscpy"; pname = "lesscpy";
version = "0.13.0"; version = "0.13.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1bbjag13kawnjdn7q4flfrkd0a21rgn9ycfqsgfdmg658jsx1ipk"; sha256 = "1bbjag13kawnjdn7q4flfrkd0a21rgn9ycfqsgfdmg658jsx1ipk";
}; };

5
pkgs/development/misc/resholve/deps.nix generated
View file

@ -2,6 +2,7 @@
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, python27 , python27
, fetchPypi
, ... , ...
}: }:
@ -47,7 +48,7 @@ rec {
pname = "six"; pname = "six";
version = "1.16.0"; version = "1.16.0";
src = python27.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926";
}; };
@ -64,7 +65,7 @@ rec {
pname = "typing"; pname = "typing";
version = "3.10.0.0"; version = "3.10.0.0";
src = python27.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130";
}; };

3
pkgs/development/python-modules/dashing/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonPackage rec { python3.pkgs.buildPythonPackage rec {
@ -9,7 +10,7 @@ python3.pkgs.buildPythonPackage rec {
disabled = python3.pythonOlder "3.7"; disabled = python3.pythonOlder "3.7";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs=";
}; };

3
pkgs/development/python-modules/memory_profiler/default.nix
View file

@ -1,12 +1,13 @@
{ lib { lib
, python , python
, fetchPypi
}: }:
python.pkgs.buildPythonPackage rec { python.pkgs.buildPythonPackage rec {
pname = "memory_profiler"; pname = "memory_profiler";
version = "0.55.0"; version = "0.55.0";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1hdgh5f59bya079w4ahx4l0hf4gc5yvaz44irp5x57cj9hkpp92z"; sha256 = "1hdgh5f59bya079w4ahx4l0hf4gc5yvaz44irp5x57cj9hkpp92z";
}; };

6
pkgs/development/python-modules/pyqtwebengine/default.nix
View file

@ -1,11 +1,11 @@
{ lib, stdenv, pythonPackages, pkg-config { lib, stdenv, pythonPackages, fetchPypi, pkg-config
, qmake, qtbase, qtsvg, qtwebengine , qmake, qtbase, qtsvg, qtwebengine
, wrapQtAppsHook , wrapQtAppsHook
, darwin , darwin
}: }:
let let
inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder; inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 sip pyqt-builder;
inherit (darwin) autoSignDarwinBinariesHook; inherit (darwin) autoSignDarwinBinariesHook;
in buildPythonPackage rec { in buildPythonPackage rec {
pname = "PyQtWebEngine"; pname = "PyQtWebEngine";
@ -14,7 +14,7 @@ in buildPythonPackage rec {
disabled = isPy27; disabled = isPy27;
src = pythonPackages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f"; sha256 = "06fc35hzg346a9c86dk7vzm1fakkgzn5l52jfq3bix3587sjip6f";
}; };

3
pkgs/development/python-modules/pystemd/default.nix
View file

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, lib , lib
, python , python
, fetchPypi
, systemd , systemd
, pytest , pytest
, mock , mock
@ -10,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pystemd"; pname = "pystemd";
version = "0.10.0"; version = "0.10.0";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk="; hash = "sha256-10qBS/2gEIXbGorZC+PLJ9ryOlGrawPn4p7IEfoq6Fk=";
}; };

3
pkgs/development/tools/aws-sam-cli/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
, enableTelemetry ? false , enableTelemetry ? false
}: }:
@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli"; pname = "aws-sam-cli";
version = "1.53.0"; version = "1.53.0";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-kIW+aGYuS+JgOMsPbeLgPSgLFNKLSqHaZ1CHpjs/IVI="; hash = "sha256-kIW+aGYuS+JgOMsPbeLgPSgLFNKLSqHaZ1CHpjs/IVI=";
}; };

4
pkgs/development/tools/b4/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python3Packages, patatt }: { lib, python3Packages, fetchPypi, patatt }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "b4"; pname = "b4";
version = "0.12.2"; version = "0.12.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4="; sha256 = "tvSv14v3iigFWzifCQl5Kxx4Bfs1V/XXHvvaNoKqvm4=";
}; };

4
pkgs/development/tools/backblaze-b2/default.nix
View file

@ -1,10 +1,10 @@
{ fetchFromGitHub, lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "backblaze-b2"; pname = "backblaze-b2";
version = "3.7.0"; version = "3.7.0";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit version; inherit version;
pname = "b2"; pname = "b2";
sha256 = "sha256-sW6gaZWUh3WX+0+qHRlQ4gZzKU4bL8ePPNKWo9rdF84="; sha256 = "sha256-sW6gaZWUh3WX+0+qHRlQ4gZzKU4bL8ePPNKWo9rdF84=";

4
pkgs/development/tools/build-managers/alibuild/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python }: { lib, python, fetchPypi }:
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "alibuild"; pname = "alibuild";
version = "1.11.2"; version = "1.11.2";
src = python.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-wq2H2inUf2CjPD45krCNdjw2s4FXsEDlfOHqW8VaVKg="; hash = "sha256-wq2H2inUf2CjPD45krCNdjw2s4FXsEDlfOHqW8VaVKg=";
}; };

3
pkgs/development/tools/build-managers/meson/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchPypi
, fetchpatch , fetchpatch
, installShellFiles , installShellFiles
, ninja , ninja
@ -19,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
pname = "meson"; pname = "meson";
version = "1.1.0"; version = "1.1.0";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-2WFsRM1sU2if+PBfxpWKaT8uF8NHKo2vg87lXav/gp8="; hash = "sha256-2WFsRM1sU2if+PBfxpWKaT8uF8NHKo2vg87lXav/gp8=";
}; };

3
pkgs/development/tools/cloudsmith-cli/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
version = "0.35.2"; version = "0.35.2";
format = "wheel"; format = "wheel";
src = python3.pkgs.fetchPypi { src = fetchPypi {
pname = "cloudsmith_cli"; pname = "cloudsmith_cli";
inherit format version; inherit format version;
hash = "sha256-+M4CPveS9dltMI291Atm84T/cf4dPOO3wPvPI15E73Y="; hash = "sha256-+M4CPveS9dltMI291Atm84T/cf4dPOO3wPvPI15E73Y=";

3
pkgs/development/tools/continuous-integration/buildbot/default.nix
View file

@ -1,4 +1,5 @@
{ python3 { python3
, fetchPypi
, recurseIntoAttrs , recurseIntoAttrs
, callPackage , callPackage
}: }:
@ -7,7 +8,7 @@ let
packageOverrides = self: super: { packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
version = "1.4.40"; version = "1.4.40";
src = super.fetchPypi { src = fetchPypi {
pname = "SQLAlchemy"; pname = "SQLAlchemy";
inherit version; inherit version;
hash = "sha256-RKZgUGCAzJdeHfpXdv5fYxXdxiane1C/Du4YsDieomU="; hash = "sha256-RKZgUGCAzJdeHfpXdv5fYxXdxiane1C/Du4YsDieomU=";

3
pkgs/development/tools/database/litecli/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -7,7 +8,7 @@ python3Packages.buildPythonApplication rec {
version = "1.9.0"; version = "1.9.0";
disabled = python3Packages.pythonOlder "3.4"; disabled = python3Packages.pythonOlder "3.4";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-Ia8s+gg91N8ePMqiohFxKbXxchJ1b1luoJDilndsJ6E="; sha256 = "sha256-Ia8s+gg91N8ePMqiohFxKbXxchJ1b1luoJDilndsJ6E=";
}; };

3
pkgs/development/tools/database/sqlite-web/default.nix
View file

@ -1,12 +1,13 @@
{ lib { lib
, python3Packages , python3Packages
, fetchPypi
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "sqlite-web"; pname = "sqlite-web";
version = "0.3.6"; version = "0.3.6";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg"; sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg";
}; };

3
pkgs/development/tools/devpi-client/default.nix
View file

@ -3,6 +3,7 @@
, git , git
, glibcLocales , glibcLocales
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -11,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
format = "setuptools"; format = "setuptools";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-csdQUxnopH+kYtoqdvyXKNW3fGkQNSREJYxjes9Dgi8="; hash = "sha256-csdQUxnopH+kYtoqdvyXKNW3fGkQNSREJYxjes9Dgi8=";
}; };

4
pkgs/development/tools/distgen/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python3 }: { lib, python3, fetchPypi }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "distgen"; pname = "distgen";
version = "1.5"; version = "1.5";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "08f9rw5irgv0gw7jizk5f9csn0yhrdnb84k40px1zbypsylvr5c5"; sha256 = "08f9rw5irgv0gw7jizk5f9csn0yhrdnb84k40px1zbypsylvr5c5";
}; };

4
pkgs/development/tools/eliot-tree/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "eliot-tree"; pname = "eliot-tree";
version = "19.0.1"; version = "19.0.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma"; sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma";
}; };

4
pkgs/development/tools/flootty/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "Flootty"; pname = "Flootty";
version = "3.2.2"; version = "3.2.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7"; sha256 = "0gfl143ly81pmmrcml91yr0ypvwrs5q4s1sfdc0l2qkqpy233ih7";
}; };

3
pkgs/development/tools/misc/tockloader/default.nix
View file

@ -1,12 +1,13 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "tockloader"; pname = "tockloader";
version = "1.9.0"; version = "1.9.0";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-7W55jugVtamFUL8N3dD1LFLJP2UDQb74V6o96rd/tEg="; hash = "sha256-7W55jugVtamFUL8N3dD1LFLJP2UDQb74V6o96rd/tEg=";
}; };

4
pkgs/development/tools/misc/usbsdmux/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "usbsdmux"; pname = "usbsdmux";
version = "0.2.1"; version = "0.2.1";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-gCxwR5jxzkH22B6nxBwAd0HpwWMIj/zp5VROJ0IWq7c="; sha256 = "sha256-gCxwR5jxzkH22B6nxBwAd0HpwWMIj/zp5VROJ0IWq7c=";
}; };

4
pkgs/development/tools/patatt/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "patatt"; pname = "patatt";
version = "0.6.2"; version = "0.6.2";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-WaEq4qWL6xAZ3cJJ/lkJ5XTIrXcOMIESbytvWbsYx2s="; sha256 = "sha256-WaEq4qWL6xAZ3cJJ/lkJ5XTIrXcOMIESbytvWbsYx2s=";
}; };

3
pkgs/development/tools/pifpaf/default.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, python3 , python3
, fetchPypi
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -7,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
version = "3.1.5"; version = "3.1.5";
format = "setuptools"; format = "setuptools";
src = python3.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; sha256 = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU=";
}; };

3
pkgs/development/tools/pypi2nix/default.nix
View file

@ -1,11 +1,12 @@
{ python3 { python3
, fetchPypi
}: }:
with python3; with python3;
pkgs.buildPythonApplication rec { pkgs.buildPythonApplication rec {
pname = "pypi2nix"; pname = "pypi2nix";
version = "2.0.4"; version = "2.0.4";
src = pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0y4zkkcijz5hchd8j6a106ysrg1dnad7dzdgnmz38rgm6zbrky0d"; sha256 = "0y4zkkcijz5hchd8j6a106ysrg1dnad7dzdgnmz38rgm6zbrky0d";
}; };

4
pkgs/development/tools/vim-vint/default.nix
View file

@ -1,4 +1,4 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
with python3Packages; with python3Packages;
@ -6,7 +6,7 @@ buildPythonApplication rec {
pname = "vim-vint"; pname = "vim-vint";
version = "0.3.21"; version = "0.3.21";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "15qdh8fby9xgfjxidcfv1xmrqqrxxapky7zmyn46qx1abhp9piax"; sha256 = "15qdh8fby9xgfjxidcfv1xmrqqrxxapky7zmyn46qx1abhp9piax";
}; };

4
pkgs/development/tools/wllvm/default.nix
View file

@ -1,10 +1,10 @@
{ lib, python3Packages }: { lib, python3Packages, fetchPypi }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
version = "1.3.1"; version = "1.3.1";
pname = "wllvm"; pname = "wllvm";
src = python3Packages.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE=";
}; };