Revert "moving findlib to propagedNativeBuildInputs"

This reverts commit 82440c9374.
main
Vincent Laporte 2 years ago committed by GitHub
parent 0ba57d89ca
commit 215235cce5
  1. 9
      pkgs/applications/science/logic/coq/default.nix
  2. 2
      pkgs/development/coq-modules/simple-io/default.nix

@ -72,8 +72,7 @@ let
] ocamlPackages_4_12; ] ocamlPackages_4_12;
ocamlNativeBuildInputs = [ ocamlPackages.ocaml ] ocamlNativeBuildInputs = [ ocamlPackages.ocaml ]
++ optional (coqAtLeast "8.14") ocamlPackages.dune_2; ++ optional (coqAtLeast "8.14") ocamlPackages.dune_2;
ocamlPropagatedNativeBuildInputs = [ ocamlPackages.findlib ]; ocamlBuildInputs = [ ocamlPackages.findlib ]
ocamlPropagatedBuildInputs = [ ]
++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5
++ optional (!coqAtLeast "8.13") ocamlPackages.num ++ optional (!coqAtLeast "8.13") ocamlPackages.num
++ optional (coqAtLeast "8.13") ocamlPackages.zarith; ++ optional (coqAtLeast "8.13") ocamlPackages.zarith;
@ -83,8 +82,7 @@ self = stdenv.mkDerivation {
passthru = { passthru = {
inherit coq-version; inherit coq-version;
inherit ocamlPackages ocamlNativeNuildInputs; inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs;
inherit ocamlPropagatedBuildInputs ocamlPropagatedNativeBuildInputs;
# For compatibility # For compatibility
inherit (ocamlPackages) ocaml camlp5 findlib num ; inherit (ocamlPackages) ocaml camlp5 findlib num ;
emacsBufferSetup = pkgs: '' emacsBufferSetup = pkgs: ''
@ -145,8 +143,7 @@ self = stdenv.mkDerivation {
else [ ocamlPackages.lablgtk ]) else [ ocamlPackages.lablgtk ])
; ;
propagatedNativeBuildInputs = ocamlPropagatedNativeBuildInputs; propagatedBuildInputs = ocamlBuildInputs;
propagatedBuildInputs = ocamlPropagatedBuildInputs;
postPatch = '' postPatch = ''
UNAME=$(type -tp uname) UNAME=$(type -tp uname)

@ -12,7 +12,7 @@ with lib; mkCoqDerivation {
release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci"; release."1.7.0".sha256 = "sha256:1a1q9x2abx71hqvjdai3n12jxzd49mhf3nqqh3ya2ssl2lj609ci";
release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax";
mlPlugin = true; mlPlugin = true;
nativeBuildInputs = [ coq.ocamlPackages.cppo ]; nativeBuildInputs = coq.ocamlPackages.cppo;
propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ]; propagatedBuildInputs = [ coq-ext-lib coq.ocamlPackages.ocamlbuild ];
doCheck = true; doCheck = true;

Loading…
Cancel
Save