diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-07-29 13:32:10 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-07-29 13:32:10 +0000 |
| commit | 26213bc990e3bcf4d0e3f2b24e1f950fd37779bd (patch) | |
| tree | 80f8bf7fc92946e8444963e1d2e1823e87ff1521 /pkgs | |
| parent | bbf96f865286f87bbff9bc6679f4ee9c2584ad53 (diff) | |
| download | nixlib-26213bc990e3bcf4d0e3f2b24e1f950fd37779bd.tar nixlib-26213bc990e3bcf4d0e3f2b24e1f950fd37779bd.tar.gz nixlib-26213bc990e3bcf4d0e3f2b24e1f950fd37779bd.tar.bz2 nixlib-26213bc990e3bcf4d0e3f2b24e1f950fd37779bd.tar.lz nixlib-26213bc990e3bcf4d0e3f2b24e1f950fd37779bd.tar.xz nixlib-26213bc990e3bcf4d0e3f2b24e1f950fd37779bd.tar.zst nixlib-26213bc990e3bcf4d0e3f2b24e1f950fd37779bd.zip | |
stog: 0.17.0 -> 0.18.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/stog/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 8be792c673c0..d3cd81f7f13a 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime, - uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd +{ stdenv, fetchFromGitLab, ocaml, findlib, ocf, ptime, + uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, omd }: stdenv.mkDerivation rec { name = "stog-${version}"; - version = "0.17.0"; - src = fetchFromGitHub { + version = "0.18.0"; + src = fetchFromGitLab { + domain = "framagit.org"; owner = "zoggy"; repo = "stog"; - rev = "release-${version}"; - sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d"; + rev = version; + sha256 = "154gl3ljxqlw8wz1vmsyv8180igrl5bjq0wir7ybrnzq2cdflkv0"; }; - buildInputs = [ ocaml camlp4 uutf ]; + buildInputs = [ ocaml uutf ]; propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ]; createFindlibDestdir = true; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML documents and web site compiler"; - homepage = https://zoggy.github.io/stog/; + homepage = https://www.good-eris.net/stog; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 234d27bc1bc8..9206f2498daa 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -689,9 +689,7 @@ let ssl = callPackage ../development/ocaml-modules/ssl { }; - stog = callPackage ../applications/misc/stog { - ocaml_lwt = lwt2; - }; + stog = callPackage ../applications/misc/stog { }; stringext = callPackage ../development/ocaml-modules/stringext { }; |