Merge pull request #220570 from Artturin/fixlints1

2023-03-14 02:15:55 +02:00 · 2023-03-14 02:15:55 +02:00 · b978bf0f0f
parent 49e2b72425 cab4a24c34
commit b978bf0f0f
28 changed files with 41 additions and 40 deletions
--- 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 = ''
--- 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
  '';
--- 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";
--- 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 = ''
--- 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)" ];

--- 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
  ];

--- 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
  ];

--- 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
  ];

--- 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
--- 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
  ];
--- 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
  ];

--- 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 ];

--- 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";
--- 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
--- 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
--- 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
--- 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";
--- 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")
--- 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
  ];

--- 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"
--- 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
  ];

--- 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
  ];

--- a/pkgs/development/tools/bacon/default.nix
+++ b/pkgs/development/tools/bacon/default.nix
@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-vEged6GfcdcibCm4JX4/GIo1qbVtT+jX721+iLKOQsc=";

-  buildInputs = lib.optional stdenv.isDarwin [
+  buildInputs = lib.optionals stdenv.isDarwin [
    CoreServices
  ];

--- 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 = [
--- 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
--- 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
  ];

--- 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}"
  ];

--- a/pkgs/tools/filesystems/garage/default.nix
+++ b/pkgs/tools/filesystems/garage/default.nix
@ -32,7 +32,7 @@ let
    buildFeatures = [
      "kubernetes-discovery"
    ] ++
-    (lib.optional (lib.versionAtLeast version "0.8") [
+    (lib.optionals (lib.versionAtLeast version "0.8") [
      "bundled-libs"
      "sled"
      "metrics"
@ -50,7 +50,7 @@ let
      "k2v"
      "kubernetes-discovery"
    ] ++
-    (lib.optional (lib.versionAtLeast version "0.8") [
+    (lib.optionals (lib.versionAtLeast version "0.8") [
      "bundled-libs"
      "sled"
      "lmdb"