various: migrate python3Packages to by-name (#454647)
This commit is contained in:
@@ -1,13 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
setuptools,
|
||||
boto3,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "aws-mfa";
|
||||
version = "0.0.12";
|
||||
pyproject = true;
|
||||
@@ -28,11 +26,11 @@ buildPythonApplication rec {
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
build-system = with python3Packages; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
dependencies = with python3Packages; [
|
||||
boto3
|
||||
];
|
||||
|
||||
+4
-11
@@ -1,19 +1,12 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
lib,
|
||||
iverilog,
|
||||
verilator,
|
||||
gnumake,
|
||||
edalize,
|
||||
fastjsonschema,
|
||||
pyparsing,
|
||||
pyyaml,
|
||||
simplesat,
|
||||
ipyxact,
|
||||
setuptools-scm,
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "fusesoc";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
@@ -23,9 +16,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-M36bXBgY8hR33AVDlHoH8PZJG2Bi0KOEI07IMns7R4w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm ];
|
||||
nativeBuildInputs = with python3Packages; [ setuptools-scm ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
edalize
|
||||
fastjsonschema
|
||||
pyparsing
|
||||
+4
-11
@@ -1,17 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
annexremote,
|
||||
buildPythonApplication,
|
||||
drivelib,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
gitpython,
|
||||
humanfriendly,
|
||||
tenacity,
|
||||
setuptools,
|
||||
distutils,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "git-annex-remote-googledrive";
|
||||
version = "1.3.2";
|
||||
pyproject = true;
|
||||
@@ -21,9 +14,9 @@ buildPythonApplication rec {
|
||||
sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
annexremote
|
||||
drivelib
|
||||
gitpython
|
||||
+3
-5
@@ -1,13 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
version = "0.16.6.1";
|
||||
format = "setuptools";
|
||||
pname = "gita";
|
||||
@@ -19,7 +17,7 @@ buildPythonApplication rec {
|
||||
owner = "nosarthur";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
pyyaml
|
||||
setuptools
|
||||
];
|
||||
@@ -1,13 +1,11 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
fusepy,
|
||||
pyserial,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mpy-utils";
|
||||
version = "0.1.13";
|
||||
format = "setuptools";
|
||||
@@ -17,7 +15,7 @@ buildPythonApplication rec {
|
||||
hash = "sha256-die8hseaidhs9X7mfFvV8C8zn0uyw08gcHNqmjl+2Z4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
fusepy
|
||||
pyserial
|
||||
];
|
||||
+3
-5
@@ -1,15 +1,13 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
buildPythonApplication,
|
||||
dbus-python,
|
||||
pygobject3,
|
||||
python3Packages,
|
||||
systemd,
|
||||
wirelesstools,
|
||||
wrapGAppsNoGuiHook,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "networkd-notify";
|
||||
version = "unstable-2022-11-29";
|
||||
# There is no setup.py, just a single Python script.
|
||||
@@ -26,7 +24,7 @@ buildPythonApplication rec {
|
||||
wrapGAppsNoGuiHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
dbus-python
|
||||
pygobject3
|
||||
];
|
||||
+5
-10
@@ -1,15 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
pyxdg,
|
||||
pytestCheckHook,
|
||||
pytest-cov-stub,
|
||||
pytest-mock,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pass-git-helper";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
@@ -21,15 +16,15 @@ buildPythonApplication rec {
|
||||
sha256 = "sha256-SAMndgcxBa7wymXbOwRGcoogFfzpFFIZ0tF4NSCXpjw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = [ pyxdg ];
|
||||
dependencies = with python3Packages; [ pyxdg ];
|
||||
|
||||
env.HOME = "$TMPDIR";
|
||||
|
||||
pythonImportsCheck = [ "passgithelper" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
pytest-cov-stub
|
||||
pytest-mock
|
||||
+4
-11
@@ -1,24 +1,17 @@
|
||||
{
|
||||
buildPythonApplication,
|
||||
python3Packages,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
setuptools,
|
||||
setuptools-rust,
|
||||
rustPlatform,
|
||||
cargo,
|
||||
rustc,
|
||||
breezy,
|
||||
dulwich,
|
||||
jinja2,
|
||||
libiconv,
|
||||
openssl,
|
||||
pyyaml,
|
||||
ruamel-yaml,
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "silver-platter";
|
||||
version = "0.5.20";
|
||||
pyproject = true;
|
||||
@@ -35,7 +28,7 @@ buildPythonApplication rec {
|
||||
hash = "sha256-hZQfzaLvHSN/hGR5vn+/2TRH6GwDTTp+UcnePXY7JlM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = with python3Packages; [
|
||||
setuptools
|
||||
breezy
|
||||
dulwich
|
||||
@@ -44,7 +37,7 @@ buildPythonApplication rec {
|
||||
ruamel-yaml
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
setuptools-rust
|
||||
python3Packages.setuptools-rust
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
@@ -1074,12 +1074,6 @@ with pkgs;
|
||||
|
||||
mkosi-full = mkosi.override { withQemu = true; };
|
||||
|
||||
mpy-utils = python3Packages.callPackage ../tools/misc/mpy-utils { };
|
||||
|
||||
networkd-notify = python3Packages.callPackage ../tools/networking/networkd-notify {
|
||||
systemd = pkgs.systemd;
|
||||
};
|
||||
|
||||
ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
|
||||
|
||||
openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };
|
||||
@@ -1208,8 +1202,6 @@ with pkgs;
|
||||
|
||||
forgejo-lts = callPackage ../by-name/fo/forgejo/lts.nix { };
|
||||
|
||||
gita = python3Packages.callPackage ../applications/version-management/gita { };
|
||||
|
||||
github-cli = gh;
|
||||
|
||||
git-annex-metadata-gui =
|
||||
@@ -1227,10 +1219,6 @@ with pkgs;
|
||||
;
|
||||
};
|
||||
|
||||
git-annex-remote-googledrive =
|
||||
python3Packages.callPackage ../applications/version-management/git-annex-remote-googledrive
|
||||
{ };
|
||||
|
||||
git-credential-manager = callPackage ../applications/version-management/git-credential-manager { };
|
||||
|
||||
gitRepo = git-repo;
|
||||
@@ -1244,14 +1232,8 @@ with pkgs;
|
||||
;
|
||||
};
|
||||
|
||||
pass-git-helper =
|
||||
python3Packages.callPackage ../applications/version-management/pass-git-helper
|
||||
{ };
|
||||
|
||||
qgit = qt6Packages.callPackage ../applications/version-management/qgit { };
|
||||
|
||||
silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { };
|
||||
|
||||
svn-all-fast-export =
|
||||
libsForQt5.callPackage ../applications/version-management/svn-all-fast-export
|
||||
{ };
|
||||
@@ -1309,8 +1291,6 @@ with pkgs;
|
||||
|
||||
firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
|
||||
|
||||
fusesoc = python3Packages.callPackage ../tools/package-management/fusesoc { };
|
||||
|
||||
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
|
||||
|
||||
goldberg-emu = callPackage ../applications/emulators/goldberg-emu {
|
||||
@@ -1530,8 +1510,6 @@ with pkgs;
|
||||
|
||||
autoflake = with python3.pkgs; toPythonApplication autoflake;
|
||||
|
||||
aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };
|
||||
|
||||
azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;
|
||||
|
||||
# Derivation's result is not used by nixpkgs. Useful for validation for
|
||||
|
||||
Reference in New Issue
Block a user