From 8d91de51459123b82c8b7728185b309a2a9e09ba Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:38:13 -0400 Subject: [PATCH 1/7] linuxPackages.ax99100: don't use lib.optional with a list --- pkgs/os-specific/linux/ax99100/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/ax99100/default.nix b/pkgs/os-specific/linux/ax99100/default.nix index 9ff6add9fe9..91999c0113c 100644 --- a/pkgs/os-specific/linux/ax99100/default.nix +++ b/pkgs/os-specific/linux/ax99100/default.nix @@ -1,6 +1,6 @@ -{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }: -stdenv.mkDerivation -{ +{ kernel, stdenv, kmod, lib, fetchzip, dos2unix }: + +stdenv.mkDerivation { pname = "ax99100"; version = "1.8.0"; @@ -26,9 +26,9 @@ stdenv.mkDerivation patches = [ ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch ./kernel-6.1-set_termios-const-ktermios.patch - ] ++ (lib.optional (lib.versionAtLeast kernel.version "6.2") [ + ] ++ lib.optionals (lib.versionAtLeast kernel.version "6.2") [ ./kernel-6.2-fix-pointer-type.patch - ]); + ]; patchFlags = [ "-p0" ]; From 2014fdae3dbe7fbaad6eb21b1a9df320bbd33fb5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:40:16 -0400 Subject: [PATCH 2/7] flashrom: don't use lib.optional with a list --- pkgs/tools/misc/flashrom/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 3bd04051263..6463595c28c 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -1,5 +1,4 @@ { fetchurl -, fetchpatch , stdenv , installShellFiles , lib @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ libftdi1 libusb1 ] - ++ lib.optional (!stdenv.isDarwin) [ pciutils ] + ++ lib.optionals (!stdenv.isDarwin) [ pciutils ] ++ lib.optional jlinkSupport libjaylink; postPatch = '' From b643a42a1f6e934deef1a7a0752ec05baa83419c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:41:39 -0400 Subject: [PATCH 3/7] ghostscript: don't use lib.optional with a list --- pkgs/misc/ghostscript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 2588e7e9140..ad1f3e8e1e4 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -60,7 +60,7 @@ let in stdenv.mkDerivation rec { - pname = "ghostscript${lib.optionalString (x11Support) "-with-X"}"; + pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; version = "10.01.1"; src = fetchurl { @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals dynamicDrivers [ "--enable-dynamic" "--disable-hidden-visibility" - ] ++ lib.optional x11Support [ + ] ++ lib.optionals x11Support [ "--with-x" ] ++ lib.optionals cupsSupport [ "--enable-cups" From 17cb25a433925e347673402651b944fecc6fafc0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:42:08 -0400 Subject: [PATCH 4/7] cargo-dephell: don't use lib.optional with a list --- pkgs/development/tools/rust/cargo-dephell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/development/tools/rust/cargo-dephell/default.nix index 374e88ad38e..6a6cfa46d5f 100644 --- a/pkgs/development/tools/rust/cargo-dephell/default.nix +++ b/pkgs/development/tools/rust/cargo-dephell/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ curl darwin.apple_sdk.frameworks.Security libgit2_1_3_0 From 81fe865cf8ce06f9b4bf5538b1c8156b07d00a11 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:43:15 -0400 Subject: [PATCH 5/7] python310Packages.python-mapnik: don't use lib.optional with a list --- pkgs/development/python-modules/python-mapnik/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index a6e42d2369b..5eee8f59c39 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -133,7 +133,7 @@ buildPythonPackage rec { "test_visual_zoom_all_rendering1" "test_visual_zoom_all_rendering2" "test_wgs84_inverse_forward" - ] ++ lib.optional stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "test_passing_pycairo_context_pdf" ]; From e4b6aeb3a90b5c029a64ae5525b713ef1fe76a39 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:44:01 -0400 Subject: [PATCH 6/7] mpfr: don't use lib.optional with a list --- pkgs/development/libraries/mpfr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index aba3a413a66..cf5035948cb 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.hostPlatform.isSunOS "--disable-thread-safe" ++ lib.optional stdenv.hostPlatform.is64bit "--with-pic" - ++ lib.optional stdenv.hostPlatform.isPower64 [ + ++ lib.optionals stdenv.hostPlatform.isPower64 [ # Without this, the `tget_set_d128` test experiences a link # error due to missing `__dpd_trunctdkf`. "--disable-decimal-float" From 3605f48b4d96ca9dee48b45102370d1360b38cb0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 May 2023 19:45:10 -0400 Subject: [PATCH 7/7] ipe: don't use lib.optional with a list --- pkgs/applications/graphics/ipe/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c30bef90f3d..01f17bb41b9 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged ]; - qtWrapperArgs = lib.optional withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ]; + qtWrapperArgs = lib.optionals withTeXLive [ "--prefix PATH : ${lib.makeBinPath [ texlive ]}" ]; enableParallelBuilding = true;