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.

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

Jump to bottom

Remove camlp5 transitional #48159

Merged
merged 3 commits into from Oct 10, 2018
Merged

Remove camlp5 transitional #48159

merged 3 commits into from Oct 10, 2018

Conversation

Zimmi48
Copy link
Member

@Zimmi48 Zimmi48 commented Oct 10, 2018 •
edited

Motivation for this change

Remove annoying camlp5_transitional / camlp5_strict duality in favor of a (strict) camlp5. We take care of updating / removing the last bits that still require the transitional version.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

Currently running now-review but testing along the way seems to indicate that everything is fine.
EDIT: done.

@Zimmi48
Copy link
Member Author

Zimmi48 commented Oct 10, 2018

cc @Mic92 @vbgl

vbgl
vbgl reviewed Oct 10, 2018
View reviewed changes
pkgs/top-level/ocaml-packages.nix Outdated
@@ -674,6 +665,8 @@ let

process = callPackage ../development/ocaml-modules/process { };

prooftree = callPackage ../applications/science/logic/prooftree { };
Copy link
Contributor

Choose a reason for hiding this comment

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

This does not belong to ocamlPackages; please leave it in all-packages.nix.

Copy link
Member Author

Choose a reason for hiding this comment

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

It is an OCaml package though, isn't it? Many applications are defined there then exported in all-packages.nix. Having it there avoids listing its arguments...

Copy link
Member

@Mic92 Mic92 Oct 10, 2018 •
edited

Choose a reason for hiding this comment

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

When we do not have it there we only have to worry about one ocaml version. You can also use ocamlPackages.callPackage in all-packages.nix for convenience.

Copy link
Member Author

Choose a reason for hiding this comment

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

I see.

@Zimmi48
Copy link
Member Author

Zimmi48 commented Oct 10, 2018

Updated. I didn't rebuild everything but there should be no functional change.

@vbgl vbgl mentioned this pull request Oct 10, 2018
Merged
9 tasks
@vbgl
Copy link
Contributor

vbgl commented Oct 10, 2018 via email

@Mic92
Copy link
Member

Mic92 commented Oct 10, 2018 •
edited

The override function for packages build with ocamlPackages.callPackage works the same as for other packages build with callPackages from all-packages. There is only a different scope used. So arguments are also coming from ocamlPackages.

@Mic92 Mic92 merged commit c45a6fa into NixOS:master Oct 10, 2018
@vbgl
Copy link
Contributor

vbgl commented Oct 11, 2018

What you usually want to override, its the full ocamlPackages package set, which is not an argument to callPackage; hence my question.

@Mic92
Copy link
Member

Mic92 commented Oct 11, 2018 •
edited

Ah. Yes, if you want to change a dependency for all libraries and not just the current package, then ocamlPackages as an argument might be easier. I did not thought about that.

@Zimmi48 Zimmi48 deleted the remove-camlp5-transitional branch October 11, 2018 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@vbgl vbgl vbgl left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Zimmi48 @vbgl @Mic92 @GrahamcOfBorg