pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #173172 from Artturin/deprecatestringconf

stdenv: start deprecating non-list configureFlags

authored by Sandro and committed by GitHub ed584436 f5da52e7

+7 -7
unified split
+1 -1
pkgs/applications/audio/ecasound/default.nix
··· 60 60 strictDeps = true; 61 61 62 62 CXXFLAGS = "-std=c++11"; 63 - configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0"; 63 + configureFlags = [ "--enable-liblilv" "--with-extra-cppflags=-Dnullptr=0" ]; 64 64 65 65 postPatch = '' 66 66 sed -i -e '
+3 -3
pkgs/applications/science/logic/alt-ergo/default.nix
··· 17 17 let alt-ergo-lib = ocamlPackages.buildDunePackage rec { 18 18 pname = "alt-ergo-lib"; 19 19 inherit version src useDune2; 20 - configureFlags = pname; 20 + configureFlags = [ pname ]; 21 21 nativeBuildInputs = [ which ]; 22 22 buildInputs = with ocamlPackages; [ dune-configurator ]; 23 23 propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; ··· 26 26 let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { 27 27 pname = "alt-ergo-parsers"; 28 28 inherit version src useDune2; 29 - configureFlags = pname; 29 + configureFlags = [ pname ]; 30 30 nativeBuildInputs = [ which ocamlPackages.menhir ]; 31 31 propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); 32 32 }; in ··· 35 35 36 36 inherit pname version src useDune2; 37 37 38 - configureFlags = pname; 38 + configureFlags = [ pname ]; 39 39 40 40 nativeBuildInputs = [ which ocamlPackages.menhir ]; 41 41 buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ];
+1 -1
pkgs/development/ocaml-modules/stdcompat/default.nix
··· 18 18 # build fails otherwise 19 19 enableParallelBuilding = false; 20 20 21 - configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)"; 21 + configureFlags = [ "--libdir=$(OCAMLFIND_DESTDIR)" ]; 22 22 23 23 meta = { 24 24 homepage = "https://github.com/thierry-martinez/stdcompat";
+2 -2
pkgs/stdenv/generic/make-derivation.nix
··· 331 331 332 332 # This parameter is sometimes a string, sometimes null, and sometimes a list, yuck 333 333 configureFlags = let inherit (lib) optional elem; in 334 - (/**/ if lib.isString configureFlags then [configureFlags] 335 - else if configureFlags == null then [] 334 + (/**/ if lib.isString configureFlags then lib.warn "String 'configureFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" [configureFlags] 335 + else if configureFlags == null then lib.warn "Null 'configureFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" [] 336 336 else configureFlags) 337 337 ++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}" 338 338 ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"