From 4e9e1bc7ba2a950542b3b330fd14bb4ce6dceb8f Mon Sep 17 00:00:00 2001 From: regnat Date: Thu, 23 Mar 2017 09:02:21 +0100 Subject: stog: init at 0.17.0 --- pkgs/applications/misc/stog/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/applications/misc/stog/install.patch | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/ocaml-packages.nix | 2 ++ 4 files changed, 53 insertions(+) create mode 100644 pkgs/applications/misc/stog/default.nix create mode 100644 pkgs/applications/misc/stog/install.patch diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix new file mode 100644 index 000000000000..fa160c51fe23 --- /dev/null +++ b/pkgs/applications/misc/stog/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime, + uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd +}: + +stdenv.mkDerivation rec { + name = "stog-${version}"; + version = "0.17.0"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "stog"; + rev = "release-${version}"; + sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d"; + }; + + buildInputs = [ ocaml camlp4 uutf ]; + propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ]; + + createFindlibDestdir = true; + + patches = [ ./install.patch ]; + + meta = with stdenv.lib; { + description = "XML documents and web site compiler"; + homepage = "https://zoggy.github.io/stog/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} + + diff --git a/pkgs/applications/misc/stog/install.patch b/pkgs/applications/misc/stog/install.patch new file mode 100644 index 000000000000..a2407d3079f5 --- /dev/null +++ b/pkgs/applications/misc/stog/install.patch @@ -0,0 +1,18 @@ +diff --git a/src/Makefile b/src/Makefile +index 736dd037..79a85b9c 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -431,11 +431,12 @@ install-lib: + install-share: + + install-bin: ++ mkdir $(out)/bin + $(CP) $(MAIN) $(MAIN_BYTE) $(TMPL) $(TMPL_BYTE) \ + $(SERVER) $(SERVER_BYTE) $(OCAML_SESSION) \ + $(MK_STOG) $(MK_STOG_BYTE) $(MK_STOG_OCAML) \ + $(LATEX2STOG) $(LATEX2STOG_BYTE) \ +- `dirname \`which $(OCAMLC)\``/ ++ $(out)/bin + + uninstall: uninstall-lib uninstall-share uninstall-bin + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7567b54977f0..4d7ee99c6888 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15507,6 +15507,8 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; + inherit (ocamlPackages_4_03) stog; + stp = callPackage ../applications/science/logic/stp {}; stumpwm = callPackage ../applications/window-managers/stumpwm { diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 54a8c5338797..232f13318651 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -517,6 +517,8 @@ let stdio = callPackage ../development/ocaml-modules/stdio { }; + stog = callPackage ../applications/misc/stog { }; + stringext = callPackage ../development/ocaml-modules/stringext { }; topkg = callPackage ../development/ocaml-modules/topkg { }; -- cgit 1.4.1