nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 02:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: remove optional cond [...] (#560097)

Browse Source
This commit is contained in:
Michael Daniels
2026-09-08 23:49:27 +00:00
committed by GitHub
parent cfd828fb3e a6479a6e32
commit 3b6689cb66
50 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/klipper.nix
View File

@@ -298,7 +298,7 @@ in
popd
'';
restartTriggers = lib.optional (!cfg.mutableConfig) [ printerConfig ];
restartTriggers = lib.optionals (!cfg.mutableConfig) [ printerConfig ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/klippy ${klippyArgs} ${cfg.configDir}/printer.cfg";

3
nixos/modules/services/misc/pinchflat.nix
View File

@@ -16,6 +16,7 @@ let
getExe
literalExpression
optional
optionals
attrValues
mapAttrs
;
@@ -158,7 +159,7 @@ in
"LOG_LEVEL=${cfg.logLevel}"
"PHX_SERVER=true"
]
++ optional cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ]
++ optionals cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ]
++ optional (!isNull config.time.timeZone) "TZ=${config.time.timeZone}"
++ attrValues (mapAttrs (name: value: name + "=" + toString value) cfg.extraConfig);
EnvironmentFile = optional (cfg.secretsFile != null) cfg.secretsFile;

4
nixos/modules/services/monitoring/prometheus/exporters/restic.nix
View File

@@ -16,7 +16,7 @@ let
mapAttrs'
splitString
toUpper
optional
optionals
optionalAttrs
nameValuePair
;
@@ -145,7 +145,7 @@ in
LoadCredential = [
"RESTIC_PASSWORD_FILE:${cfg.passwordFile}"
]
++ optional (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ];
++ optionals (cfg.repositoryFile != null) [ "RESTIC_REPOSITORY:${cfg.repositoryFile}" ];
};
environment =
let

2
nixos/modules/services/monitoring/vmagent.nix
View File

@@ -152,7 +152,7 @@ in
startCLIList
++ lib.optionals (cfg.prometheusConfig != { }) [ "-promscrape.config=${prometheusConfigYml}" ]
);
LoadCredential = lib.optional (cfg.remoteWrite.basicAuthPasswordFile != null) [
LoadCredential = lib.optionals (cfg.remoteWrite.basicAuthPasswordFile != null) [
"remote_write_basic_auth_password:${cfg.remoteWrite.basicAuthPasswordFile}"
];
};

2
nixos/modules/services/web-servers/garage.nix
View File

@@ -133,7 +133,7 @@ in
# if data_dir is a list, the actual path will in in the `path` attribute of each item
# see https://garagehq.deuxfleurs.fr/documentation/reference-manual/configuration/#data_dir
++ lib.optional (lib.isList data_dir) (map (item: item.path) data_dir)
++ lib.optional (lib.isString data_dir) [ data_dir ]
++ lib.optionals (lib.isString data_dir) [ data_dir ]
);
isDefault = lib.hasPrefix "/var/lib/garage";
isDefaultStateDirectory = lib.any isDefault paths;

2
nixos/modules/services/web-servers/nginx/default.nix
View File

@@ -1647,7 +1647,7 @@ in
SystemCallFilter = [
"~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid"
]
++ optional cfg.enableQuicBPF [ "bpf" ];
++ optionals cfg.enableQuicBPF [ "bpf" ];
};
};

4
nixos/modules/services/web-servers/stargazer.nix
View File

@@ -271,7 +271,7 @@ in
"~CAP_SYS_BOOT"
"~CAP_NET_ADMIN"
]
++ lib.lists.optional (!cfg.allowCgiUser) [
++ lib.lists.optionals (!cfg.allowCgiUser) [
"~CAP_SETGID"
"~CAP_SETUID"
];
@@ -279,7 +279,7 @@ in
SystemCallFilter = [
"~@cpu-emulation @debug @keyring @mount @obsolete"
]
++ lib.lists.optional (!cfg.allowCgiUser) [ "@privileged @setuid" ];
++ lib.lists.optionals (!cfg.allowCgiUser) [ "@privileged @setuid" ];
};
};

2
pkgs/applications/gis/qgis/unwrapped-ltr.nix
View File

@@ -185,7 +185,7 @@ mkDerivation rec {
"-DQGIS_MACAPP_BUNDLE=0" # Don't copy Qt into bundle; we fix paths in postFixup
"-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include" # FindSqlite3.cmake incorrectly assumes framework
]
++ lib.optional withServer [
++ lib.optionals withServer [
"-DWITH_SERVER=True"
"-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
]

2
pkgs/applications/gis/qgis/unwrapped.nix
View File

@@ -189,7 +189,7 @@ stdenv.mkDerivation rec {
"-DSQLITE3_INCLUDE_DIR=${sqlite.dev}/include"
"-DUSE_OPENCL=OFF"
]
++ lib.optional withServer [
++ lib.optionals withServer [
"-DWITH_SERVER=True"
"-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
]

4
pkgs/build-support/teleport/default.nix
View File

@@ -162,10 +162,10 @@ buildGoModule (finalAttrs: {
++ [
./rdpclient.patch
]
++ lib.optional (lib.versionOlder version "18.8.0") [
++ lib.optionals (lib.versionOlder version "18.8.0") [
./0001-fix-add-nix-path-to-exec-env.patch
]
++ lib.optional (lib.versionAtLeast version "18.8.0") [
++ lib.optionals (lib.versionAtLeast version "18.8.0") [
./0001-fix-add-nix-path-to-exec-env-reexec.patch
];

2
pkgs/by-name/ai/airwin2rack/package.nix
View File

@@ -192,7 +192,7 @@ stdenv.mkDerivation {
license =
with lib.licenses;
[ mit ]
++ lib.optional enableVCVRack [
++ lib.optionals enableVCVRack [
gpl3Plus
cc-by-nc-40
unfreeRedistributable

2
pkgs/by-name/ap/apache-orc/package.nix
View File

@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "STOP_BUILD_ON_WARNING" false)
(lib.cmakeBool "INSTALL_VENDORED_LIBS" false)
]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# Fix (RiscV) cross-compilation
# See https://github.com/apache/orc/issues/2334
(lib.cmakeFeature "HAS_PRE_1970_EXITCODE" "0")

2
pkgs/by-name/as/astyle/package.nix
View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
# upstream repo includes a build/ directory
cmakeBuildDir = "_build";
cmakeFlags = lib.optional asLibrary [
cmakeFlags = lib.optionals asLibrary [
"-DBUILD_SHARED_LIBS=ON"
];

2
pkgs/by-name/bo/bowtie2/package.nix
View File

@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
perl
];
cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86) [
cmakeFlags = lib.optionals (!stdenv.hostPlatform.isx86) [
"-DCMAKE_CXX_FLAGS=-I${finalAttrs.src}/third_party"
];

2
pkgs/by-name/cd/cdparanoia-iii/package.nix
View File

@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
./freebsd.patch
]
++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch
++ lib.optional (!stdenv.hostPlatform.isDarwin) [
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
(fetchpatch {
url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h";
hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0=";

4
pkgs/by-name/co/cogl/package.nix
View File

@@ -116,11 +116,11 @@ stdenv.mkDerivation rec {
);
NIX_CFLAGS_COMPILE = toString (
[ ]
++ lib.optional stdenv.cc.isGNU [
++ lib.optionals stdenv.cc.isGNU [
# Fix build with gcc15
"-std=gnu17"
]
++ lib.optional stdenv.cc.isClang [
++ lib.optionals stdenv.cc.isClang [
"-Wno-error=implicit-function-declaration"
]
);

2
pkgs/by-name/cr/crispy-doom/package.nix
View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done
'';
configureFlags = lib.optional enableTruecolor [ "--enable-truecolor" ];
configureFlags = lib.optionals enableTruecolor [ "--enable-truecolor" ];
nativeBuildInputs = [
autoreconfHook

2
pkgs/by-name/dh/dhtbsign/package.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
strictDeps = true;
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isGNU [
lib.optionals stdenv.cc.isGNU [
# Required with newer GCC
"-Wno-error=stringop-overflow"
]

2
pkgs/by-name/fi/fireplace/package.nix
View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation {
hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc=";
};
makeFlags = lib.optional stdenv.hostPlatform.isDarwin [ "CC=cc" ];
makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CC=cc" ];
meta = {
description = "Cozy fireplace in your terminal";

2
pkgs/by-name/fr/frankenphp/package.nix
View File

@@ -80,7 +80,7 @@ buildGoModule (finalAttrs: {
"-X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${finalAttrs.version} PHP ${phpUnwrapped.version} Caddy'"
# pie mode is only available with pkgsMusl, it also automatically add -buildmode=pie to $GOFLAGS
]
++ (lib.optional pieBuild [ "-static-pie" ]);
++ (lib.optionals pieBuild [ "-static-pie" ]);
preBuild = ''
export CGO_CFLAGS="$(${phpConfig} --includes)"

4
pkgs/by-name/kt/ktls-utils/package.nix
View File

@@ -42,9 +42,9 @@ stdenv.mkDerivation (finalAttrs: {
"man"
];
configureFlags = lib.optional withSystemd [ "--with-systemd" ];
configureFlags = lib.optionals withSystemd [ "--with-systemd" ];
makeFlags = lib.optional withSystemd [ "unitdir=$(out)/lib/systemd/system" ];
makeFlags = lib.optionals withSystemd [ "unitdir=$(out)/lib/systemd/system" ];
doCheck = true;

2
pkgs/by-name/ma/matrix-tuwunel/package.nix
View File

@@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"url_preview"
"zstd_compression"
]
++ lib.optional enableJemalloc [
++ lib.optionals enableJemalloc [
"jemalloc"
"jemalloc_conf"
]

2
pkgs/by-name/mk/mkbootimg-osm0sis/package.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
strictDeps = true;
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isGNU [
lib.optionals stdenv.cc.isGNU [
# Required with newer GCC
"-Wstringop-overflow=0"
]

2
pkgs/by-name/mo/monero-cli/package.nix
View File

@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
"-Wno-dev"
]
++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF"
++ lib.optional trezorSupport [
++ lib.optionals trezorSupport [
"-DUSE_DEVICE_TREZOR=ON"
];

2
pkgs/by-name/mo/monero-gui/package.nix
View File

@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DARCH=default"
]
++ lib.optional trezorSupport [
++ lib.optionals trezorSupport [
# fix build on recent gcc versions
"-DCMAKE_CXX_FLAGS=-fpermissive"
];

2
pkgs/by-name/px/pxa-mkbootimg/package.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isGNU [
lib.optionals stdenv.cc.isGNU [
# Required with newer GCC
"-Wno-error=stringop-overflow"
]

2
pkgs/by-name/re/refind/package.nix
View File

@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
"HOSTARCH=${hostarch}"
"ARCH=${hostarch}"
]
++ lib.optional stdenv.hostPlatform.isAarch64 [
++ lib.optionals stdenv.hostPlatform.isAarch64 [
# aarch64 is special for GNU-EFI, see BUILDING.txt
"GNUEFI_ARM64_TARGET_SUPPORT=y"
];

2
pkgs/by-name/ry/ryubing/package.nix
View File

@@ -100,7 +100,7 @@ buildDotnetModule rec {
"Ryujinx"
];
makeWrapperArgs = lib.optional stdenv.hostPlatform.isLinux [
makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
# Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714
"--set SDL_VIDEODRIVER x11"
];

2
pkgs/by-name/s7/s7/package.nix
View File

@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
"-lpthread"
"--export-all-symbols"
]
++ lib.optional (!static && stdenv.hostPlatform.isMinGW) [ "--out-implib,libs7dll.a" ]
++ lib.optionals (!static && stdenv.hostPlatform.isMinGW) [ "--out-implib,libs7dll.a" ]
++ lib.optional withArb "-lflint"
++ lib.optionals withGMP [
"-lgmp"

2
pkgs/by-name/sf/sfml/package.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
};
# Only unvendor miniaudio on non-Darwin as Darwin cannot build the miniaudio package.
patches = lib.optional (!stdenv.hostPlatform.isDarwin) [
patches = lib.optionals (!stdenv.hostPlatform.isDarwin) [
# Not upstreamble in the near future, see https://github.com/SFML/SFML/pull/3555
./unvendor-miniaudio.patch
];

2
pkgs/by-name/si/simple-completion-language-server/package.nix
View File

@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
cargoHash = "sha256-RgRmbQVZK/4U37CO8AjNQOqR/SXvL1TQU03LX7LnqPY=";
buildFeatures = lib.optional withCitation [ "citation" ];
buildFeatures = lib.optionals withCitation [ "citation" ];
meta = {
description = "Language server to enable word completion and snippets for Helix editor";

2
pkgs/by-name/sp/spla/package.nix
View File

@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_INSTALL_INCLUDEDIR=include"
]
++ lib.optional (gpuBackend == "cuda") "-DSPLA_GPU_BACKEND=CUDA"
++ lib.optional (gpuBackend == "rocm") [ "-DSPLA_GPU_BACKEND=ROCM" ];
++ lib.optionals (gpuBackend == "rocm") [ "-DSPLA_GPU_BACKEND=ROCM" ];
preFixup = ''
substituteInPlace $out/lib/cmake/SPLA/SPLASharedTargets-release.cmake \

4
pkgs/by-name/te/textadept/package.nix
View File

@@ -25,8 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = lib.optionals withQt [ libsForQt5.qtbase ] ++ lib.optionals withCurses ncurses;
cmakeFlags =
lib.optional withQt [ "-DQT=ON" ]
++ lib.optional withCurses [
lib.optionals withQt [ "-DQT=ON" ]
++ lib.optionals withCurses [
"-DCURSES=ON"
"-DQT=OFF"
];

2
pkgs/by-name/vt/vtk-dicom/package.nix
View File

@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
(lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
]
++ lib.optional finalAttrs.finalPackage.doCheck [
++ lib.optionals finalAttrs.finalPackage.doCheck [
# vtkBool does not accept TRUE, we have to use STRING "ON"
(lib.cmakeFeature "BUILD_TESTING" "ON")
];

2
pkgs/by-name/xp/xpra/package.nix
View File

@@ -238,7 +238,7 @@ effectiveBuildPythonApplication rec {
"--with-pam"
"--with-vsock"
]
++ lib.optional withNvenc [
++ lib.optionals withNvenc [
"--with-nvenc"
"--with-nvjpeg_encoder"
];

2
pkgs/development/compilers/llvm/common/lldb/default.nix
View File

@@ -73,7 +73,7 @@ stdenv.mkDerivation (
patches = [
./gnu-install-dirs.patch
]
++ lib.optional (lib.versions.major release_version == "18") [
++ lib.optionals (lib.versions.major release_version == "18") [
# Fix build with gcc15
# https://github.com/llvm/llvm-project/commit/bb59f04e7e75dcbe39f1bf952304a157f0035314
./lldb-add-include-cstdint.patch

2
pkgs/development/compilers/llvm/common/mlir/default.nix
View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
# Upstream issue: https://github.com/llvm/llvm-project/issues/150986
./mlir-tablegen-imported-target.patch
]
++ lib.optional (lib.versionOlder release_version "20") [
++ lib.optionals (lib.versionOlder release_version "20") [
# Fix build with gcc15
# https://github.com/llvm/llvm-project/commit/41eb186fbb024898bacc2577fa3b88db0510ba1f
# https://github.com/llvm/llvm-project/commit/101109fc5460d5bb9bb597c6ec77f998093a6687

2
pkgs/development/interpreters/php/generic.nix
View File

@@ -292,7 +292,7 @@ let
++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}"
++ lib.optional ztsSupport "--enable-zts"
++ lib.optional staticSupport "--enable-static"
++ lib.optional (!zendSignalsSupport) [ "--disable-zend-signals" ]
++ lib.optionals (!zendSignalsSupport) [ "--disable-zend-signals" ]
++ lib.optional zendMaxExecutionTimersSupport "--enable-zend-max-execution-timers"
# Sendmail

2
pkgs/development/libraries/libxmlxx/v3.nix
View File

@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
docbook5
docbook-xsl-ns
]
++ lib.lists.optional withPDF [
++ lib.lists.optionals withPDF [
fop
dblatex
];

2
pkgs/development/libraries/science/astronomy/indilib/default.nix
View File

@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
]
++ lib.optional finalAttrs.finalPackage.doCheck [
++ lib.optionals finalAttrs.finalPackage.doCheck [
"-DINDI_BUILD_UNITTESTS=ON"
"-DINDI_BUILD_INTEGTESTS=ON"
];

2
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
View File

@@ -77,7 +77,7 @@ let
"-DRULES_INSTALL_DIR=lib/udev/rules.d"
"-DINDI_DATA_DIR=share/indi/"
]
++ lib.optional doCheck [
++ lib.optionals doCheck [
"-DINDI_BUILD_UNITTESTS=ON"
"-DINDI_BUILD_INTEGTESTS=ON"
]

2
pkgs/development/python-modules/deal/default.nix
View File

@@ -72,7 +72,7 @@ buildPythonPackage rec {
# assert basically correct but fails in string match due to '' removed
"test_unknown_command"
]
++ lib.optional (pythonAtLeast "3.13") [
++ lib.optionals (pythonAtLeast "3.13") [
# assert basically correct but string match fails in due to
# ('pathlib._local', 'Path.write_text') != ('pathlib', 'Path.write_text')
"test_infer"

2
pkgs/development/python-modules/ffmpeg-progress-yield/default.nix
View File

@@ -37,7 +37,7 @@ buildPythonPackage rec {
procps
];
disabledTests = lib.optional stdenv.hostPlatform.isDarwin [
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# cannot access /usr/bin/pgrep from the sandbox
"test_context_manager"
"test_context_manager_with_exception"

4
pkgs/development/python-modules/inkex/default.nix
View File

@@ -78,12 +78,12 @@ buildPythonPackage {
"test_extract_multiple"
"test_lookup_and"
]
++ lib.optional stdenv.hostPlatform.isDarwin [
++ lib.optionals stdenv.hostPlatform.isDarwin [
"test_image_extract"
"test_path_number_nodes"
"test_plotter" # Hangs
]
++ lib.optional stdenv.hostPlatform.isMusl [
++ lib.optionals stdenv.hostPlatform.isMusl [
"test_ellipse_arc"
];

2
pkgs/development/python-modules/pandas/default.nix
View File

@@ -224,7 +224,7 @@ let
# These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921.
"test_rolling"
]
++ lib.optional stdenv.hostPlatform.is32bit [
++ lib.optionals stdenv.hostPlatform.is32bit [
# https://github.com/pandas-dev/pandas/issues/37398
"test_rolling_var_numerical_issues"
];

2
pkgs/development/python-modules/pymupdf/default.nix
View File

@@ -152,7 +152,7 @@ buildPythonPackage (finalAttrs: {
# Do not lint code
"tests/test_typing.py"
]
++ lib.optional stdenv.hostPlatform.isDarwin [
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Trace/BPT trap: 5 when getting widget options
"tests/test_4505.py"
"tests/test_widgets.py"

4
pkgs/development/python-modules/uqbar/default.nix
View File

@@ -63,11 +63,11 @@ buildPythonPackage (finalAttrs: {
# https://github.com/supriya-project/uqbar/issues/107
"SummarizingRootDocumenter"
]
++ lib.optional (pythonAtLeast "3.11") [
++ lib.optionals (pythonAtLeast "3.11") [
# assert not '\x1b[91m/build/uqbar-0.7.0/tests/fake_package/enums.py:docstring
"test_sphinx_style"
]
++ lib.optional (pythonAtLeast "3.12") [
++ lib.optionals (pythonAtLeast "3.12") [
# https://github.com/supriya-project/uqbar/issues/93
"objects.get_vars"
]

2
pkgs/development/tools/godot/common.nix
View File

@@ -325,7 +325,7 @@ let
# stripping dlls results in:
# Failed to load System.Private.CoreLib.dll (error code 0x8007000B)
stripExclude = lib.optional withMono [ "*.dll" ];
stripExclude = lib.optionals withMono [ "*.dll" ];
runtimeDependencies =
prev.runtimeDependencies or [ ]

2
pkgs/os-specific/cygwin/newlib-cygwin/default.nix
View File

@@ -41,7 +41,7 @@
# declared. Backport of https://cygwin.com/cgit/newlib-cygwin/commit/?id=73600d68227e125af24b7de7c3fccbd4eb66ee03
./fix-winsize.patch
]
++ lib.optional (!headersOnly) [
++ lib.optionals (!headersOnly) [
# https://cygwin.com/pipermail/cygwin-developers/2020-September/011970.html
# This is required for boost coroutines to work. After we get to the point
# where nix runs on cygwin, we can attempt to upstream this again.

2
pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
View File

@@ -26,7 +26,7 @@ buildPgrxExtension (finalAttrs: {
cargoHash = "sha256-IXOCzKJArNOcb/2TcJbLz1XdCquUpyF/cLHYU5vmlko=";
patches =
lib.optional (lib.versionOlder rustc.llvm.version "22.0.0" && stdenv.hostPlatform.isx86_64)
lib.optionals (lib.versionOlder rustc.llvm.version "22.0.0" && stdenv.hostPlatform.isx86_64)
[
# Due to a bug in LLVM 21, build fails on x86_64 with:
# `rustc-LLVM ERROR: Cannot select: intrinsic %llvm.x86.avx512.vpdpbusd.512`.