Unverified Commit e072885e authored by Théo Zimmermann's avatar Théo Zimmermann Committed by GitHub
Browse files

mkCoqDerivation: warn on superfluous enableParallelBuilding (#485720)

parents 8c1d8f4f b4e15ead

pkgs/build-support/coq/default.nix

+5 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ let 
      "dropAttrs"

      "dropDerivationAttrs"

      "keepAttrs"

      "enableParallelBuilding"

    ]

    ++ dropAttrs

  ) keepAttrs;
@@ -201,7 +202,10 @@ stdenv.mkDerivation ( 
        );

      buildInputs =

        args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs);

      inherit enableParallelBuilding;

      enableParallelBuilding =

        lib.warnIf (args ? enableParallelBuilding && args.enableParallelBuilding == true)

          "mkCoqDerivation: enableParallelBuilding is enabled by default; remove the explicit setting"

          enableParallelBuilding;



      meta =

        (

pkgs/development/coq-modules/compcert/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ let 
      MenhirLib

    ];



    enableParallelBuilding = true;



    postPatch = ''

      substituteInPlace ./configure \

        --replace \$\{toolprefix\}ar 'ar' \

pkgs/development/coq-modules/interval/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ mkCoqDerivation rec { 
    ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ];

  useMelquiondRemake.logpath = "Interval";

  mlPlugin = true;

  enableParallelBuilding = true;



  meta = {

    description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant";