From 63fa53d97cb5d1c9fac3facab500926684772f35 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 24 Sep 2024 18:51:25 +0300 Subject: [PATCH] treewide: reformat files which need reformatting after `treewide: replace stdenv.is with stdenv.hostPlatform.is` --- pkgs/applications/misc/blender/default.nix | 13 +- .../misc/zathura/core/default.nix | 27 +++-- .../applications/networking/pjsip/default.nix | 4 +- pkgs/by-name/av/avbroot/package.nix | 4 +- pkgs/by-name/ch/chatd/package.nix | 4 +- pkgs/by-name/da/darklua/package.nix | 4 +- pkgs/by-name/de/debase/package.nix | 4 +- pkgs/by-name/do/dotter/package.nix | 4 +- pkgs/by-name/fl/flameshot/package.nix | 5 +- pkgs/by-name/gd/gdlv/package.nix | 3 +- pkgs/by-name/ge/gepetto-viewer/package.nix | 18 +-- pkgs/by-name/ht/httptoolkit/package.nix | 4 +- pkgs/by-name/ld/ld64/package.nix | 17 +-- .../ma/maa-assistant-arknights/package.nix | 113 +++++++++--------- pkgs/by-name/mi/mistral-rs/package.nix | 7 +- pkgs/by-name/nt/ntpd-rs/package.nix | 4 +- pkgs/by-name/op/ophcrack/package.nix | 3 +- .../by-name/pr/protonmail-desktop/package.nix | 8 +- pkgs/by-name/py/pylyzer/package.nix | 4 +- pkgs/by-name/ra/rathole/package.nix | 8 +- pkgs/by-name/ru/rustlings/package.nix | 4 +- pkgs/by-name/th/thonny/package.nix | 4 +- pkgs/by-name/ty/typst-lsp/package.nix | 4 +- pkgs/by-name/ya/yabai/package.nix | 3 +- pkgs/by-name/zu/zutty/package.nix | 4 +- pkgs/development/libraries/SDL2/default.nix | 3 +- .../math/suitesparse-graphblas/default.nix | 6 +- .../python-modules/behave/default.nix | 4 +- .../python-modules/cherrypy/default.nix | 4 +- .../cmsis-pack-manager/default.nix | 4 +- .../python-modules/construct/default.nix | 4 +- .../python-modules/devito/default.nix | 4 +- .../python-modules/doit/default.nix | 13 +- .../python-modules/hupper/default.nix | 4 +- .../imagecodecs-lite/default.nix | 3 +- .../python-modules/img2pdf/default.nix | 4 +- .../python-modules/intake/default.nix | 3 +- .../invisible-watermark/default.nix | 3 +- .../python-modules/materialx/default.nix | 4 +- .../python-modules/mmengine/default.nix | 3 +- .../python-modules/modeled/default.nix | 3 +- .../python-modules/openusd/default.nix | 3 +- .../python-modules/pillow-simd/default.nix | 3 +- .../python-modules/pyeclib/default.nix | 3 +- .../pylibjpeg-openjpeg/default.nix | 3 +- .../python-modules/pyqtwebengine/default.nix | 4 +- .../python-modules/pyside6/default.nix | 4 +- .../python-modules/pysvn/default.nix | 21 ++-- .../python-modules/pytest-flask/default.nix | 4 +- .../python-modules/scipy/default.nix | 4 +- .../python-modules/sleekxmpp/default.nix | 3 +- .../python-modules/sourmash/default.nix | 3 +- .../python-modules/spectral-cube/default.nix | 4 +- .../python-modules/torch/default.nix | 3 +- .../python-modules/twisted/default.nix | 4 +- .../python-modules/watchdog/default.nix | 4 +- .../python-modules/zigpy/default.nix | 12 +- .../lua-language-server/default.nix | 4 +- pkgs/development/tools/misc/ddd/default.nix | 4 +- .../tools/misc/hydra-cli/default.nix | 4 +- pkgs/development/tools/wasm-pack/default.nix | 4 +- pkgs/os-specific/linux/rtl8821ce/default.nix | 3 +- pkgs/servers/homepage-dashboard/default.nix | 4 +- pkgs/tools/misc/goaccess/default.nix | 11 +- pkgs/tools/security/chainsaw/default.nix | 4 +- 65 files changed, 298 insertions(+), 168 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 369a874896b1..3e8e2d2d9f28 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -84,8 +84,10 @@ }: let - embreeSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; - openImageDenoiseSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + embreeSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + openImageDenoiseSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; openUsdSupport = !stdenv.hostPlatform.isDarwin; python3 = python3Packages.python; @@ -328,7 +330,12 @@ stdenv.mkDerivation (finalAttrs: { blenderExecutable = placeholder "out" - + (if stdenv.hostPlatform.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); + + ( + if stdenv.hostPlatform.isDarwin then + "/Applications/Blender.app/Contents/MacOS/Blender" + else + "/bin/blender" + ); postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 4aff5303ee18..0ed21d76888e 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -79,18 +79,21 @@ stdenv.mkDerivation (finalAttrs: { appstream-glib ]; - buildInputs = [ - gtk - girara - libintl - sqlite - glib - file - librsvg - check - json-glib - texlive.bin.core - ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; + buildInputs = + [ + gtk + girara + libintl + sqlite + glib + file + librsvg + check + json-glib + texlive.bin.core + ] + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 3cdfe57c8a5f..047e86036d08 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: { env = lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; }; + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-headerpad_max_install_names"; + }; preConfigure = '' export LD=$CC diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix index cc7fe1494e65..249ed14233ee 100644 --- a/pkgs/by-name/av/avbroot/package.nix +++ b/pkgs/by-name/av/avbroot/package.nix @@ -33,7 +33,9 @@ rustPlatform.buildRustPackage rec { protobuf ]; - buildInputs = [ bzip2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + bzip2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = { description = "Sign (and root) Android A/B OTAs with custom keys while preserving Android Verified Boot"; diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 1653b80e26f7..ad8a222ac89a 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -67,7 +67,9 @@ buildNpmPackage rec { find $out/share/chatd/node_modules -name '*.exe' -or -name '*.dll' -or -name '*.pdb' -delete rm -rf ${ lib.concatStringsSep " " ( - (lib.optional (!stdenv.hostPlatform.isx86_64) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64") + (lib.optional ( + !stdenv.hostPlatform.isx86_64 + ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64") ++ (lib.optional ( !stdenv.hostPlatform.isAarch64 ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/arm64") diff --git a/pkgs/by-name/da/darklua/package.nix b/pkgs/by-name/da/darklua/package.nix index bf8576961b8b..fd31987ff364 100644 --- a/pkgs/by-name/da/darklua/package.nix +++ b/pkgs/by-name/da/darklua/package.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fYx+SQdQMnNSygr0/Y4zEPtqfQPZYmQUq3ndi1HlXuE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index a2761056f116..91061e5ad2e9 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -57,7 +57,9 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 build-${if stdenv.hostPlatform.isDarwin then "mac" else "linux"}/release/debase $out/bin/debase + install -Dm755 build-${ + if stdenv.hostPlatform.isDarwin then "mac" else "linux" + }/release/debase $out/bin/debase runHook postInstall ''; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index e2897b83a348..68d55ffba40d 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -22,7 +22,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LEOORHD0j+HVl/fB9Q2xVZ2AxZKsPE5SeOS1ZsKwTSo="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; nativeCheckInputs = [ which diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 3c60703a3a36..e89d27abe395 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -106,7 +106,10 @@ stdenv'.mkDerivation { postFixup = let binary = - if stdenv.hostPlatform.isDarwin then "Applications/flameshot.app/Contents/MacOS/flameshot" else "bin/flameshot"; + if stdenv.hostPlatform.isDarwin then + "Applications/flameshot.app/Contents/MacOS/flameshot" + else + "bin/flameshot"; in '' wrapProgram $out/${binary} \ diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix index 59423a71ee5a..3c7900c80a99 100644 --- a/pkgs/by-name/gd/gdlv/package.nix +++ b/pkgs/by-name/gd/gdlv/package.nix @@ -23,7 +23,8 @@ buildGoModule rec { subPackages = "."; preBuild = - lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' export MACOSX_DEPLOYMENT_TARGET=10.15 ''; diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix index da5429416d60..8e87bb3b1891 100644 --- a/pkgs/by-name/ge/gepetto-viewer/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -61,13 +61,17 @@ let libsForQt5.qtbase ]; - nativeBuildInputs = [ - cmake - doxygen - libsForQt5.wrapQtAppsHook - pkg-config - python3Packages.python - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; + nativeBuildInputs = + [ + cmake + doxygen + libsForQt5.wrapQtAppsHook + pkg-config + python3Packages.python + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + darwin.autoSignDarwinBinariesHook + ]; propagatedBuildInputs = [ jrl-cmakemodules diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix index 3acc04031f88..5b2acf02bb0d 100644 --- a/pkgs/by-name/ht/httptoolkit/package.nix +++ b/pkgs/by-name/ht/httptoolkit/package.nix @@ -29,7 +29,9 @@ buildNpmPackage rec { CSC_IDENTITY_AUTO_DISCOVERY = "false"; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; npmBuildScript = "build:src"; diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 4c9ed4c5f340..1ca229150632 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -142,13 +142,16 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - libtapi - llvm - libunwind - openssl - xar - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.dyld ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ]; + buildInputs = + [ + libtapi + llvm + libunwind + openssl + xar + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.dyld ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libdispatch ]; # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations, # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector. diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 7bb296ab611b..32d43f3d05b1 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -20,70 +20,71 @@ let sources = lib.importJSON ./pin.json; in # https://github.com/NixOS/nixpkgs/issues/314160 -(if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation (finalAttr: { - pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; - version = if isBeta then sources.beta.version else sources.stable.version; +(if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv).mkDerivation + (finalAttr: { + pname = "maa-assistant-arknights" + lib.optionalString isBeta "-beta"; + version = if isBeta then sources.beta.version else sources.stable.version; - src = fetchFromGitHub { - owner = "MaaAssistantArknights"; - repo = "MaaAssistantArknights"; - rev = "v${finalAttr.version}"; - hash = if isBeta then sources.beta.hash else sources.stable.hash; - }; + src = fetchFromGitHub { + owner = "MaaAssistantArknights"; + repo = "MaaAssistantArknights"; + rev = "v${finalAttr.version}"; + hash = if isBeta then sources.beta.hash else sources.stable.hash; + }; - nativeBuildInputs = [ - asio - cmake - fastdeploy.cmake - ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; + nativeBuildInputs = [ + asio + cmake + fastdeploy.cmake + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ]; - buildInputs = - [ - fastdeploy - libcpr - onnxruntime - opencv - ] - ++ lib.optionals cudaSupport ( - with cudaPackages; + buildInputs = [ - cuda_cccl # cub/cub.cuh - libcublas # cublas_v2.h - libcurand # curand.h - libcusparse # cusparse.h - libcufft # cufft.h - cudnn # cudnn.h - cuda_cudart + fastdeploy + libcpr + onnxruntime + opencv ] - ); + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cccl # cub/cub.cuh + libcublas # cublas_v2.h + libcurand # curand.h + libcusparse # cusparse.h + libcufft # cufft.h + cudnn # cudnn.h + cuda_cudart + ] + ); - cmakeBuildType = "None"; + cmakeBuildType = "None"; - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - (lib.cmakeBool "INSTALL_FLATTEN" false) - (lib.cmakeBool "INSTALL_PYTHON" true) - (lib.cmakeBool "INSTALL_RESOURCE" true) - (lib.cmakeBool "USE_MAADEPS" false) - (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") - ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "INSTALL_FLATTEN" false) + (lib.cmakeBool "INSTALL_PYTHON" true) + (lib.cmakeBool "INSTALL_RESOURCE" true) + (lib.cmakeBool "USE_MAADEPS" false) + (lib.cmakeFeature "MAA_VERSION" "v${finalAttr.version}") + ]; - passthru.updateScript = ./update.sh; + passthru.updateScript = ./update.sh; - postPatch = '' - cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ - ''; + postPatch = '' + cp -v ${fastdeploy.cmake}/Findonnxruntime.cmake cmake/ + ''; - postInstall = '' - mkdir -p $out/share/${finalAttr.pname} - mv $out/{Python,resource} $out/share/${finalAttr.pname} - ''; + postInstall = '' + mkdir -p $out/share/${finalAttr.pname} + mv $out/{Python,resource} $out/share/${finalAttr.pname} + ''; - meta = with lib; { - description = "Arknights assistant"; - homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ Cryolitia ]; - platforms = platforms.linux ++ platforms.darwin; - }; -}) + meta = with lib; { + description = "Arknights assistant"; + homepage = "https://github.com/MaaAssistantArknights/MaaAssistantArknights"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Cryolitia ]; + platforms = platforms.linux ++ platforms.darwin; + }; + }) diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 35db87eb173a..26964c848ea2 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -63,7 +63,8 @@ let metalSupport = assert accelIsValid; - (acceleration == "metal") || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null)); + (acceleration == "metal") + || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && (acceleration == null)); darwinBuildInputs = with darwin.apple_sdk.frameworks; @@ -186,7 +187,9 @@ rustPlatform.buildRustPackage rec { withMkl = lib.optionalAttrs (stdenv.hostPlatform == "x86_64-linux") ( mistral-rs.override { acceleration = "mkl"; } ); - withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux (mistral-rs.override { acceleration = "cuda"; }); + withCuda = lib.optionalAttrs stdenv.hostPlatform.isLinux ( + mistral-rs.override { acceleration = "cuda"; } + ); withMetal = lib.optionalAttrs (stdenv.hostPlatform == "aarch64-darwin") ( mistral-rs.override { acceleration = "metal"; } ); diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index bc385466c8eb..df3089013d86 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -25,7 +25,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-9HLbGC6j0Wq/lG//CeEAfnYzlGG14CnDpmluL1moHWQ="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ]; nativeBuildInputs = [ pandoc installShellFiles diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index 1fbf6c180545..bee8b7dd76f6 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; buildInputs = [ openssl ] - ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) ++ lib.optional stdenv.hostPlatform.isDarwin expat; + ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) + ++ lib.optional stdenv.hostPlatform.isDarwin expat; configureFlags = [ "--with-libssl" ] diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index a5dd3ce319f8..81866b4fd3a1 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -43,9 +43,11 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optional stdenv.hostPlatform.isLinux dpkg ++ lib.optional stdenv.hostPlatform.isDarwin unzip; + nativeBuildInputs = + [ + makeWrapper + ] + ++ lib.optional stdenv.hostPlatform.isLinux dpkg ++ lib.optional stdenv.hostPlatform.isDarwin unzip; installPhase = let diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 14b6608113d3..057ef5b91f32 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -38,7 +38,9 @@ rustPlatform.buildRustPackage rec { makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (writeScriptBin "diskutil" "") ]; - buildInputs = [ python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + python3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; preBuild = '' export HOME=$TMPDIR diff --git a/pkgs/by-name/ra/rathole/package.nix b/pkgs/by-name/ra/rathole/package.nix index 51bc1cfedd55..19754ba11cdb 100644 --- a/pkgs/by-name/ra/rathole/package.nix +++ b/pkgs/by-name/ra/rathole/package.nix @@ -24,9 +24,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 2d51df275234..2d05eee496f1 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -36,7 +36,9 @@ rustPlatform.buildRustPackage { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices ]); + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; [ CoreServices ] + ); postFixup = '' wrapProgram $out/bin/rustlings --suffix PATH : ${ diff --git a/pkgs/by-name/th/thonny/package.nix b/pkgs/by-name/th/thonny/package.nix index 445a7954dfdc..f230b24d582a 100644 --- a/pkgs/by-name/th/thonny/package.nix +++ b/pkgs/by-name/th/thonny/package.nix @@ -21,7 +21,9 @@ buildPythonApplication rec { hash = "sha256-/ms2RESnV3bsJpK1zYYLHNUu1FtA6PntaseTbKMfUMc="; }; - nativeBuildInputs = [ copyDesktopItems ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; + nativeBuildInputs = [ + copyDesktopItems + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/by-name/ty/typst-lsp/package.nix b/pkgs/by-name/ty/typst-lsp/package.nix index bb4d0b12f39b..047be6e535f0 100644 --- a/pkgs/by-name/ty/typst-lsp/package.nix +++ b/pkgs/by-name/ty/typst-lsp/package.nix @@ -39,7 +39,9 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; checkFlags = [ diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix index 863b3b4fafad..22f21c191000 100644 --- a/pkgs/by-name/ya/yabai/package.nix +++ b/pkgs/by-name/ya/yabai/package.nix @@ -146,6 +146,7 @@ stdenv'.mkDerivation (finalAttrs: { ]; sourceProvenance = with lib.sourceTypes; - lib.optionals stdenv.hostPlatform.isx86_64 [ fromSource ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ binaryNativeCode ]; + lib.optionals stdenv.hostPlatform.isx86_64 [ fromSource ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/zu/zutty/package.nix b/pkgs/by-name/zu/zutty/package.nix index bca3a376467f..4c493483df57 100644 --- a/pkgs/by-name/zu/zutty/package.nix +++ b/pkgs/by-name/zu/zutty/package.nix @@ -46,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { default = nixosTests.terminal-emulators.zutty; }; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + default = nixosTests.terminal-emulators.zutty; + }; }; meta = { diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index bc7ffd7b991b..9e319154717b 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -39,7 +39,8 @@ libdecor, pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, pipewire, # NOTE: must be built with SDL2 without pipewire support - pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, + pulseaudioSupport ? + config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, libpulseaudio, AudioUnit, Cocoa, diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index f275eed52b07..c0b6561e0031 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -31,7 +31,11 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) ''; - cmakeFlags = [ (lib.cmakeBool "GRAPHBLAS_USE_JIT" (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64))) ]; + cmakeFlags = [ + (lib.cmakeBool "GRAPHBLAS_USE_JIT" ( + !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) + )) + ]; meta = with lib; { description = "Graph algorithms in the language of linear algebra"; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 60ba28069ab0..30f6c81c851d 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # timing-based test flaky on Darwin # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_step_decorator_async_run_until_complete" ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + "test_step_decorator_async_run_until_complete" + ]; postCheck = '' ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 1b0574d05726..c9a63cc21505 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -103,7 +103,9 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_block" ]; - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "cherrypy/test/test_config_server.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "cherrypy/test/test_config_server.py" + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 554e9516d53f..c1ce182aa6c5 100644 --- a/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -37,7 +37,9 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; propagatedNativeBuildInputs = [ cffi ]; - buildInputs = [ libiconv ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; + buildInputs = [ + libiconv + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = [ appdirs pyyaml diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index d21dd11e010a..daad048634b3 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -51,7 +51,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "construct" ]; - disabledTests = [ "test_benchmarks" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; + disabledTests = [ + "test_benchmarks" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_multiprocessing" ]; meta = with lib; { description = "Powerful declarative parser (and builder) for binary data"; diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 195c77b97864..47340bd1325c 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -127,7 +127,9 @@ buildPythonPackage rec { "tests/test_dse.py" "tests/test_gradient.py" ] - ++ lib.optionals ((stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin) [ "tests/test_dle.py" ]; + ++ lib.optionals ( + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin + ) [ "tests/test_dle.py" ]; pythonImportsCheck = [ "devito" ]; diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index 5840b71b18f7..188fb1ddbb3b 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -30,11 +30,14 @@ let hash = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw="; }; - propagatedBuildInputs = [ - cloudpickle - importlib-metadata - toml - ] ++ lib.optional stdenv.hostPlatform.isLinux pyinotify ++ lib.optional stdenv.hostPlatform.isDarwin macfsevents; + propagatedBuildInputs = + [ + cloudpickle + importlib-metadata + toml + ] + ++ lib.optional stdenv.hostPlatform.isLinux pyinotify + ++ lib.optional stdenv.hostPlatform.isDarwin macfsevents; nativeCheckInputs = [ configclass diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index ec9ccf3e65c8..0c69762ec8f1 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -19,7 +19,9 @@ buildPythonPackage rec { # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ]; disabledTestPaths = [ # Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index 5bca6d350d59..b21b80c7c694 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -29,7 +29,8 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; homepage = "https://www.lfd.uci.edu/~gohlke/"; maintainers = [ maintainers.tbenst ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index afb95dafebd6..62efb51697af 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -65,7 +65,9 @@ buildPythonPackage rec { # FIXME: Only add "sRGB Profile.icc" to __impureHostDeps once # https://github.com/NixOS/nix/issues/9301 is fixed. - __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ "/System/Library/ColorSync/Profiles" ]; + __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [ + "/System/Library/ColorSync/Profiles" + ]; nativeCheckInputs = [ exiftool diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 2b1fefe90750..ba078d1f90c3 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -124,7 +124,8 @@ buildPythonPackage rec { # Timing-based, flaky on darwin and possibly others "test_idle_timer" ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") + ++ lib.optionals + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix index 67652922d62a..445774979df7 100644 --- a/pkgs/development/python-modules/invisible-watermark/default.nix +++ b/pkgs/development/python-modules/invisible-watermark/default.nix @@ -72,7 +72,8 @@ buildPythonPackage rec { let testName = "${if withOnnx then "withOnnx" else "withoutOnnx"}-${method}"; # This test fails in the sandbox on aarch64-linux, see https://github.com/microsoft/onnxruntime/issues/10038 - skipTest = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && withOnnx && method == "rivaGan"; + skipTest = + stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64 && withOnnx && method == "rivaGan"; in lib.optionalAttrs (!skipTest) { "${testName}" = callPackage ./tests/cli.nix { diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix index 7b22621cdb8a..0ebcc212617b 100644 --- a/pkgs/development/python-modules/materialx/default.nix +++ b/pkgs/development/python-modules/materialx/default.nix @@ -54,7 +54,9 @@ buildPythonPackage rec { (lib.cmakeBool "MATERIALX_BUILD_OIIO" true) (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true) # don't build MSL shader back-end on x86_x64-darwin, as it requires a newer SDK with metal support - (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" (stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin))) + (lib.cmakeBool "MATERIALX_BUILD_GEN_MSL" ( + stdenv.hostPlatform.isLinux || (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) + )) ]; pythonImportsCheck = [ "MaterialX" ]; diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index e8efda866dac..7191e048a04d 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -114,6 +114,7 @@ buildPythonPackage rec { changelog = "https://github.com/open-mmlab/mmengine/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ rxiao ]; - broken = stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); + broken = + stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index 07127184d216..43459fc5a598 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "modeled" ]; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Universal data modeling for Python"; homepage = "https://github.com/modeled/modeled"; license = licenses.lgpl3Only; diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index 0849ce8dfd7a..7315865b75c2 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -60,7 +60,8 @@ buildPythonPackage rec { hash = "sha256-akwLIB5YUbnDiaQXX/K5YLXzWlTYWZG51dtxbSFxPt0="; }; - stdenv = if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; + stdenv = + if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv; outputs = [ "out" ] ++ lib.optional withDocs "doc"; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index 79b046f50cc6..2d3551d171e9 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -44,7 +44,8 @@ import ../pillow/generic.nix ( }; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; homepage = "https://python-pillow.github.io/pillow-perf/"; description = "Friendly PIL fork - SIMD version"; longDescription = '' diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index bda40cbeb8d3..d1fec7764784 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -39,7 +39,8 @@ buildPythonPackage rec { preBuild = let - ldLibraryPathEnvName = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + ldLibraryPathEnvName = + if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' # required for the custom _find_library function in setup.py diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix index 18ee261ff694..e7b1fa52a871 100644 --- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -71,6 +71,7 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ bcdarwin ]; # x86-linux: test_encode.py::TestEncodeBuffer failures # darwin: numerous test failures, seemingly due to issues setting up test data - broken = (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + broken = + (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index fe3fab812928..11d0f847d832 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -60,7 +60,9 @@ buildPythonPackage ( setuptools ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ libsForQt5.qtdeclarative ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + autoSignDarwinBinariesHook + ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index 7addb26e7167..088f4e785af6 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -78,7 +78,9 @@ stdenv.mkDerivation (finalAttrs: { ''; # "Couldn't find libclang.dylib You will likely need to add it manually to PATH to ensure the build succeeds." - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LLVM_INSTALL_DIR = "${llvmPackages.libclang.lib}/lib"; + }; nativeBuildInputs = [ cmake diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index 319398fdec91..24c75bf05e81 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -29,15 +29,18 @@ buildPythonPackage rec { patches = [ ./replace-python-first.patch ]; - buildInputs = [ - bash - subversion - apr - aprutil - expat - neon - openssl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; + buildInputs = + [ + bash + subversion + apr + aprutil + expat + neon + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ e2fsprogs ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ]; preConfigure = '' cd Source diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index f4132d9512f9..cc0096db1fd7 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -36,7 +36,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_flask" ]; - pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [ "--ignore=tests/test_live_server.py" ]; + pytestFlagsArray = lib.optionals stdenv.hostPlatform.isDarwin [ + "--ignore=tests/test_live_server.py" + ]; meta = with lib; { description = "Set of pytest fixtures to test Flask applications"; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index d6b812cd30ab..4677b47f1188 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -187,7 +187,9 @@ buildPythonPackage { # # ldr x0, [x0, ___stack_chk_guard];momd # - hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ + "stackprotector" + ]; # remove references to dev dependencies postInstall = '' diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix index 826b009e0d28..9c8031a6b878 100644 --- a/pkgs/development/python-modules/sleekxmpp/default.nix +++ b/pkgs/development/python-modules/sleekxmpp/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { }; meta = with lib; { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; + broken = + (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "XMPP library for Python"; license = licenses.mit; homepage = "http://sleekxmpp.com/"; diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index 8ed0a8157fbc..8e29c2845d12 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -21,7 +21,8 @@ pytestCheckHook, }: let - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; + stdenv' = + if stdenv.hostPlatform.isDarwin then overrideSDK stdenv { darwinMinVersion = "10.14"; } else stdenv; in buildPythonPackage rec { pname = "sourmash"; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 1c62233cc042..d9c3e6466143 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -60,7 +60,9 @@ buildPythonPackage rec { # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. - disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "spectral_cube/tests/test_visualization.py" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "spectral_cube/tests/test_visualization.py" + ]; pythonImportsCheck = [ "spectral_cube" ]; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 6dd263806f0d..7b5b8e9f6726 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -296,7 +296,8 @@ buildPythonPackage rec { # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. + - lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") + lib.optionalString + (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace-fail '#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) inline void *aligned_alloc(size_t align, size_t size)' '#if 0 diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 8e401844adfc..100a7d42d201 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -175,7 +175,9 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.http2 ++ passthru.optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 - ++ lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) passthru.optional-dependencies.tls; + ++ lib.optionals ( + !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + ) passthru.optional-dependencies.tls; checkPhase = '' export SOURCE_DATE_EPOCH=315532800 diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 2a1633de0512..10184cfef7dd 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -26,7 +26,9 @@ buildPythonPackage rec { # force kqueue on x86_64-darwin, because our api version does # not support fsevents - patches = lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ ./force-kqueue.patch ]; + patches = lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ + ./force-kqueue.patch + ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index c430b0853991..bc3fec15864e 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -72,10 +72,14 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False - "test_quirks_v2" - ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ "test_periodic_scan_priority" ]; + disabledTests = + [ + # assert quirked.quirk_metadata.quirk_location.endswith("zigpy/tests/test_quirks_v2.py]-line:104") is False + "test_quirks_v2" + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ + "test_periodic_scan_priority" + ]; disabledTestPaths = [ # Tests require network access diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index d187558a1c10..8e8f5fa3f79f 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation (finalAttrs: { -e '/cxx_/s,$cc,clang++,' ''; - ninjaFlags = [ "-fcompile/ninja/${if stdenv.hostPlatform.isDarwin then "macos" else "linux"}.ninja" ]; + ninjaFlags = [ + "-fcompile/ninja/${if stdenv.hostPlatform.isDarwin then "macos" else "linux"}.ninja" + ]; postBuild = '' popd diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 71a64d4b90ce..f33f08825799 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -25,7 +25,9 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'debuggerCommand:' 'debuggerCommand: ${gdb}/bin/gdb' ''; - nativeBuildInputs = [ imagemagick ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + nativeBuildInputs = [ + imagemagick + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ motif diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 42ec5704bae7..bed0297be54e 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 42f59dfd8403..4b978485895d 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [ zstd ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security ++ [ + zstd + ]; # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 532ed4998918..67046b28c9ab 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { defelo ]; broken = - stdenv.hostPlatform.isAarch64 || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); + stdenv.hostPlatform.isAarch64 + || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened); }; }) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index dde6162438cb..f9ce34fde86e 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -52,7 +52,9 @@ buildNpmPackage rec { nativeBuildInputs = [ git ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; - buildInputs = [ nodePackages.node-gyp-build ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; + buildInputs = [ + nodePackages.node-gyp-build + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; env.PYTHON = "${python3}/bin/python"; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 81cf43feb659..b9433f23bb2c 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - ncurses - openssl - ] ++ lib.optionals withGeolocation [ libmaxminddb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; + buildInputs = + [ + ncurses + openssl + ] + ++ lib.optionals withGeolocation [ libmaxminddb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; configureFlags = [ "--enable-utf8" diff --git a/pkgs/tools/security/chainsaw/default.nix b/pkgs/tools/security/chainsaw/default.nix index 78eabff9d465..5789f488985c 100644 --- a/pkgs/tools/security/chainsaw/default.nix +++ b/pkgs/tools/security/chainsaw/default.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1w3DYP69aOphoqbsZIF9aX56Lftg2niKClmImLTa5DE="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + ]; ldflags = [ "-w"