lol

treewide: *Flags convert to list from str

*Flags implies a list

slightly relevant:
> stdenv: start deprecating non-list configureFlags https://github.com/NixOS/nixpkgs/pull/173172

the makeInstalledTests function in `nixos/tests/installed-tests/default.nix` isn't available outside of nixpkgs so
it's not a breaking change

Artturin f4ea1208 8d327727

+124 -106
+2 -2
nixos/modules/services/networking/ntp/chrony.nix
··· 27 27 ${cfg.extraConfig} 28 28 ''; 29 29 30 - chronyFlags = "-n -m -u chrony -f ${configFile} ${toString cfg.extraFlags}"; 30 + chronyFlags = [ "-n" "-m" "-u" "chrony" "-f" "${configFile}" ] ++ cfg.extraFlags; 31 31 in 32 32 { 33 33 options = { ··· 166 166 unitConfig.ConditionCapability = "CAP_SYS_TIME"; 167 167 serviceConfig = 168 168 { Type = "simple"; 169 - ExecStart = "${chronyPkg}/bin/chronyd ${chronyFlags}"; 169 + ExecStart = "${chronyPkg}/bin/chronyd ${builtins.toString chronyFlags}"; 170 170 171 171 ProtectHome = "yes"; 172 172 ProtectSystem = "full";
+2 -2
nixos/modules/services/networking/ntp/ntpd.nix
··· 25 25 ${cfg.extraConfig} 26 26 ''; 27 27 28 - ntpFlags = "-c ${configFile} -u ntp:ntp ${toString cfg.extraFlags}"; 28 + ntpFlags = [ "-c" "${configFile}" "-u" "ntp:ntp" ] ++ cfg.extraFlags; 29 29 30 30 in 31 31 ··· 137 137 ''; 138 138 139 139 serviceConfig = { 140 - ExecStart = "@${ntp}/bin/ntpd ntpd -g ${ntpFlags}"; 140 + ExecStart = "@${ntp}/bin/ntpd ntpd -g ${builtins.toString ntpFlags}"; 141 141 Type = "forking"; 142 142 }; 143 143 };
+2 -2
nixos/tests/installed-tests/default.nix
··· 28 28 , withX11 ? false 29 29 30 30 # Extra flags to pass to gnome-desktop-testing-runner. 31 - , testRunnerFlags ? "" 31 + , testRunnerFlags ? [] 32 32 33 33 # Extra attributes to pass to makeTest. 34 34 # They will be recursively merged into the attrset created by this function. ··· 67 67 '' + 68 68 '' 69 69 machine.succeed( 70 - "gnome-desktop-testing-runner ${testRunnerFlags} -d '${tested.installedTests}/share'" 70 + "gnome-desktop-testing-runner ${escapeShellArgs testRunnerFlags} -d '${tested.installedTests}/share'" 71 71 ) 72 72 ''; 73 73 }
+1 -1
nixos/tests/installed-tests/flatpak-builder.nix
··· 11 11 virtualisation.diskSize = 2048; 12 12 }; 13 13 14 - testRunnerFlags = "--timeout 3600"; 14 + testRunnerFlags = [ "--timeout" "3600" ]; 15 15 }
+1 -1
nixos/tests/installed-tests/flatpak.nix
··· 13 13 virtualisation.diskSize = 3072; 14 14 }; 15 15 16 - testRunnerFlags = "--timeout 3600"; 16 + testRunnerFlags = [ "--timeout" "3600" ]; 17 17 }
+1 -1
nixos/tests/installed-tests/gdk-pixbuf.nix
··· 9 9 virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096; 10 10 }; 11 11 12 - testRunnerFlags = "--timeout 1800"; 12 + testRunnerFlags = [ "--timeout" "1800" ]; 13 13 }
+22 -19
nixos/tests/k3s/multi-node.nix
··· 54 54 role = "server"; 55 55 package = pkgs.k3s; 56 56 clusterInit = true; 57 - extraFlags = '' 58 - --disable coredns \ 59 - --disable local-storage \ 60 - --disable metrics-server \ 61 - --disable servicelb \ 62 - --disable traefik \ 63 - --node-ip 192.168.1.1 \ 64 - --pause-image test.local/pause:local 65 - ''; 57 + extraFlags = builtins.toString [ 58 + "--disable" "coredns" 59 + "--disable" "local-storage" 60 + "--disable" "metrics-server" 61 + "--disable" "servicelb" 62 + "--disable" "traefik" 63 + "--node-ip" "192.168.1.1" 64 + "--pause-image" "test.local/pause:local" 65 + ]; 66 66 }; 67 67 networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; 68 68 networking.firewall.allowedUDPPorts = [ 8472 ]; ··· 84 84 enable = true; 85 85 serverAddr = "https://192.168.1.1:6443"; 86 86 clusterInit = false; 87 - extraFlags = '' 88 - --disable coredns \ 89 - --disable local-storage \ 90 - --disable metrics-server \ 91 - --disable servicelb \ 92 - --disable traefik \ 93 - --node-ip 192.168.1.3 \ 94 - --pause-image test.local/pause:local 95 - ''; 87 + extraFlags = builtins.toString [ 88 + "--disable" "coredns" 89 + "--disable" "local-storage" 90 + "--disable" "metrics-server" 91 + "--disable" "servicelb" 92 + "--disable" "traefik" 93 + "--node-ip" "192.168.1.3" 94 + "--pause-image" "test.local/pause:local" 95 + ]; 96 96 }; 97 97 networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; 98 98 networking.firewall.allowedUDPPorts = [ 8472 ]; ··· 112 112 enable = true; 113 113 role = "agent"; 114 114 serverAddr = "https://192.168.1.3:6443"; 115 - extraFlags = "--pause-image test.local/pause:local --node-ip 192.168.1.2"; 115 + extraFlags = lib.toString [ 116 + "--pause-image" "test.local/pause:local" 117 + "--node-ip" "192.168.1.2" 118 + ]; 116 119 }; 117 120 networking.firewall.allowedTCPPorts = [ 6443 ]; 118 121 networking.firewall.allowedUDPPorts = [ 8472 ];
+8 -9
nixos/tests/k3s/single-node.nix
··· 40 40 services.k3s.role = "server"; 41 41 services.k3s.package = pkgs.k3s; 42 42 # Slightly reduce resource usage 43 - services.k3s.extraFlags = '' 44 - --disable coredns \ 45 - --disable local-storage \ 46 - --disable metrics-server \ 47 - --disable servicelb \ 48 - --disable traefik \ 49 - --pause-image \ 50 - test.local/pause:local 51 - ''; 43 + services.k3s.extraFlags = builtins.toString [ 44 + "--disable" "coredns" 45 + "--disable" "local-storage" 46 + "--disable" "metrics-server" 47 + "--disable" "servicelb" 48 + "--disable" "traefik" 49 + "--pause-image" "test.local/pause:local" 50 + ]; 52 51 53 52 users.users = { 54 53 noprivs = {
+1 -1
pkgs/applications/blockchains/openethereum/default.nix
··· 38 38 39 39 # Exclude some tests that don't work in the sandbox 40 40 # - Nat test requires network access 41 - checkFlags = "--skip configuration::tests::should_resolve_external_nat_hosts"; 41 + checkFlags = [ "--skip" "configuration::tests::should_resolve_external_nat_hosts" ]; 42 42 43 43 meta = with lib; { 44 44 broken = stdenv.isDarwin;
+1 -1
pkgs/applications/graphics/xournalpp/default.nix
··· 48 48 ] 49 49 ++ lib.optional withLua lua; 50 50 51 - buildFlags = "translations"; 51 + buildFlags = [ "translations" ]; 52 52 53 53 hardeningDisable = [ "format" ]; 54 54
+1 -1
pkgs/applications/terminal-emulators/x3270/default.nix
··· 18 18 sha256 = "0km24rgll0s4ji6iz8lvy5ra76ds162s95y33w5px6697cwqkp9j"; 19 19 }; 20 20 21 - buildFlags = "unix"; 21 + buildFlags = [ "unix" ]; 22 22 23 23 postConfigure = '' 24 24 pushd c3270 ; ./configure ; popd
+1 -1
pkgs/applications/version-management/git-and-tools/tig/default.nix
··· 15 15 16 16 nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; 17 17 18 - autoreconfFlags = "-I tools -v"; 18 + autoreconfFlags = [ "-I" "tools" "-v" ]; 19 19 20 20 buildInputs = [ ncurses readline git ] 21 21 ++ lib.optionals stdenv.isDarwin [ libiconv ];
+1 -1
pkgs/applications/version-management/gitlab/default.nix
··· 37 37 railties = x.railties // { 38 38 dontBuild = false; 39 39 patches = [ ./railties-remove-yarn-install-enhancement.patch ]; 40 - patchFlags = "-p2"; 40 + patchFlags = [ "-p2" ]; 41 41 }; 42 42 }; 43 43 groups = [
+1 -1
pkgs/build-support/release/default.nix
··· 15 15 } // args); 16 16 17 17 mvnBuild = args: import ./maven-build.nix ( 18 - { inherit stdenv; 18 + { inherit lib stdenv; 19 19 } // args); 20 20 21 21 nixBuild = args: import ./nix-build.nix (
+6 -1
pkgs/build-support/release/maven-build.nix
··· 1 1 { stdenv 2 + , lib 2 3 , name 3 4 , src 4 5 , doTest ? true ··· 12 13 } @ args : 13 14 14 15 let 15 - mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}"; 16 + mvnFlags = lib.escapeShellArgs [ 17 + "-Dmaven.repo.local=$M2_REPO" 18 + (lib.optionalString (!doTest) "-Dmaven.test.skip.exec=true") 19 + "${extraMvnFlags}" 20 + ]; 16 21 in 17 22 18 23 stdenv.mkDerivation ( {
+1 -1
pkgs/development/compilers/manticore/default.nix
··· 19 19 20 20 buildInputs = [ coreutils smlnj ]; 21 21 22 - autoreconfFlags = "-Iconfig -vfi"; 22 + autoreconfFlags = [ "-Iconfig" "-vfi" ]; 23 23 24 24 unpackPhase = '' 25 25 mkdir -p $out
+1 -1
pkgs/development/coq-modules/coq-record-update/default.nix
··· 10 10 release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; 11 11 release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; 12 12 releaseRev = v: "v${v}"; 13 - buildFlags = "NO_TEST=1"; 13 + buildFlags = [ "NO_TEST=1" ]; 14 14 meta = { 15 15 description = "Library to create Coq record update functions"; 16 16 maintainers = with maintainers; [ ineol ];
+1 -1
pkgs/development/interpreters/acl2/default.nix
··· 77 77 ''; 78 78 79 79 preBuild = "mkdir -p $HOME"; 80 - makeFlags = "LISP=${sbcl}/bin/sbcl ACL2_MAKE_LOG=NONE"; 80 + makeFlags = [ "LISP=${sbcl}/bin/sbcl" "ACL2_MAKE_LOG=NONE" ]; 81 81 82 82 doCheck = true; 83 83 checkTarget = "mini-proveall";
+1 -1
pkgs/development/interpreters/python-cosmopolitan/default.nix
··· 9 9 nativeBuildInputs = [ bintools-unwrapped unzip ]; 10 10 11 11 # slashes are significant because upstream uses o/$(MODE)/foo.o 12 - buildFlags = "o//third_party/python"; 12 + buildFlags = [ "o//third_party/python" ]; 13 13 checkTarget = "o//third_party/python/test"; 14 14 enableParallelBuilding = true; 15 15
+1 -1
pkgs/development/interpreters/python/rustpython/default.nix
··· 20 20 cargoHash = "sha256-T85kiPG80oZ4mwpb8Ag40wDHKx2Aens+gM7NGXan5lM="; 21 21 22 22 # freeze the stdlib into the rustpython binary 23 - cargoBuildFlags = "--features=freeze-stdlib"; 23 + cargoBuildFlags = [ "--features=freeze-stdlib" ]; 24 24 25 25 buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; 26 26
+1 -1
pkgs/development/libraries/cosmopolitan/default.nix
··· 21 21 outputs = [ "out" "dist" ]; 22 22 23 23 # slashes are significant because upstream uses o/$(MODE)/foo.o 24 - buildFlags = "o/cosmopolitan.h o//cosmopolitan.a o//libc/crt/crt.o o//ape/ape.o o//ape/ape.lds"; 24 + buildFlags = [ "o/cosmopolitan.h" "o//cosmopolitan.a" "o//libc/crt/crt.o" "o//ape/ape.o" "o//ape/ape.lds" ]; 25 25 checkTarget = "o//test"; 26 26 enableParallelBuilding = true; 27 27
+1 -1
pkgs/development/libraries/hunspell/default.nix
··· 24 24 patchShebangs tests 25 25 ''; 26 26 27 - autoreconfFlags = "-vfi"; 27 + autoreconfFlags = [ "-vfi" ]; 28 28 29 29 configureFlags = [ "--with-ui" "--with-readline" ]; 30 30
+1 -1
pkgs/development/libraries/libeatmydata/default.nix
··· 13 13 14 14 patches = [ ./find-shell-lib.patch ]; 15 15 16 - patchFlags = "-p0"; 16 + patchFlags = [ "-p0" ]; 17 17 18 18 postPatch = '' 19 19 substituteInPlace eatmydata.in \
+1 -1
pkgs/development/libraries/rustc-demangle/default.nix
··· 16 16 ./add-Cargo.lock.patch 17 17 ]; 18 18 cargoSha256 = "sha256-1tW5TOap5MstxTXAFij3IB8TIpI+FryEX9TXlVXjRl4="; 19 - cargoBuildFlags = "-p rustc-demangle-capi"; 19 + cargoBuildFlags = [ "-p" "rustc-demangle-capi" ]; 20 20 postInstall = '' 21 21 mkdir -p $out/lib 22 22 cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib
+1 -1
pkgs/development/node-packages/overrides.nix
··· 423 423 424 424 pulp = prev.pulp.override { 425 425 # tries to install purescript 426 - npmFlags = "--ignore-scripts"; 426 + npmFlags = builtins.toString [ "--ignore-scripts" ]; 427 427 428 428 nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; 429 429 postInstall = ''
+1 -1
pkgs/development/ocaml-modules/bz2/default.nix
··· 15 15 sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U="; 16 16 }; 17 17 18 - autoreconfFlags = "-I ."; 18 + autoreconfFlags = [ "-I" "." ]; 19 19 20 20 nativeBuildInputs = [ 21 21 autoreconfHook
+1 -1
pkgs/development/ocaml-modules/cudf/default.nix
··· 38 38 doCheck = true; 39 39 40 40 preInstall = "mkdir -p $OCAMLFIND_DESTDIR"; 41 - installFlags = "BINDIR=$(out)/bin"; 41 + installFlags = [ "BINDIR=$(out)/bin" ]; 42 42 43 43 meta = with lib; { 44 44 description = "A library for CUDF format";
+1 -1
pkgs/development/python-modules/python-csxcad/default.nix
··· 32 32 matplotlib 33 33 ]; 34 34 35 - setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib"; 35 + setupPyBuildFlags = [ "-I${openems}/include" "-L${openems}/lib" "-R${openems}/lib" ]; 36 36 37 37 meta = with lib; { 38 38 description = "Python interface to CSXCAD";
+1 -1
pkgs/development/python-modules/python-openems/default.nix
··· 36 36 h5py 37 37 ]; 38 38 39 - setupPyBuildFlags = "-I${openems}/include -L${openems}/lib -R${openems}/lib"; 39 + setupPyBuildFlags = [ "-I${openems}/include" "-L${openems}/lib" "-R${openems}/lib" ]; 40 40 pythonImportsCheck = [ "openEMS" ]; 41 41 42 42 meta = with lib; {
+1 -1
pkgs/development/python-modules/python-telegram-bot/default.nix
··· 43 43 --replace "tornado==6.1" "tornado" 44 44 ''; 45 45 46 - setupPyGlobalFlags = "--with-upstream-urllib3"; 46 + setupPyGlobalFlags = [ "--with-upstream-urllib3" ]; 47 47 48 48 # tests not included with release 49 49 doCheck = false;
+1 -1
pkgs/development/tools/analysis/rr/zen_workaround.nix
··· 22 22 postConfigure = '' 23 23 makeFlags="$makeFlags M=$(pwd)" 24 24 ''; 25 - buildFlags = "modules"; 25 + buildFlags = [ "modules" ]; 26 26 27 27 installPhase = let 28 28 modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel"; #TODO: longer path?
+1 -1
pkgs/development/tools/analysis/sparse/default.nix
··· 20 20 nativeBuildInputs = [ pkg-config ]; 21 21 buildInputs = [ gtk3 libxml2 llvm perl sqlite ]; 22 22 doCheck = true; 23 - buildFlags = "GCC_BASE:=${GCC_BASE}"; 23 + buildFlags = [ "GCC_BASE:=${GCC_BASE}" ]; 24 24 25 25 passthru.tests = { 26 26 simple-execution = callPackage ./tests.nix { };
+7 -1
pkgs/development/tools/database/prisma-engines/default.nix
··· 45 45 export SQLITE_MAX_EXPR_DEPTH=10000 46 46 ''; 47 47 48 - cargoBuildFlags = "-p query-engine -p query-engine-node-api -p migration-engine-cli -p introspection-core -p prisma-fmt"; 48 + cargoBuildFlags = [ 49 + "-p" "query-engine" 50 + "-p" "query-engine-node-api" 51 + "-p" "migration-engine-cli" 52 + "-p" "introspection-core" 53 + "-p" "prisma-fmt" 54 + ]; 49 55 50 56 postInstall = '' 51 57 mv $out/lib/libquery_engine${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libquery_engine.node
+1 -1
pkgs/development/tools/godot/default.nix
··· 67 67 68 68 enableParallelBuilding = true; 69 69 70 - sconsFlags = "target=release_debug platform=x11"; 70 + sconsFlags = [ "target=release_debug" "platform=x11" ]; 71 71 preConfigure = '' 72 72 sconsFlags+=" ${ 73 73 lib.concatStringsSep " "
+1 -1
pkgs/development/tools/godot/export-templates.nix
··· 3 3 # https://docs.godotengine.org/en/stable/development/compiling/compiling_for_x11.html#building-export-templates 4 4 godot.overrideAttrs (oldAttrs: rec { 5 5 pname = "godot-export-templates"; 6 - sconsFlags = "target=release platform=x11 tools=no"; 6 + sconsFlags = [ "target=release" "platform=x11" "tools=no" ]; 7 7 installPhase = '' 8 8 # The godot export command expects the export templates at 9 9 # .../share/godot/templates/3.2.3.stable with 3.2.3 being the godot version.
+1 -1
pkgs/development/tools/godot/headless.nix
··· 1 1 { godot, lib }: 2 2 godot.overrideAttrs (oldAttrs: rec { 3 3 pname = "godot-headless"; 4 - sconsFlags = "target=release_debug platform=server tools=yes"; 4 + sconsFlags = [ "target=release_debug" "platform=server" "tools=yes" ]; 5 5 installPhase = '' 6 6 mkdir -p "$out/bin" 7 7 cp bin/godot_server.* $out/bin/godot-headless
+1 -1
pkgs/development/tools/godot/server.nix
··· 1 1 { godot, lib }: 2 2 godot.overrideAttrs (oldAttrs: rec { 3 3 pname = "godot-server"; 4 - sconsFlags = "target=release platform=server tools=no"; 4 + sconsFlags = [ "target=release" "platform=server" "tools=no" ]; 5 5 installPhase = '' 6 6 mkdir -p "$out/bin" 7 7 cp bin/godot_server.* $out/bin/godot-server
+1 -1
pkgs/development/tools/misc/bashdb/default.nix
··· 23 23 sha256 = "19zfzcnxavndyn6kfxp775kjcd0gigsm4y3bnh6fz5ilhnnbbbgr"; 24 24 }) 25 25 ]; 26 - patchFlags = "-p0"; 26 + patchFlags = [ "-p0" ]; 27 27 28 28 nativeBuildInputs = [ 29 29 makeWrapper
+1 -1
pkgs/development/tools/ocaml/dune/2.nix
··· 16 16 nativeBuildInputs = [ ocaml findlib ]; 17 17 strictDeps = true; 18 18 19 - buildFlags = "release"; 19 + buildFlags = [ "release" ]; 20 20 21 21 dontAddPrefix = true; 22 22 dontAddStaticConfigureFlags = true;
+1 -1
pkgs/development/tools/ocaml/dune/3.nix
··· 21 21 22 22 strictDeps = true; 23 23 24 - buildFlags = "release"; 24 + buildFlags = [ "release" ]; 25 25 26 26 dontAddPrefix = true; 27 27 dontAddStaticConfigureFlags = true;
+1 -1
pkgs/games/darkplaces/default.nix
··· 23 23 SDL2 24 24 ]; 25 25 26 - buildFlags = "release"; 26 + buildFlags = [ "release" ]; 27 27 28 28 installPhase = '' 29 29 runHook preInstall
+1 -1
pkgs/games/gimx/default.nix
··· 37 37 --replace "5E048E021001" "6F0E13020001" 38 38 ''; 39 39 40 - makeFlags = "build-core"; 40 + makeFlags = [ "build-core" ]; 41 41 installPhase = '' 42 42 runHook preInstall 43 43
+1 -1
pkgs/misc/jackaudio/default.nix
··· 48 48 --replace /bin/bash ${bash}/bin/bash 49 49 ''; 50 50 51 - dontAddWafCrossFlags = "true"; 51 + dontAddWafCrossFlags = true; 52 52 wafConfigureFlags = [ 53 53 "--classic" 54 54 "--autostart=${if (optDbus != null) then "dbus" else "classic"}"
+1 -1
pkgs/os-specific/linux/gobi_loader/default.nix
··· 16 16 substituteInPlace 60-gobi.rules --replace "/lib/firmware" "/run/current-system/firmware" 17 17 ''; 18 18 19 - makeFlags = "prefix=${placeholder "out"}"; 19 + makeFlags = [ "prefix=${placeholder "out"}" ]; 20 20 21 21 meta = with lib; { 22 22 description = "Firmware loader for Qualcomm Gobi USB chipsets";
+1 -1
pkgs/servers/dns/knot-dns/default.nix
··· 49 49 CFLAGS = [ "-O2" "-DNDEBUG" ]; 50 50 51 51 doCheck = true; 52 - checkFlags = "V=1"; # verbose output in case some test fails 52 + checkFlags = [ "V=1" ]; # verbose output in case some test fails 53 53 doInstallCheck = true; 54 54 55 55 postInstall = ''
+1 -1
pkgs/servers/matrix-conduit/default.nix
··· 22 22 rocksdb 23 23 ]; 24 24 25 - cargoBuildFlags = "--bin conduit"; 25 + cargoBuildFlags = [ "--bin" "conduit" ]; 26 26 27 27 meta = with lib; { 28 28 broken = stdenv.isDarwin;
+1 -1
pkgs/servers/misc/oven-media-engine/default.nix
··· 29 29 }; 30 30 31 31 sourceRoot = "source/src"; 32 - makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}"; 32 + makeFlags = [ "release" "CONFIG_LIBRARY_PATHS=" "CONFIG_PKG_PATHS=" "GLOBAL_CC=$(CC)" "GLOBAL_CXX=$(CXX)" "GLOBAL_LD=$(CXX)" "SHELL=${stdenv.shell}" ]; 33 33 enableParallelBuilding = true; 34 34 35 35 nativeBuildInputs = [ bc pkg-config perl ];
+1 -1
pkgs/servers/nosql/dragonflydb/default.nix
··· 87 87 "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" 88 88 ]; 89 89 90 - ninjaFlags = "dragonfly"; 90 + ninjaFlags = [ "dragonfly" ]; 91 91 92 92 doCheck = false; 93 93 dontUseNinjaInstall = true;
+1 -1
pkgs/tools/X11/find-cursor/default.nix
··· 14 14 nativeBuildInputs = [ installShellFiles git ]; 15 15 buildInputs = [ libX11 libXdamage libXrender libXcomposite libXext ]; 16 16 preInstall = "mkdir -p $out/share/man/man1"; 17 - installFlags = "PREFIX=${placeholder "out"}"; 17 + installFlags = [ "PREFIX=${placeholder "out"}" ]; 18 18 19 19 meta = with lib; { 20 20 description = "Simple XLib program to highlight the cursor position";
+1 -1
pkgs/tools/X11/xmousepasteblock/default.nix
··· 9 9 sha256 = "0vidckfp277cg2gsww8a8q5b18m10iy4ppyp2qipr89771nrcmns"; 10 10 rev = version; 11 11 }; 12 - makeFlags = "PREFIX=$(out)"; 12 + makeFlags = [ "PREFIX=$(out)" ]; 13 13 buildInputs = with xorg; [ libX11 libXext libXi libev ]; 14 14 nativeBuildInputs = [ pkg-config ]; 15 15 meta = with lib; {
+1 -1
pkgs/tools/networking/bore/default.nix
··· 12 12 }; 13 13 14 14 cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx"; 15 - cargoBuildFlags = "-p ${pname}"; 15 + cargoBuildFlags = [ "-p" pname ]; 16 16 17 17 # FIXME can’t test --all-targets and --doc in a single invocation 18 18 cargoTestFlags = [ "--all-targets" "--workspace" ];
+1 -1
pkgs/tools/networking/wg-netmanager/default.nix
··· 17 17 18 18 # Test 01 tries to create a wireguard interface, which requires sudo. 19 19 doCheck = true; 20 - checkFlags = "--skip device"; 20 + checkFlags = [ "--skip" "device" ]; 21 21 22 22 meta = with lib; { 23 23 description = "Wireguard network manager";
+1 -2
pkgs/tools/system/chase/default.nix
··· 12 12 }; 13 13 14 14 doCheck = true; 15 - makeFlags = [ "-e" ]; 16 - makeFlagsArray="LIBS=-lgc"; 15 + makeFlags = [ "-e" "LIBS=-lgc" ]; 17 16 18 17 meta = with lib ; { 19 18 description = "Follow a symlink and print out its target file";
+1 -1
pkgs/tools/system/tre-command/default.nix
··· 22 22 ''; 23 23 24 24 # this test requires package to be in a git repo to succeed 25 - checkFlags = "--skip respect_git_ignore"; 25 + checkFlags = [ "--skip" "respect_git_ignore" ]; 26 26 27 27 meta = with lib; { 28 28 description = "Tree command, improved";
+28 -22
pkgs/top-level/perl-packages.nix
··· 5288 5288 hash = "sha256-+OzKRch+uRMlmSsT8FlPgI5vG8TDuafxQbmoODhNJSw="; 5289 5289 }; 5290 5290 5291 - makeMakerFlags = "--libpath=${lib.getLib pkgs.openssl}/lib --incpath=${pkgs.openssl.dev}/include"; 5291 + makeMakerFlags = [ "--libpath=${lib.getLib pkgs.openssl}/lib" "--incpath=${pkgs.openssl.dev}/include" ]; 5292 5292 buildInputs = [ PathClass ]; 5293 5293 propagatedBuildInputs = [ BytesRandomSecure LWPProtocolHttps ]; 5294 5294 meta = { ··· 6697 6697 }) 6698 6698 ]; 6699 6699 6700 - makeMakerFlags = "SQLITE_INC=${pkgs.sqlite.dev}/include SQLITE_LIB=${pkgs.sqlite.out}/lib"; 6700 + makeMakerFlags = [ "SQLITE_INC=${pkgs.sqlite.dev}/include" "SQLITE_LIB=${pkgs.sqlite.out}/lib" ]; 6701 6701 6702 6702 postInstall = '' 6703 6703 # Get rid of a pointless copy of the SQLite sources. ··· 6786 6786 buildInputs = [ pkgs.postgresql ]; 6787 6787 propagatedBuildInputs = [ DBI ]; 6788 6788 6789 - makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}"; 6789 + makeMakerFlags = [ "POSTGRES_HOME=${pkgs.postgresql}" ]; 6790 6790 6791 6791 # tests freeze in a sandbox 6792 6792 doCheck = false; ··· 9310 9310 hash = "sha256-Uuax3Hyy2HpM30OboUXguejPKMwmpIo8+Zd8g0Y5Z+4="; 9311 9311 }; 9312 9312 buildInputs = [ pkgs.file ConfigAutoConf TestFatal ]; 9313 - makeMakerFlags = "--lib=${pkgs.file}/lib"; 9313 + makeMakerFlags = [ "--lib=${pkgs.file}/lib" ]; 9314 9314 preCheck = '' 9315 9315 substituteInPlace t/oo-api.t \ 9316 9316 --replace "/usr/share/file/magic.mgc" "${pkgs.file}/share/misc/magic.mgc" ··· 9958 9958 # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]" 9959 9959 hardeningDisable = [ "format" ]; 9960 9960 9961 - makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; 9961 + makeMakerFlags = [ "--lib_png_path=${pkgs.libpng.out}" "--lib_jpeg_path=${pkgs.libjpeg.out}" "--lib_zlib_path=${pkgs.zlib.out}" "--lib_ft_path=${pkgs.freetype.out}" "--lib_fontconfig_path=${pkgs.fontconfig.lib}" "--lib_xpm_path=${pkgs.xorg.libXpm.out}" ]; 9962 9962 9963 9963 meta = { 9964 9964 description = "Perl interface to the gd2 graphics library"; ··· 10017 10017 url = "mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz"; 10018 10018 hash = "sha256-FjAgMV1cVEGDaseeCKd7Qo8nf9CQvqT6gNpwd7JDaro="; 10019 10019 }; 10020 - makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; 10020 + makeMakerFlags = [ "LIBS=-L${pkgs.geoip}/lib" "INC=-I${pkgs.geoip}/include" ]; 10021 10021 doCheck = false; # seems to access the network 10022 10022 meta = { 10023 10023 description = "Look up location and network information by IP Address"; ··· 10510 10510 hash = "sha256-fY8se2F2L7TsctLsKBKQ8vh/nH0pgnPaRSVDKmXncNY="; 10511 10511 }; 10512 10512 propagatedBuildInputs = [ pkgs.krb5Full.dev ]; 10513 - makeMakerFlags = "--gssapiimpl ${pkgs.krb5Full.dev}"; 10513 + makeMakerFlags = [ "--gssapiimpl" "${pkgs.krb5Full.dev}" ]; 10514 10514 meta = { 10515 10515 description = "Perl extension providing access to the GSSAPIv2 library"; 10516 10516 license = with lib.licenses; [ artistic1 gpl1Plus ]; ··· 11783 11783 hash = "sha256-dNRNcBwfFPxLmE+toelVcmtQTC2LBtJl56hh+llDy0g="; 11784 11784 }; 11785 11785 buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; 11786 - makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; 11786 + makeMakerFlags = [ "--incpath ${pkgs.libjpeg.dev}/include" "--libpath ${pkgs.libjpeg.out}/lib" "--incpath" "${pkgs.libpng.dev}/include" "--libpath" "${pkgs.libpng.out}/lib" ]; 11787 11787 meta = { 11788 11788 description = "Perl extension for Generating 24 bit Images"; 11789 11789 homepage = "http://imager.perl.org"; ··· 11844 11844 }; 11845 11845 buildInputs = [ pkgs.libpng pkgs.libjpeg TestNoWarnings ]; 11846 11846 propagatedBuildInputs = [ pkgs.zlib ]; 11847 - makeMakerFlags = "--with-jpeg-includes=${pkgs.libjpeg.dev}/include --with-jpeg-libs=${pkgs.libjpeg.out}/lib --with-png-includes=${pkgs.libpng.dev}/include --with-png-libs=${pkgs.libpng.out}/lib"; 11847 + makeMakerFlags = [ "--with-jpeg-includes=${pkgs.libjpeg.dev}/include" "--with-jpeg-libs=${pkgs.libjpeg.out}/lib" "--with-png-includes=${pkgs.libpng.dev}/include" "--with-png-libs=${pkgs.libpng.out}/lib" ]; 11848 11848 meta = { 11849 11849 description = "Fast, high-quality fixed-point image resizing"; 11850 11850 license = with lib.licenses; [ gpl2Plus ]; ··· 12574 12574 propagatedBuildInputs = [ Inline ]; 12575 12575 12576 12576 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 12577 - makeMakerFlags = "J2SDK=${pkgs.jdk8}"; 12577 + makeMakerFlags = [ "J2SDK=${pkgs.jdk8}" ]; 12578 12578 12579 12579 # FIXME: Apparently tests want to access the network. 12580 12580 doCheck = false; ··· 12831 12831 outputs = [ "out" "tex" ]; 12832 12832 propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageMagick ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; 12833 12833 nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; 12834 - makeMakerFlags = "TEXMF=\${tex} NOMKTEXLSR"; 12834 + makeMakerFlags = [ "TEXMF=\${tex}" "NOMKTEXLSR" ]; 12835 12835 # shebangs need to be patched before executables are copied to $out 12836 12836 preBuild = '' 12837 12837 patchShebangs bin/ ··· 12909 12909 outputs = [ "out" ]; 12910 12910 buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; 12911 12911 propagatedBuildInputs = [ (pkgs.apacheHttpdPackages.mod_perl.override { inherit perl; }) ]; 12912 - makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd.dev} --with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr.dev}/bin/apr-1-config --with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config"; 12912 + makeMakerFlags = [ 12913 + "--with-apache2-src=${pkgs.apacheHttpd.dev}" 12914 + "--with-apache2-apxs=${pkgs.apacheHttpd.dev}/bin/apxs" 12915 + "--with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd" 12916 + "--with-apr-config=${pkgs.apr.dev}/bin/apr-1-config" 12917 + "--with-apu-config=${pkgs.aprutil.dev}/bin/apu-1-config" 12918 + ]; 12913 12919 preConfigure = '' 12914 12920 # override broken prereq check 12915 12921 substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\"" ··· 14573 14579 # `overflow'; Pari.o:(.bss+0x80): first defined here 14574 14580 NIX_CFLAGS_COMPILE = "-fcommon"; 14575 14581 preConfigure = "cp ${pari_tgz} pari-${pariversion}.tgz"; 14576 - makeMakerFlags = "pari_tgz=pari-${pariversion}.tgz"; 14582 + makeMakerFlags = [ "pari_tgz=pari-${pariversion}.tgz" ]; 14577 14583 src = fetchurl { 14578 14584 url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/Math-Pari-2.030518.zip"; 14579 14585 hash = "sha256-3DiVWpaQvmuvqN4lJiEjd8Psn+jaXsAiY6nK+UtYu5E="; ··· 15739 15745 hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; 15740 15746 }; 15741 15747 15742 - makeMakerFlags = "MP_AP_DESTDIR=$out"; 15748 + makeMakerFlags = [ "MP_AP_DESTDIR=$out" ]; 15743 15749 buildInputs = [ pkgs.apacheHttpd ]; 15744 15750 doCheck = false; # would try to start Apache HTTP server 15745 15751 passthru.tests = nixosTests.mod_perl; ··· 16437 16443 buildInputs = [ ModuleBuildTiny TestSharedFork pkgs.postgresql ]; 16438 16444 propagatedBuildInputs = [ DBDPg DBI FileWhich FunctionParameters Moo TieHashMethod TryTiny TypeTiny ]; 16439 16445 16440 - makeMakerFlags = "POSTGRES_HOME=${pkgs.postgresql}"; 16446 + makeMakerFlags = [ "POSTGRES_HOME=${pkgs.postgresql}" ]; 16441 16447 16442 16448 meta = { 16443 16449 description = "PostgreSQL runner for tests"; ··· 17578 17584 hash = "sha256-hS1u6H6PDQFCIwJlgcu1aSS6jN3TzrKcYZHbthItQ8U="; 17579 17585 }; 17580 17586 propagatedBuildInputs = [ DigestHMAC ]; 17581 - makeMakerFlags = "--noonline-tests"; 17587 + makeMakerFlags = [ "--noonline-tests" ]; 17582 17588 meta = { 17583 17589 description = "Perl Interface to the Domain Name System"; 17584 17590 license = with lib.licenses; [ mit ]; ··· 22734 22740 pkgs.tk 22735 22741 ] ++ lib.optionals stdenv.isDarwin [ 22736 22742 darwin.apple_sdk.frameworks.CoreServices ]; 22737 - makeMakerFlags = lib.optionalString stdenv.isLinux 22738 - "--tclsh=${pkgs.tcl}/bin/tclsh --nousestubs"; 22743 + makeMakerFlags = lib.optionals stdenv.isLinux 22744 + [ "--tclsh=${pkgs.tcl}/bin/tclsh" "--nousestubs" ]; 22739 22745 meta = { 22740 22746 description = "Tcl extension module for Perl"; 22741 22747 license = with lib.licenses; [ artistic1 gpl1Plus ]; ··· 26156 26162 url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.035.tar.gz"; 26157 26163 hash = "sha256-TSuAKRum3jTY7IhqCFptvSt5C5JgNaCH6ZAlYUxf/dQ="; 26158 26164 }; 26159 - makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; 26165 + makeMakerFlags = [ "X11INC=${pkgs.xorg.libX11.dev}/include" "X11LIB=${pkgs.xorg.libX11.out}/lib" ]; 26160 26166 buildInputs = [ pkgs.xorg.libX11 pkgs.libpng ]; 26161 26167 doCheck = false; # Expects working X11. 26162 26168 meta = { ··· 26172 26178 url = "mirror://cpan/authors/id/A/AS/ASB/Tk-ToolBar-0.12.tar.gz"; 26173 26179 hash = "sha256-Rj4oTsRxN+fEJclpGwKo3sXOJytY6h9jWa6AQaI53Q8="; 26174 26180 }; 26175 - makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; 26181 + makeMakerFlags = [ "X11INC=${pkgs.xorg.libX11.dev}/include" "X11LIB=${pkgs.xorg.libX11.out}/lib" ]; 26176 26182 buildInputs = [ Tk ]; 26177 26183 doCheck = false; # Expects working X11. 26178 26184 meta = { ··· 27279 27285 '' + lib.optionalString stdenv.isCygwin '' 27280 27286 sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm 27281 27287 ''; 27282 - makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include"; 27288 + makeMakerFlags = [ "EXPATLIBPATH=${pkgs.expat.out}/lib" "EXPATINCPATH=${pkgs.expat.dev}/include" ]; 27283 27289 propagatedBuildInputs = [ LWP ]; 27284 27290 meta = { 27285 27291 description = "A perl module for parsing XML documents"; ··· 27806 27812 NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include -I${pkgs.libidn2}.dev}/include"; 27807 27813 NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -L${lib.getLib pkgs.libidn2}/lib -lcrypto -lidn2"; 27808 27814 27809 - makeMakerFlags = "--prefix-openssl=${pkgs.openssl_1_1.dev}"; 27815 + makeMakerFlags = [ "--prefix-openssl=${pkgs.openssl_1_1.dev}" ]; 27810 27816 27811 27817 nativeBuildInputs = [ pkgs.pkg-config ]; 27812 27818 buildInputs = [ DevelChecklib ModuleInstall ModuleInstallXSUtil TestFatal pkgs.ldns pkgs.libidn2 pkgs.openssl_1_1 ];