diff options
| author | Florent Becker <florent.becker@ens-lyon.org> | 2016-01-01 17:38:30 +0100 |
|---|---|---|
| committer | Florent Becker <florent.becker@ens-lyon.org> | 2016-01-01 19:04:40 +0100 |
| commit | 44931d4293ba3f1d24430624086ee0c7b705fcc3 (patch) | |
| tree | 5215b05be22363330461b4f1e98195fffefaf265 /pkgs/development/tools/ocaml/js_of_ocaml | |
| parent | 87f2c1dcc416f88b89e2e1500b0148efa4595b38 (diff) | |
| download | nixpkgs-44931d4293ba3f1d24430624086ee0c7b705fcc3.tar nixpkgs-44931d4293ba3f1d24430624086ee0c7b705fcc3.tar.gz nixpkgs-44931d4293ba3f1d24430624086ee0c7b705fcc3.tar.bz2 nixpkgs-44931d4293ba3f1d24430624086ee0c7b705fcc3.tar.lz nixpkgs-44931d4293ba3f1d24430624086ee0c7b705fcc3.tar.xz nixpkgs-44931d4293ba3f1d24430624086ee0c7b705fcc3.tar.zst nixpkgs-44931d4293ba3f1d24430624086ee0c7b705fcc3.zip | |
js_of_ocaml: 2.5 -> 2.6
Diffstat (limited to 'pkgs/development/tools/ocaml/js_of_ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 |
2 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff index 0e3f55df6d2..e6fc96038ff 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff +++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff @@ -8,14 +8,3 @@ #### ---- old/Makefile 2014-09-30 16:40:37.000000000 +0200 -+++ new/Makefile 2015-10-14 10:28:41.366815864 +0200 -@@ -52,7 +52,7 @@ - install-bin: - install -d -m 755 $(BINDIR) - install $(BIN) $(BINDIR) -- install $(TOOLS) $(BINDIR) -+ install $(TOOLS) $(BINDIR) || true - - uninstall: uninstall-lib uninstall-bin - diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index eaabd50059d..0c57ae47c2c 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4, - cmdliner, tyxml, reactivedata}: + cmdliner, tyxml, reactivedata, cppo, which, base64}: stdenv.mkDerivation { - name = "js_of_ocaml-2.5"; + name = "js_of_ocaml-2.6"; src = fetchurl { - url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz; - sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv"; + url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz; + sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61"; }; buildInputs = [ocaml findlib menhir ocsigen_deriving - cmdliner tyxml reactivedata]; + cmdliner tyxml reactivedata cppo which base64]; propagatedBuildInputs = [ ocaml_lwt camlp4 ]; patches = [ ./Makefile.conf.diff ]; |