diff options
| author | Florent Becker <Florent.Becker@ens-lyon.org> | 2016-05-30 17:45:20 +0200 |
|---|---|---|
| committer | Florent Becker <florent.becker@ens-lyon.org> | 2016-05-31 19:10:07 +0200 |
| commit | 527c1cba37d541011a6b53dfa5f4b0ba1fc8b865 (patch) | |
| tree | f0bc9a93b9a1ed037efcb0971b68b94329c6fe84 | |
| parent | 2ddee12a422ad6307696df7f74ec6b98f98faa01 (diff) | |
| download | nixlib-527c1cba37d541011a6b53dfa5f4b0ba1fc8b865.tar nixlib-527c1cba37d541011a6b53dfa5f4b0ba1fc8b865.tar.gz nixlib-527c1cba37d541011a6b53dfa5f4b0ba1fc8b865.tar.bz2 nixlib-527c1cba37d541011a6b53dfa5f4b0ba1fc8b865.tar.lz nixlib-527c1cba37d541011a6b53dfa5f4b0ba1fc8b865.tar.xz nixlib-527c1cba37d541011a6b53dfa5f4b0ba1fc8b865.tar.zst nixlib-527c1cba37d541011a6b53dfa5f4b0ba1fc8b865.zip | |
js_of_ocaml: 2.6 -> 2.7
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 3258aaf08c2f..3f5bd770dcf0 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,24 +1,18 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, cmdliner, tyxml, reactivedata, cppo, which, base64}: -let camlp4_patch = fetchurl { - url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch"; - sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39"; - }; -in - stdenv.mkDerivation { - name = "js_of_ocaml-2.6"; + name = "js_of_ocaml-2.7"; src = fetchurl { - url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz; - sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61"; + url = https://github.com/ocsigen/js_of_ocaml/archive/2.7.tar.gz; + sha256 = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; }; buildInputs = [ocaml findlib menhir ocsigen_deriving cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; - patches = [ ./Makefile.conf.diff camlp4_patch ]; + patches = [ ./Makefile.conf.diff ]; createFindlibDestdir = true; |