Skip to content
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.

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

elpi: 1.4.1 -> 1.6.0, and coq-elpi #66183

Merged
merged 1 commit into from Aug 9, 2019
Merged

elpi: 1.4.1 -> 1.6.0, and coq-elpi #66183

merged 1 commit into from Aug 9, 2019

Conversation

CohenCyril
Copy link
Contributor

Motivation for this change

update of elpi and adding compatible development version of coq-elpi

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @vbgl

pkgs/development/coq-modules/coq-elpi/default.nix Outdated Show resolved Hide resolved
pkgs/development/coq-modules/coq-elpi/default.nix Outdated Show resolved Hide resolved
pkgs/development/coq-modules/coq-elpi/default.nix Outdated Show resolved Hide resolved
pkgs/top-level/coq-packages.nix Outdated Show resolved Hide resolved
@CohenCyril CohenCyril force-pushed the coq-elpi branch 2 times, most recently from bc25ebb to e731156 Compare August 6, 2019 11:15
@vbgl
Copy link
Contributor

vbgl commented Aug 6, 2019

@GrahamcOfBorg build coqPackages_8_10.coq-elpi

in

stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-elpi-${param.version}";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this is more right, but I think this is "more correct"

Suggested change
name = "coq${coq.coq-version}-elpi-${param.version}";
name = "coq-${coq.coq-version}-${coq.ocamlPackages.elpi.name}";

"coq8.10-elpi-master" as name to "coq-8.10-elpi-1.6.0"

however, since you're taking depending on a specific commit, the normal convention is

Suggested change
name = "coq${coq.coq-version}-elpi-${param.version}";
pname = "coq-elpi";
version = "unstable-2019-08-02";

I don't think i've seen a package that had dependencies as part of the title.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mostly personal preference.

However, you should separate out the maintainer entry, the bump, and coq-elpi in their own commits.

maintainers: add cohencyril
elpi: 1.4.1 -> 1.6.0
coq-elpi: init at unstable-2019-08-02


installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";

meta = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
meta = {
meta = with stdenv.lib; {


meta = {
description = "Coq plugin embedding ELPI.";
maintainers = [ stdenv.lib.maintainers.cohencyril ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
maintainers = [ stdenv.lib.maintainers.cohencyril ];
maintainers = with maintainers; [ cohencyril ];

meta = {
description = "Coq plugin embedding ELPI.";
maintainers = [ stdenv.lib.maintainers.cohencyril ];
license = stdenv.lib.licenses.lgpl21;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
license = stdenv.lib.licenses.lgpl21;
license = licenses.lgpl21;

nativeBuildInputs = [ which ];
buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]);

installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
installFlags = "COQLIB=${placeholder "out"}/lib/coq/${coq.coq-version}/";

@vbgl
Copy link
Contributor

vbgl commented Aug 9, 2019

@GrahamcOfBorg build ocaml-ng.ocamlPackages_4_04.elpi

@vbgl vbgl merged commit 52f3c28 into NixOS:master Aug 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants