Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: fix buildInputs attribute typos #315204

Merged
merged 13 commits into from
Sep 13, 2024
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildDunePackage rec {
hash = "sha256-G2jjsc/i9Qgo0TP+ZE4gB/1cjuZ9l8R7e59K2DGD5GY=";
};

nativeBuildInpts = [
nativeBuildInputs = [
ppx_sexp_conv
ppx_deriving
];
Expand Down
3 changes: 0 additions & 3 deletions pkgs/applications/science/molecular-dynamics/raspa/data.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ lib
, stdenvNoCC
, gzip
, raspa
}:

Expand All @@ -10,8 +9,6 @@ stdenvNoCC.mkDerivation rec {

outputs = [ "out" "doc" ];

nativeBuildInpuhs = [ gzip ];

installPhase = ''
runHook preInstall
mkdir -p "$out/share/raspa"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/build-support/trivial-builders/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ rec {
makeSetupHook =
{ name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook"
, deps ? [ ]
# hooks go in nativeBuildInput so these will be nativeBuildInput
# hooks go in nativeBuildInputs so these will be nativeBuildInputs
, propagatedBuildInputs ? [ ]
# these will be buildInputs
, depsTargetTargetPropagated ? [ ]
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/lief/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
ninja
];

# Not a propagatedBuildInput because only the $py output needs it; $out is
# Not in propagatedBuildInputs because only the $py output needs it; $out is
# just the library itself (e.g. C/C++ headers).
buildInputs = with python.pkgs; [
python
Expand Down
9 changes: 8 additions & 1 deletion pkgs/development/libraries/tezos-rust-libs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ llvmPackages_12.llvm cargo ];
propagatedBuildDeps = [ llvmPackages_12.libllvm ];
propagatedBuildInputs = [ llvmPackages_12.libllvm ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

buildPhase = ''
Expand Down Expand Up @@ -48,4 +48,11 @@ stdenv.mkDerivation rec {
'';

cargoVendorDir = "./vendor";

meta = {
homepage = "https://gitlab.com/tezos/tezos-rust-libs";
description = "Tezos: all rust dependencies and their dependencies";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ulrikstrid ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/django-pwa/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [ django ];

pyImportCheck = [ "pwa" ];
pythonImportsCheck = [ "pwa" ];

checkPhase = ''
runHook preCheck
Expand Down
30 changes: 25 additions & 5 deletions pkgs/development/python-modules/ipyniivue/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
fetchNpmDeps,
pythonOlder,
nodejs,
npmHooks,
hatchling,
hatch-vcs,
anywidget,
Expand All @@ -16,23 +19,40 @@ buildPythonPackage rec {

disabled = pythonOlder "3.7";

src = fetchPypi {
inherit pname version;
hash = "sha256-C0mYkguN4ZfxSLqETH3dUwXeoNcicrmAgp6e9IIT43s=";
src = fetchFromGitHub {
owner = "niivue";
repo = "ipyniivue";
rev = "v${version}";
hash = "sha256-6DZmHVVxJspjUhJ9pzTmTvwAnQfvTp8OL2xZONz2XbU=";
};

npmDeps = fetchNpmDeps {
name = "${pname}-${version}-npm-deps";
inherit src;
hash = "sha256-ZJRBGMNn5clxMavimfl6Jwqf7M2pRo+WLne0gUWOiJ8=";
};

# We do not need the build hooks, because we do not need to
# build any JS components; these are present already in the PyPI artifact.
env.HATCH_BUILD_NO_HOOKS = true;

nativeBuildInputs = [
nodejs
npmHooks.npmConfigHook
];

preBuild = ''
npm run build
'';

build-system = [
hatchling
hatch-vcs
];

dependencies = [ anywidget ];

nativeCheckImports = [ pytestCheckHook ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "ipyniivue" ];

meta = with lib; {
Expand Down
29 changes: 24 additions & 5 deletions pkgs/development/python-modules/openapi3/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
lib,
buildPythonPackage,
pythonOlder,
fetchPypi,
fetchFromGitHub,
requests,
pyyaml,
setuptools,
pytestCheckHook,
pytest-asyncio,
uvloop,
hypercorn,
starlette,
pydantic_1,
}:

buildPythonPackage rec {
Expand All @@ -15,9 +20,11 @@ buildPythonPackage rec {
pyproject = true;

disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-ohpJBXPYnKaa2ny+WFrbL8pJZCV/bzod9THxKBVFXSw=";
src = fetchFromGitHub {
owner = "Dorthu";
repo = "openapi3";
rev = version;
hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA=";
};

nativeBuildInputs = [ setuptools ];
Expand All @@ -27,7 +34,19 @@ buildPythonPackage rec {
pyyaml
];

nativeCheckinputs = [ pytestCheckHook ];
nativeCheckInputs = [
pytestCheckHook
pytest-asyncio
pydantic_1
uvloop
hypercorn
starlette
];

disabledTestPaths = [
# tests old fastapi behaviour
"tests/fastapi_test.py"
];

pythonImportsCheck = [ "openapi3" ];

Expand Down
12 changes: 7 additions & 5 deletions pkgs/development/python-modules/pycodestyle/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
buildPythonPackage,
pythonOlder,
fetchPypi,
fetchFromGitHub,
lib,
python,
pytestCheckHook,
Expand All @@ -15,14 +15,16 @@ buildPythonPackage rec {

format = "setuptools";

src = fetchPypi {
inherit pname version;
hash = "sha256-RC+VAUG09D33Ut0wNRH/3tOgTCtvt/ZZgFdPDDHm55w=";
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pycodestyle";
rev = version;
hash = "sha256-YN1KOJ8f+VY9vJTWm3aTOOai66dveKOKOpeBkZKkC2A=";
};

pythonImportsCheck = [ "pycodestyle" ];

nativCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [ pytestCheckHook ];

# https://github.com/PyCQA/pycodestyle/blob/2.11.0/tox.ini#L16
postCheck = ''
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/pyogg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
}:

buildPythonPackage rec {

pname = "pyogg";
version = "0.6.14a1";

Expand All @@ -29,7 +28,7 @@ buildPythonPackage rec {
libopus
];

propagatedBuidInputs = [
propagatedBuildInputs = [
libvorbis
flac
libogg
Expand Down
3 changes: 0 additions & 3 deletions pkgs/development/python-modules/summarytools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
matplotlib,
numpy,
pandas,
pytestCheckHook,
}:

buildPythonPackage rec {
Expand All @@ -32,8 +31,6 @@ buildPythonPackage rec {
pandas
];

nativeCheckImports = [ pytestCheckHook ];

pythonImportsCheck = [ "summarytools" ];

meta = with lib; {
Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/python-modules/symengine/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ buildPythonPackage rec {

postPatch = ''
substituteInPlace setup.py \
--replace-fail "\"cmake\"" "\"${lib.getExe' cmake "cmake"}\"" \
--replace-fail "'cython>=0.29.24'" "'cython'"

export PATH=${cython}/bin:$PATH
'';

nativeBuildUnputs = [ cmake ];
dontUseCmakeConfigure = true;
nativeBuildInputs = [ cmake ];

buildInputs = [ cython ];

Expand All @@ -58,8 +58,10 @@ buildPythonPackage rec {
];

checkPhase = ''
runHook preCheck
mkdir empty && cd empty
${python.interpreter} ../bin/test_python.py
runHook postCheck
'';

meta = with lib; {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/torch/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ buildPythonPackage rec {
cuda_cccl # <thrust/*>
cuda_cudart # cuda_runtime.h and libraries
cuda_cupti # For kineto
cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildinputs, it's needed here too
cuda_nvcc # crt/host_config.h; even though we include this in nativeBuildInputs, it's needed here too
cuda_nvml_dev # <nvml.h>
cuda_nvrtc
cuda_nvtx # -llibNVToolsExt
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/trimesh/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ buildPythonPackage rec {

meta = with lib; {
description = "Python library for loading and using triangular meshes";
homepage = "https://trimsh.org/";
homepage = "https://trimesh.org/";
changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [
Expand Down