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/servers | |
parent | 25193e2732e178f701f517ca15ff802f03b29933 (diff) | |
download | nixlib-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar nixlib-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.gz nixlib-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.bz2 nixlib-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.lz nixlib-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.xz nixlib-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.zst nixlib-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.zip |
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/servers')
36 files changed, 37 insertions, 37 deletions
diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix index 598483575cdc..45a43669502b 100644 --- a/pkgs/servers/ankisyncd/default.nix +++ b/pkgs/servers/ankisyncd/default.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { --add-flags "$out/share/ankisyncctl.py" ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest webtest ]; diff --git a/pkgs/servers/baserow/default.nix b/pkgs/servers/baserow/default.nix index a0470f0d275c..b64592d98929 100644 --- a/pkgs/servers/baserow/default.nix +++ b/pkgs/servers/baserow/default.nix @@ -103,7 +103,7 @@ with python.pkgs; buildPythonApplication rec { --prefix DJANGO_SETTINGS_MODULE : "baserow.config.settings.base" ''; - checkInputs = [ + nativeCheckInputs = [ baserow_premium boto3 freezegun diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 519f3e8abb4c..9051f2e87e54 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { # "cmd/dendritejs-pinecone" ]; - checkInputs = [ + nativeCheckInputs = [ postgresqlTestHook postgresql ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index addb4e2db5f0..929c76e7e2ca 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -87,7 +87,7 @@ unwrapped = stdenv.mkDerivation rec { ''; doInstallCheck = with stdenv; hostPlatform == buildPlatform; - installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; + nativeInstallCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' meson test --print-errorlogs ''; diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index 06f8c914ca21..efba7962a531 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ nettools python3.pkgs.pytest ]; diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index c38a8ee80f0c..db7d40ad35d5 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -37,7 +37,7 @@ in python.pkgs.buildPythonApplication rec { pyyaml ]; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index e5ce6d9744c4..32f17178fb33 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { # $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" #''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f1380c801d12..3d0863ed6fd0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -91,7 +91,7 @@ let --replace ", 'xandikos<0.2.4'" "" \ --replace ", 'radicale'" "" ''; - checkInputs = old.checkInputs ++ [ self.nose ]; + nativeCheckInputs = old.nativeCheckInputs ++ [ self.nose ]; }); dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { @@ -417,7 +417,7 @@ in python.pkgs.buildPythonApplication rec { # upstream only tests on Linux, so do we. doCheck = stdenv.isLinux; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ # test infrastructure (selectively from requirement_test.txt) freezegun pytest-asyncio diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 9b8c04432026..375f05501a50 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -100,7 +100,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( dontBuild = true; dontInstall = true; - checkInputs = old.checkInputs + nativeCheckInputs = old.nativeCheckInputs ++ home-assistant.getPackages component home-assistant.python.pkgs ++ extraCheckInputs.${component} or [ ]; diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index b236e1f2621f..8cb7be7f719a 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { makeFlags = [ "LDADD=$(_LDADD)" ]; doCheck = true; - checkInputs = [ inetutils wget ]; + nativeCheckInputs = [ inetutils wget ]; checkFlags = optional (!cgiSupport) "CGITESTS="; meta = with lib; { diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index af0926ded0d2..2cb6e6cfdd7a 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; doCheck = true; postInstall = '' diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 46942669ac67..459ca2c71300 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -47,7 +47,7 @@ with python3Packages; buildPythonApplication rec { make js ''; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index e739b1e8e9d5..d7ef3edf0152 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { runtimeDeps = [ openssl ]; doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin - checkInputs = [ mono ]; + nativeCheckInputs = [ mono ]; testProjectFile = "src/Jackett.Test/Jackett.Test.csproj"; postFixup = '' diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 7f221617878c..c55104345989 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { # listed as dependencies in setup.py. To use these, they should be # dependencies of the Django Python environment, but not of # HyperKitty so they're not included for people who don't need them. - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 elasticsearch mock diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 39f9b5ec37a8..3b4708ca5a15 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ mock nose2 ]; diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index bd4425e5efa7..ddd7d4991f42 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; - checkInputs = [ beautifulsoup4 vcrpy mock ]; + nativeCheckInputs = [ beautifulsoup4 vcrpy mock ]; # Tries to connect to database. doCheck = false; diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix index 8ffbab1eac19..a70ef432fc49 100644 --- a/pkgs/servers/mail/public-inbox/default.nix +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -116,7 +116,7 @@ buildPerlPackage rec { ]; doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ MailIMAPClient curl git diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index a8a4d9550f7f..778444eda078 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -83,7 +83,7 @@ buildPythonApplication rec { ] ++ lib.optional enableSystemd systemd ++ lib.optionals enableRedis [ hiredis txredisapi ]; - checkInputs = [ mock parameterized openssl ]; + nativeCheckInputs = [ mock parameterized openssl ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/servers/matrix-synapse/plugins/ldap3.nix index 394c0f5e58bb..0f816164cbee 100644 --- a/pkgs/servers/matrix-synapse/plugins/ldap3.nix +++ b/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -13,5 +13,5 @@ buildPythonPackage rec { # ldaptor is not ready for py3 yet doCheck = !isPy3k; - checkInputs = [ ldaptor mock ]; + nativeCheckInputs = [ ldaptor mock ]; } diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix index 03d9f85f439e..afee6b4241c4 100644 --- a/pkgs/servers/mir/default.nix +++ b/pkgs/servers/mir/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { wlcs ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 1ffbe6004b8c..59425cfcf691 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison patchelf ]; doCheck = true; - checkInputs = [ tzdata ]; # legacytimeperiod/dst needs this + nativeCheckInputs = [ tzdata ]; # legacytimeperiod/dst needs this postFixup = '' rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index cae036926ff5..663436be9c79 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; + nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; vendorSha256 = "sha256-GuaBdqiqKUhYySYlJlJIR1NhUx7LuCqcUSXfLTkIvQI="; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix index fb2d9c5f4e7f..9904147420aa 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { find test -name "*.py" -execdir sed -i "s@./check_systemd.py@$out/bin/check_systemd@" '{}' ";" export PATH=$PATH:$out/bin ''; - checkInputs = [ python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = with lib; { description = "Nagios / Icinga monitoring plugin to check systemd for failed units"; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 9e622b69d89e..f1044ca4f816 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ uvicorn.optional-dependencies.standard; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ aiohttp pytest-asyncio pytestCheckHook diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 2a1368bfcbea..f9d9ce499b5f 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { pyyaml ]); - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ unittestCheckHook pytz ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 44d8185b064e..2792cb1dcb77 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -156,7 +156,7 @@ let # Otherwise, the meson log says: # # Program zip found: NO - checkInputs = [ zip ]; + nativeCheckInputs = [ zip ]; doCheck = true; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index b34c18a08bc6..5ec8361e2d7b 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.isDarwin; - checkInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; + nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 05d2a97a0e6e..edf7255e2229 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -32,7 +32,7 @@ with python3.pkgs; buildPythonApplication rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index a739d993e77a..737582d76319 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-runner pytest ]; diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 0d980a6c3ff0..1827c30be984 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pytz # https://github.com/Kozea/Radicale/issues/816 ] ++ passlib.optional-dependencies.bcrypt; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook waitress ]; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 6eaaa4a7366a..23c165ab545f 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -41,7 +41,7 @@ pythonPackages.buildPythonApplication rec { ydiff ]; - checkInputs = with pythonPackages; [ + nativeCheckInputs = with pythonPackages; [ flake8 mock pytestCheckHook diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 362a7432ff49..4b7ce81b459b 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--enable-linux-netfilter"; doCheck = true; - checkInputs = [ cppunit ]; + nativeCheckInputs = [ cppunit ]; preCheck = '' # tests attempt to copy around "/bin/true" to make some things # no-ops but this doesn't work if our "true" is a multi-call diff --git a/pkgs/servers/tarantool/default.nix b/pkgs/servers/tarantool/default.nix index a6762135554e..bdb36a7f10ad 100644 --- a/pkgs/servers/tarantool/default.nix +++ b/pkgs/servers/tarantool/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { c-ares ]; - checkInputs = [ gbenchmark ]; + nativeCheckInputs = [ gbenchmark ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index ac08b5958231..cf1ef65b61a8 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -40,7 +40,7 @@ let # https://github.com/NixOS/nixpkgs/issues/161570 , # buildRustPackage sets strictDeps = true; - checkInputs = buildInputs; + nativeCheckInputs = buildInputs; OPENSSL_NO_VENDOR = "1"; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index ac09e5325889..cb7d703b5c8f 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -83,7 +83,7 @@ py.pkgs.buildPythonApplication rec { # tests can currently not be run in one pytest invocation and without docker doCheck = false; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ pytest-flask pytestCheckHook ]; diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index d76f28f99809..f6afb09819f8 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { passthru.tests.xandikos = nixosTests.xandikos; - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; disabledTests = [ # these tests are failing due to the following error: # TypeError: expected str, bytes or os.PathLike object, not int |