From cab4a24c342825d60f164aa499fd586fe6d0efeb Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 11 Mar 2023 00:55:17 +0200 Subject: [PATCH] treewide: fix lints Arg to lib.optional is a list build time tool in buildInputs --- nixos/modules/services/monitoring/grafana.nix | 2 +- pkgs/applications/audio/musikcube/default.nix | 6 +++--- pkgs/applications/editors/l3afpad/default.nix | 4 ++-- pkgs/applications/emulators/c64-debugger/default.nix | 2 +- pkgs/applications/file-managers/lf/ctpv.nix | 4 ++-- pkgs/applications/misc/citations/default.nix | 2 +- pkgs/applications/misc/mediaelch/default.nix | 2 +- .../networking/browsers/opera/default.nix | 2 +- .../networking/instant-messengers/nchat/default.nix | 2 +- pkgs/applications/science/biology/neuron/default.nix | 12 ++++++------ pkgs/applications/search/recoll/default.nix | 4 ++-- pkgs/desktops/deepin/library/gio-qt/default.nix | 4 ++-- .../deepin/library/qt5platform-plugins/default.nix | 2 +- pkgs/development/compilers/gnatboot/default.nix | 2 +- pkgs/development/libraries/jbig2enc/default.nix | 2 +- pkgs/development/libraries/libax25/default.nix | 2 +- pkgs/development/libraries/libdatovka/default.nix | 3 ++- pkgs/development/libraries/libfabric/default.nix | 2 +- pkgs/development/misc/datafusion/default.nix | 2 +- pkgs/development/python-modules/pyregion/default.nix | 2 +- .../python-modules/python-redis-lock/default.nix | 2 +- .../python-modules/scikit-hep-testdata/default.nix | 2 +- pkgs/development/tools/bacon/default.nix | 2 +- pkgs/games/naev/default.nix | 2 +- pkgs/misc/dxvk/dxvk.nix | 2 +- pkgs/misc/wiki-tui/default.nix | 2 +- pkgs/os-specific/linux/rtl8821au/default.nix | 2 +- pkgs/tools/filesystems/garage/default.nix | 4 ++-- 28 files changed, 41 insertions(+), 40 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index ba3f89e24dd4..5a8c65b9dc3f 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -1300,7 +1300,7 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" - ] ++ lib.optional (cfg.settings.server.protocol == "socket") [ "@chown" ]; + ] ++ lib.optionals (cfg.settings.server.protocol == "socket") [ "@chown" ]; UMask = "0027"; }; preStart = '' diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index c9e1bed1db25..5697e5986c11 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { Cocoa SystemConfiguration ] ++ lib.optionals coreaudioSupport [ CoreAudio - ] ++ lib.optional sndioSupport [ + ] ++ lib.optionals sndioSupport [ sndio - ] ++ lib.optional pipewireSupport [ + ] ++ lib.optionals pipewireSupport [ pipewire ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { "-DDISABLE_STRIP=true" ]; - postFixup = lib.optionals stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname} install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d ''; diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix index e047aaa27028..2ccea6afc3ee 100644 --- a/pkgs/applications/editors/l3afpad/default.nix +++ b/pkgs/applications/editors/l3afpad/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; }; - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; - buildInputs = [ intltool gtk3 ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ]; + buildInputs = [ gtk3 ]; meta = with lib; { description = "Simple text editor forked from Leafpad using GTK+ 3.x"; diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix index b7c357ca2709..fcd3a0aa9b52 100644 --- a/pkgs/applications/emulators/c64-debugger/default.nix +++ b/pkgs/applications/emulators/c64-debugger/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { gtk3 libGL libGLU - pkg-config libX11 xcbutil ]; nativeBuildInputs = [ upx + pkg-config ]; postPatch = '' diff --git a/pkgs/applications/file-managers/lf/ctpv.nix b/pkgs/applications/file-managers/lf/ctpv.nix index 7f5e2a6e089e..36a01078831a 100644 --- a/pkgs/applications/file-managers/lf/ctpv.nix +++ b/pkgs/applications/file-managers/lf/ctpv.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { buildInputs = with pkgs; [ ffmpegthumbnailer ffmpeg - ] ++ lib.optional waylandSupport [ chafa ] - ++ lib.optional x11Support [ ueberzug ]; + ] ++ lib.optionals waylandSupport [ chafa ] + ++ lib.optionals x11Support [ ueberzug ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/applications/misc/citations/default.nix index 928978ef47f4..8e324595593f 100644 --- a/pkgs/applications/misc/citations/default.nix +++ b/pkgs/applications/misc/citations/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita poppler - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 89179b88a8a0..533e05264bc8 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { qtsvg qtwayland quazip - ] ++ lib.optional (qtVersion == "6") [ + ] ++ lib.optionals (qtVersion == "6") [ qt5compat ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index e4730e1869f8..1634c72b27b7 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { # "Illegal instruction (core dumped)" gtk3 gtk4 - ] ++ lib.optional proprietaryCodecs [ + ] ++ lib.optionals proprietaryCodecs [ vivaldi-ffmpeg-codecs ]; diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix index 43d2d7e37455..4fe0cc054b7e 100644 --- a/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { readline sqlite zlib - ] ++ lib.optional stdenv.isDarwin [ AppKit Cocoa Foundation ]; + ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ]; cmakeFlags = [ "-DHAS_WHATSAPP=OFF" # go module build required diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 115def63a309..5b08fbfd6704 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { bison flex git - ] ++ lib.optional useCore [ perl gsl ] - ++ lib.optional stdenv.isDarwin [ xcbuild ]; + ] ++ lib.optionals useCore [ perl gsl ] + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - buildInputs = lib.optional useIv [ + buildInputs = lib.optionals useIv [ xorg.libX11.dev xorg.libXcomposite.dev xorg.libXext.dev @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { python3.pkgs.setuptools python3.pkgs.scikit-build python3.pkgs.matplotlib - ] ++ lib.optional useMpi [ + ] ++ lib.optionals useMpi [ mpi - ] ++ lib.optional useMpi [ + ] ++ lib.optionals useMpi [ python3.pkgs.mpi4py - ] ++ lib.optional useRx3d [ + ] ++ lib.optionals useRx3d [ python3.pkgs.cython python3.pkgs.numpy ]; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 56d68fcd474b..cccb5680042d 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -79,9 +79,9 @@ mkDerivation rec { python3Packages.mutagen xapian zlib - ] ++ lib.optional withGui [ + ] ++ lib.optionals withGui [ qtbase - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix index 5c27afe7e4c0..d00b5ffabe4f 100644 --- a/pkgs/desktops/deepin/library/gio-qt/default.nix +++ b/pkgs/desktops/deepin/library/gio-qt/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { cmake pkg-config wrapQtAppsHook - ] ++ lib.optional buildDocs [ doxygen qttools.dev ]; + ] ++ lib.optionals buildDocs [ doxygen qttools.dev ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DPROJECT_VERSION=${version}" - ] ++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; + ] ++ lib.optionals (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; propagatedBuildInputs = [ glibmm ]; diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 6ebe542398b7..1a1d8661563a 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" ] - ++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; + ++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; meta = with lib; { description = "Qt platform plugins for DDE"; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 7ef2ce03df94..957b21c22b80 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { sourceHighlight xz zlib - ] ++ lib.optional stdenv.buildPlatform.isLinux [ + ] ++ lib.optionals stdenv.buildPlatform.isLinux [ autoPatchelfHook elfutils glibc diff --git a/pkgs/development/libraries/jbig2enc/default.nix b/pkgs/development/libraries/jbig2enc/default.nix index 26b21aa7c957..734cb3839ad4 100644 --- a/pkgs/development/libraries/jbig2enc/default.nix +++ b/pkgs/development/libraries/jbig2enc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { hash = "sha256-IAL4egXgaGmCilzcryjuvOoHhahyrfGWY68GBfXXgAM="; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ leptonica zlib diff --git a/pkgs/development/libraries/libax25/default.nix b/pkgs/development/libraries/libax25/default.nix index 7388a728f5f0..27f519099006 100644 --- a/pkgs/development/libraries/libax25/default.nix +++ b/pkgs/development/libraries/libax25/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "libax25"; version = "0.0.12-rc5"; - buildInputs = [ glibc ] ++ lib.optional stdenv.hostPlatform.isStatic [ glibc.static ]; + buildInputs = [ glibc ] ++ lib.optionals stdenv.hostPlatform.isStatic [ glibc.static ]; # Due to recent unsolvable administrative domain problems with linux-ax25.org, # the new domain is linux-ax25.in-berlin.de diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix index 8cddc9a9f37a..a6744c23e1d3 100644 --- a/pkgs/development/libraries/libdatovka/default.nix +++ b/pkgs/development/libraries/libdatovka/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook" ]; - buildInputs = [ pkg-config autoreconfHook expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = [ expat gpgme libgcrypt libxml2 libxslt gnutls curl docbook_xsl ]; meta = with lib; { description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system"; diff --git a/pkgs/development/libraries/libfabric/default.nix b/pkgs/development/libraries/libfabric/default.nix index 1ad19d425d3c..1c3a5e31deb9 100644 --- a/pkgs/development/libraries/libfabric/default.nix +++ b/pkgs/development/libraries/libfabric/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optional enablePsm2 [ libpsm2 ]; + buildInputs = lib.optionals enableOpx [ libuuid numactl ] ++ lib.optionals enablePsm2 [ libpsm2 ]; configureFlags = [ (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix index f048839292b6..6e79d0a3be2a 100644 --- a/pkgs/development/misc/datafusion/default.nix +++ b/pkgs/development/misc/datafusion/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-w+/5Ig+U8y4nwu7QisnZvc3UlZaEU/kovV6birOWndE="; - buildInputs = lib.optional stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 9e8fd5f78922..26678f31983c 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; - disabledTests = lib.optional (!stdenv.hostPlatform.isDarwin) [ + disabledTests = lib.optionals (!stdenv.hostPlatform.isDarwin) [ # Skipping 2 tests because it's failing. Domain knowledge was unavailable on decision. # Error logs: https://gist.github.com/superherointj/3f616f784014eeb2e3039b0f4037e4e9 "test_calculate_rotation_angle" diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 103349f7b65f..44527977bc19 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - ] ++ lib.optional withDjango [ + ] ++ lib.optionals withDjango [ django-redis ]; diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 1e8b6263b8a0..e387af7e223b 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml requests - ] ++ lib.optional (!pythonAtLeast "3.9") [ + ] ++ lib.optionals (!pythonAtLeast "3.9") [ importlib-resources ]; diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index c336375d2d1a..16db91211de0 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uiKKyIy2IHDtHWJmG3G9UVHaASL9uEg5Zu+2Wj8mw0k="; - buildInputs = lib.optional stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index f4daedd672b0..ca2efff3e90a 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { enet freetype glpk - intltool libpng libunibreak libvorbis @@ -61,6 +60,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + intltool ]; mesonFlags = [ diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix index 793264f9b30b..e0aa7105bb35 100644 --- a/pkgs/misc/dxvk/dxvk.nix +++ b/pkgs/misc/dxvk/dxvk.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { inherit (srcs.${dxvkVersion}) version src patches; nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = lib.optional isWindows [ windows.pthreads ] + buildInputs = lib.optionals isWindows [ windows.pthreads ] ++ lib.optionals isDxvk2 ( [ spirv-headers vulkan-headers ] ++ lib.optional (!isWindows && sdl2Support) SDL2 diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index bb5fef313fa3..13f029ecd14a 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index c709c702f931..aa4a7f661e7b 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "ARCH=${stdenv.hostPlatform.linuxArch}" ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index f41ad499dc09..735d2dff7dd6 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -28,7 +28,7 @@ let buildFeatures = [ "kubernetes-discovery" ] ++ - (lib.optional (lib.versionAtLeast version "0.8") [ + (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" "metrics" @@ -45,7 +45,7 @@ let "k2v" "kubernetes-discovery" ] ++ - (lib.optional (lib.versionAtLeast version "0.8") [ + (lib.optionals (lib.versionAtLeast version "0.8") [ "bundled-libs" "sled" "metrics"