JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

js_of_ocaml: 2.5 -> 2.6

Browse Source
This commit is contained in:
Florent Becker 2016-01-01 17:38:30 +01:00
parent 87f2c1dcc4
commit 44931d4293
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
View File

@ -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

10
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -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 ];