diff options
author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
---|---|---|
committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
commit | 33afbf39f6f2a6b37e99f070ba7d17a28c416d02 (patch) | |
tree | 6431c14751da2ff638abc06b1c8e11f99315f2c3 /pkgs/os-specific | |
parent | 25193e2732e178f701f517ca15ff802f03b29933 (diff) |
treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have nativeCheckInputs to do that instead. Doing this treewide change allows to keep hashes identical to before the introduction of nativeCheckInputs.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/autosuspend/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/bolt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ell/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iputils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/iwd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lockdep/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/multipath-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/numatop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/openvswitch/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/power-profiles-daemon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/reptyr/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/setools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/solo5/default.nix | 2 |
15 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/autosuspend/default.nix b/pkgs/os-specific/linux/autosuspend/default.nix index 22d8e81f591e2..e0a4b9a0860d2 100644 --- a/pkgs/os-specific/linux/autosuspend/default.nix +++ b/pkgs/os-specific/linux/autosuspend/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { dbus-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook python-dbusmock pytest-httpserver diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 07214f4827637..fba4f8adbabe1 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=${umockdev.out}/lib/ ''; - checkInputs = [ + nativeCheckInputs = [ dbus gobject-introspection umockdev diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 3306d875272fd..e4ac8c3929d6a 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index ac4deb19f51ce..1ff496abd0cf3 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { ./makeconf.sh ''); - checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); + nativeCheckInputs = [ which ] ++ (with python3Packages; [ python pytest ]); checkPhase = '' python3 -m pytest test/ diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 0ca6d8aa187f3..951c84eaf492c 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; - checkInputs = [ iproute2 ]; + nativeCheckInputs = [ iproute2 ]; postInstall = '' mkdir $apparmor diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 54a9a53a03673..2d37d07dbe725 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { readline ]; - checkInputs = [ openssl ]; + nativeCheckInputs = [ openssl ]; # wrapPython wraps the scripts in $test. They pull in gobject-introspection, # which doesn't cross-compile. diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 047b2499a8278..3cdb64becb5ac 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ valgrind ]; + nativeCheckInputs = [ valgrind ]; checkPhase = '' # there are more /bin/bash references than just shebangs for f in lockdep run_tests.sh tests/*.sh; do diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index d39da5fb9d7f4..f1b129e80407a 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # skip test attempting to access /sys/dev/block substituteInPlace tests/Makefile --replace ' devt ' ' ' ''; - checkInputs = [ cmocka ]; + nativeCheckInputs = [ cmocka ]; passthru.tests = { inherit (nixosTests) iscsi-multipath-root; }; diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index 0946d5050db47..ad0138f18b751 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ numactl ncurses ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; patches = [ (fetchpatch { diff --git a/pkgs/os-specific/linux/openvswitch/generic.nix b/pkgs/os-specific/linux/openvswitch/generic.nix index c3d180bcbb7f8..ff0238e51aba0 100644 --- a/pkgs/os-specific/linux/openvswitch/generic.nix +++ b/pkgs/os-specific/linux/openvswitch/generic.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ iproute2 ] ++ (with python3.pkgs; [ netaddr diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index f2720f40f5d49..393583e08642d 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { glib polkit python3 # for cli tool - # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ umockdev dbus ]; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 5a3f9d2d77a20..0c58ca7b3b91f 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; - checkInputs = [ python ]; + nativeCheckInputs = [ python ]; doCheck = true; diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 9d547d2007eca..35a0355c0bc4b 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; - checkInputs = [ tox checkpolicy ]; + nativeCheckInputs = [ tox checkpolicy ]; preCheck = '' export CHECKPOLICY=${checkpolicy}/bin/checkpolicy ''; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 575ab514cc4b5..9973b1ac5a8a3 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -69,13 +69,13 @@ stdenv.mkDerivation rec { libusb1 udev systemd - # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev ] ++ lib.optionals useIMobileDevice [ libimobiledevice ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.dbus-python python3.pkgs.python-dbusmock python3.pkgs.pygobject3 diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 08c9f223ef79f..c449e46a998eb 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation { ''; doCheck = stdenv.hostPlatform.isLinux; - checkInputs = [ util-linux qemu ]; + nativeCheckInputs = [ util-linux qemu ]; checkPhase = '' runHook preCheck patchShebangs tests |