coqPackages: refactor #59217
Merged
coqPackages: refactor #59217
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Coq packages that depend on others need to be recompiled when the dependencies are updated, so we make the whole `coqPackages` overridable by `overrideScope'`, using `lib.makeScope`.
CohenCyril
force-pushed
the
coq-modules-fix
branch
from
7b4f028
to
f7bf3d2
Compare
Before this PRThe following shell will lead to an inconsistent state of the Coq libraries: let
config.packageOverrides = pkgs:
with pkgs; {
coqPackages = let super = coqPackages; in super // rec {
mathcomp = super.mathcomp.overrideDerivation (o: rec {
version = "1.8.0";
name = "coq${pkgs.coq.coq-version}-mathcomp-${version}";
src = fetchFromGitHub {
owner = "math-comp";
repo = "math-comp";
rev = "mathcomp-1.8.0";
sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
};
});
## Uncomment to fix!
# mathcomp-bigenough = super.mathcomp-bigenough.overrideDerivation (oldAttrs: {
# propagatedBuildInputs = [mathcomp];
# });
};
};
in
with import <nixpkgs> {inherit config;};
stdenv.mkDerivation rec {
name = "env";
env = buildEnv { name = name; paths = buildInputs; };
buildInputs = [ coq ] ++ (with coqPackages; [ mathcomp mathcomp-bigenough ]);
}Indeed, when we do echo "From mathcomp Require Import all_ssreflect bigenough." > test.v
nix-shell shell-nofix.nix --run "coqtop -l test.v"Coq fails with the following error message And I know no other way that propagating the dependencies by hand in the current state of the library. With this PRWe can now write let
config.packageOverrides = pkgs:
with pkgs; {
coqPackages = pkgs.coqPackages.overrideScope' (self: super: {
mathcomp = super.mathcomp.overrideDerivation (o: rec {
version = "1.8.0";
name = "coq${pkgs.coq.coq-version}-mathcomp-${version}";
src = fetchFromGitHub {
owner = "math-comp";
repo = "math-comp";
rev = "mathcomp-1.8.0";
sha256 = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
};
});
});
};
in
with import <nixpkgs> {inherit config;};
stdenv.mkDerivation rec {
name = "env";
env = buildEnv { name = name; paths = buildInputs; };
buildInputs = [ coq ] ++ (with coqPackages; [ mathcomp mathcomp-bigenough ]);
}and then nix-shell shell-fix.nix --run "coqtop -l test.v"succeeds. |
|
Thank you very much! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Coq packages that depend on other need to be recompiled when the dependencies are updated,
so we make the whole
coqPackageoverridable byoverrideScope', usinglib.makeScope.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)