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

Merge pull request #44193 from vbgl/stog-0.18

Browse Source 
stog: 0.17.0 -> 0.18.0
This commit is contained in:
xeji 2018-07-29 21:04:15 +02:00 committed by GitHub
commit 1feb8e97c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/misc/stog/default.nix
View File

@ -1,18 +1,19 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime, { stdenv, fetchFromGitLab, ocaml, findlib, ocf, ptime,
uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, omd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "stog-${version}"; name = "stog-${version}";
version = "0.17.0"; version = "0.18.0";
src = fetchFromGitHub { src = fetchFromGitLab {
domain = "framagit.org";
owner = "zoggy"; owner = "zoggy";
repo = "stog"; repo = "stog";
rev = "release-${version}"; rev = version;
sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d"; sha256 = "154gl3ljxqlw8wz1vmsyv8180igrl5bjq0wir7ybrnzq2cdflkv0";
}; };
buildInputs = [ ocaml camlp4 uutf ]; buildInputs = [ ocaml uutf ];
propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ]; propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ];
createFindlibDestdir = true; createFindlibDestdir = true;
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "XML documents and web site compiler"; description = "XML documents and web site compiler";
homepage = https://zoggy.github.io/stog/; homepage = https://www.good-eris.net/stog;
license = licenses.lgpl3; license = licenses.lgpl3;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ regnat ]; maintainers = with maintainers; [ regnat ];

12
pkgs/development/ocaml-modules/asn1-combinators/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
, cstruct, zarith, ounit, result, topkg, ptime , cstruct, zarith, ounit, result, topkg, ptime
}: }:
@ -10,16 +10,14 @@ let param =
} else { } else {
version = "0.1.3"; version = "0.1.3";
sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj"; sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
propagatedBuildInputs = [ ]; propagatedBuildInputs = [ ];
}; };
in in
buildOcaml rec { stdenv.mkDerivation rec {
name = "asn1-combinators"; name = "ocaml${ocaml.version}-asn1-combinators-${version}";
inherit (param) version; inherit (param) version;
minimumSupportedOcamlVersion = "4.01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mirleft"; owner = "mirleft";
repo = "ocaml-asn1-combinators"; repo = "ocaml-asn1-combinators";
@ -27,7 +25,7 @@ buildOcaml rec {
inherit (param) sha256; inherit (param) sha256;
}; };
buildInputs = [ ocaml findlib ounit topkg ]; buildInputs = [ ocaml findlib ocamlbuild ounit topkg ];
propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs; propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs;
buildPhase = "${topkg.run} build --tests true"; buildPhase = "${topkg.run} build --tests true";

10
pkgs/development/ocaml-modules/ptime/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }: { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result, js_of_ocaml }:
buildOcaml rec { stdenv.mkDerivation rec {
version = "0.8.3"; version = "0.8.4";
name = "ptime"; name = "ocaml${ocaml.version}-ptime-${version}";
src = fetchurl { src = fetchurl {
url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
sha256 = "18jimskgnd9izg7kn6zk6sk35adgjm605dkv13plwslbb90kqr44"; sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg";
}; };
unpackCmd = "tar -xf $curSrc"; unpackCmd = "tar -xf $curSrc";

4
pkgs/top-level/ocaml-packages.nix
View File

@ -689,9 +689,7 @@ let
ssl = callPackage ../development/ocaml-modules/ssl { }; ssl = callPackage ../development/ocaml-modules/ssl { };
stog = callPackage ../applications/misc/stog { stog = callPackage ../applications/misc/stog { };
ocaml_lwt = lwt2;
};
stringext = callPackage ../development/ocaml-modules/stringext { }; stringext = callPackage ../development/ocaml-modules/stringext { };