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
parent d0a9f5e77e 26213bc990
commit 1feb8e97c5
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
}:
@@ -10,16 +10,14 @@ let param =
} else {
version = "0.1.3";
sha256 = "0hpn049i46sdnv2i6m7r6m6ch0jz8argybh71wykbvcqdby08zxj";
propagatedBuildInputs = [ ];
propagatedBuildInputs = [ ];
};
in
buildOcaml rec {
name = "asn1-combinators";
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-asn1-combinators-${version}";
inherit (param) version;
minimumSupportedOcamlVersion = "4.01";
src = fetchFromGitHub {
owner = "mirleft";
repo = "ocaml-asn1-combinators";
@@ -27,7 +25,7 @@ buildOcaml rec {
inherit (param) sha256;
};
buildInputs = [ ocaml findlib ounit topkg ];
buildInputs = [ ocaml findlib ocamlbuild ounit topkg ];
propagatedBuildInputs = [ result cstruct zarith ] ++ param.propagatedBuildInputs;
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 {
version = "0.8.3";
name = "ptime";
stdenv.mkDerivation rec {
version = "0.8.4";
name = "ocaml${ocaml.version}-ptime-${version}";
src = fetchurl {
url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
sha256 = "18jimskgnd9izg7kn6zk6sk35adgjm605dkv13plwslbb90kqr44";
sha256 = "0z2snhda8bg136xkw2msw6k2dz84vb49p8bgzrxfs8mawdlk0kkg";
};
unpackCmd = "tar -xf $curSrc";