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

js_of_ocaml: 3.4.0 -> 3.5.2 #75766

Merged
merged 5 commits into from Mar 6, 2020
Merged

js_of_ocaml: 3.4.0 -> 3.5.2 #75766

merged 5 commits into from Mar 6, 2020

Conversation

nomeata
Copy link
Contributor

@nomeata nomeata commented Dec 16, 2019

a drive-by contribution, as I was playing around with this (it has better
support for the num library, it seems.)

@vbgl
Copy link
Contributor

vbgl commented Dec 21, 2019

@GrahamcOfBorg build why3

Copy link
Contributor

@vbgl vbgl left a comment

Choose a reason for hiding this comment

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

This breaks why3.

@nomeata
Copy link
Contributor Author

nomeata commented Dec 21, 2019

Bummer. No new why3 release yet, and I did not manage to register for their Gitlab. Guess we’ll just wait until they become compatible with the latest js_of_ocaml?

@vbgl
Copy link
Contributor

vbgl commented Feb 11, 2020

There is no release, but the source has been updated. Maybe you should try a fix like that:

--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, stdenv
+{ callPackage, fetchurl, fetchpatch, stdenv
 , ocamlPackages, coqPackages, rubber, hevea, emacs }:
 
 stdenv.mkDerivation {
@@ -30,7 +30,13 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   # Remove unnecessary call to which
-  patches = [ ./configure.patch ];
+  patches = [ ./configure.patch
+    # Compatibility with js_of_ocaml 3.5
+    (fetchpatch {
+      url = "https://gitlab.inria.fr/why3/why3/commit/269ab313382fe3e64ef224813937314748bf7cf0.diff";
+      sha256 = "0i92wdnbh8pihvl93ac0ma1m5g95jgqqqj4kw6qqvbbjjqdgvzwa";
+    })
+  ];
 
   configureFlags = [ "--enable-verbose-make" ];
 

@nomeata
Copy link
Contributor Author

nomeata commented Feb 12, 2020

Thanks, trying that.
@GrahamcOfBorg build why3

@ofborg ofborg bot requested review from thoughtpolice and vbgl February 12, 2020 18:42
@ofborg ofborg bot requested a review from thoughtpolice February 12, 2020 21:52
@vbgl
Copy link
Contributor

vbgl commented Feb 14, 2020

@GrahamcOfBorg build ocamlPackages.js_of_ocaml-ppx_deriving_json

@vbgl
Copy link
Contributor

vbgl commented Feb 14, 2020

I’ve just pushed a fix for js_of_ocaml-ppx_deriving-json.

Eliom and related packages still need to be updated.

@vbgl vbgl mentioned this pull request Feb 19, 2020
10 tasks
@vbgl
Copy link
Contributor

vbgl commented Feb 25, 2020

I’ve just pushed an update of eliom and ocsigen-toolkit. In order to update ocsigen-start (which needs pgocaml_ppx), could you please rebase? Thanks.

nomeata and others added 5 commits February 28, 2020 17:29
drive-by contributions, as I was playing around with this (it has better
support for the `num` library, it seems.)
ocamlPackages.ocsigen-toolkit: 2.2.0 → 2.5.0
@vbgl
Copy link
Contributor

vbgl commented Feb 28, 2020

I’ve force-pushed an update to ocsigen-start. I hope you don’t mind.

I believe this is now ready.

@vbgl vbgl merged commit 2d2a5a9 into NixOS:master Mar 6, 2020
@nomeata
Copy link
Contributor Author

nomeata commented Mar 6, 2020

Will this get into 20.03 as well or is it too late for that?

@nomeata nomeata deleted the js_of_ocaml branch March 6, 2020 07:54
@vbgl
Copy link
Contributor

vbgl commented Mar 6, 2020

Let’s give it a try!

@nomeata
Copy link
Contributor Author

nomeata commented Mar 6, 2020

I guess https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes describes the process. Will give it a try!

@vbgl
Copy link
Contributor

vbgl commented Mar 6, 2020

You’ll have to cherry-pick 4f7484f & c589de9 too.

@nomeata
Copy link
Contributor Author

nomeata commented Mar 6, 2020

You’ll have to cherry-pick 4f7484f & c589de9 too.

Thanks, that was helpful :-)

@nomeata
Copy link
Contributor Author

nomeata commented Mar 6, 2020

@vbgl how does #81882 look?

vbgl pushed a commit that referenced this pull request Mar 9, 2020
drive-by contributions, as I was playing around with this (it has better
support for the `num` library, it seems.)

js_of_ocaml: 3.4.0 -> 3.5.2
ocamlPackages.js_of_ocaml-ppx_deriving_json: use ppxlib-0.12.0
ocamlPackages.eliom: 6.8.0 → 6.10.1
ocamlPackages.ocsigen-toolkit: 2.2.0 → 2.5.0
ocamlPackages.ocsigen-start: 2.7.0 → 2.16.1

Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
(cherry picked from commit 2d2a5a9)
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