Skip to content

stdenv: start deprecating non-list configureFlags #173172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 2 commits into from
May 19, 2022
Merged

stdenv: start deprecating non-list configureFlags #173172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d54fe6
stdenv: start deprecating non-list configureFlags
Artturin May 15, 2022
cf74768
treewide: convert string configureFlags to list of strings
Artturin May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/audio/ecasound/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
strictDeps = true;

CXXFLAGS = "-std=c++11";
configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0";
configureFlags = [ "--enable-liblilv" "--with-extra-cppflags=-Dnullptr=0" ];

postPatch = ''
sed -i -e '
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/science/logic/alt-ergo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ in
let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
pname = "alt-ergo-lib";
inherit version src useDune2;
configureFlags = pname;
configureFlags = [ pname ];
nativeBuildInputs = [ which ];
buildInputs = with ocamlPackages; [ dune-configurator ];
propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ];
Expand All @@ -26,7 +26,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
pname = "alt-ergo-parsers";
inherit version src useDune2;
configureFlags = pname;
configureFlags = [ pname ];
nativeBuildInputs = [ which ocamlPackages.menhir ];
propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]);
}; in
Expand All @@ -35,7 +35,7 @@ ocamlPackages.buildDunePackage {

inherit pname version src useDune2;

configureFlags = pname;
configureFlags = [ pname ];

nativeBuildInputs = [ which ocamlPackages.menhir ];
buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/ocaml-modules/stdcompat/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
# build fails otherwise
enableParallelBuilding = false;

configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)";
configureFlags = [ "--libdir=$(OCAMLFIND_DESTDIR)" ];

meta = {
homepage = "https://github.com/thierry-martinez/stdcompat";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/stdenv/generic/make-derivation.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ else let

# This parameter is sometimes a string, sometimes null, and sometimes a list, yuck
configureFlags = let inherit (lib) optional elem; in
(/**/ if lib.isString configureFlags then [configureFlags]
else if configureFlags == null then []
(/**/ 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]
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"}" []
else configureFlags)
++ optional (elem "build" configurePlatforms) "--build=${stdenv.buildPlatform.config}"
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
Expand Down