Unverified Commit 9362b60a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #234901 from figsoda/flags 

treewide: convert *Flags to a list
parents 1e27109d f7f05123

pkgs/development/compilers/swift/swift-docc/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation { 
  # This works around a failure building generate-symbol-graph:

  #  Sources/generate-symbol-graph/main.swift:13:18: error: module 'SwiftDocC' was not compiled for testing

  # TODO: Figure out the cause. It doesn't seem to happen outside Nixpkgs.

  swiftpmFlags = "--product docc";

  swiftpmFlags = [ "--product docc" ];



  # TODO: Tests depend on indexstore-db being provided by an existing Swift

  # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc.

pkgs/development/compilers/swift/swift-format/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ stdenv.mkDerivation { 
  configurePhase = generated.configure;



  # We only install the swift-format binary, so don't need the other products.

  swiftpmFlags = "--product swift-format";

  swiftpmFlags = [ "--product swift-format" ];



  installPhase = ''

    binPath="$(swiftpmBinPath)"

pkgs/development/python-modules/skytemple-files/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ buildPythonPackage rec { 
  };



  checkInputs = [ pytestCheckHook parameterized xmldiff ] ++ passthru.optional-dependencies.spritecollab;

  pytestFlagsArray = "test/";

  pytestFlagsArray = [ "test/" ];

  disabledTestPaths = [

    "test/skytemple_files_test/common/spritecollab/sc_online_test.py"

    "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test

pkgs/development/tools/misc/dart-sass/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ buildDartApplication rec { 
  pubspecLockFile = ./pubspec.lock;

  vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s=";



  dartCompileFlags = "--define=version=${version}";

  dartCompileFlags = [ "--define=version=${version}" ];



  meta = with lib; {

    homepage = "https://github.com/sass/dart-sass";