swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4323 from vbgl/ocaml-ipaddr-2.5.0

Browse source 
OCaml-ipaddr: update to 2.5.0
This commit is contained in:
Mateusz Kowalczyk 2014-09-30 07:54:06 +01:00
parent 7fca2693f5 7adab7e25e
commit 11782ceb6d
4 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/ocaml-modules/ocaml-ipaddr/default.nix
View file

@ -1,15 +1,23 @@
{ocaml, findlib, stdenv, fetchurl}:
{ocaml, findlib, stdenv, fetchurl, ocaml_sexplib}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
stdenv.mkDerivation {
name = "ocaml-ipaddr-2.4.0";
name = "ocaml-ipaddr-2.5.0";
src = fetchurl {
url = https://github.com/mirage/ocaml-ipaddr/archive/2.4.0.tar.gz;
sha256 = "0g7qg35w3vzcg37798rhbx7iia83286md3gj5gdhs1qgizlg56wx";
url = https://github.com/mirage/ocaml-ipaddr/archive/2.5.0.tar.gz;
sha256 = "0zpslxzjs5zdw20j3jaf6fr0w2imnidhrzggmnvwp198r76aq917";
};
buildInputs = [ocaml findlib];
propagatedBuildInputs = [ocaml_sexplib];
createFindlibDestdir = true;
meta = with stdenv.lib; {
description = "An OCaml library for manipulation of IP (and MAC) address representations";
license = licenses.isc;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

10
pkgs/development/ocaml-modules/sexplib/108.08.00.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, typeconv}:
{stdenv, fetchurl, ocaml, findlib, typeconv, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -14,14 +14,16 @@ stdenv.mkDerivation {
sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg";
};
buildInputs = [ocaml findlib typeconv ];
buildInputs = [ocaml findlib];
propagatedBuildInputs = [typeconv camlp4];
createFindlibDestdir = true;
meta = {
meta = with stdenv.lib; {
homepage = https://ocaml.janestreet.com/;
description = "Library for serializing OCaml values to and from S-expressions";
license = stdenv.lib.licenses.asl20;
license = licenses.asl20;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

10
pkgs/development/ocaml-modules/sexplib/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv}:
{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
@ -14,14 +14,16 @@ stdenv.mkDerivation {
sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila";
};
buildInputs = [ocaml findlib ocaml_typeconv ];
buildInputs = [ocaml findlib];
propagatedBuildInputs = [ocaml_typeconv camlp4];
createFindlibDestdir = true;
meta = {
meta = with stdenv.lib; {
homepage = https://ocaml.janestreet.com/;
description = "Library for serializing OCaml values to and from S-expressions";
license = stdenv.lib.licenses.asl20;
license = licenses.asl20;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

23
pkgs/development/ocaml-modules/tyxml/default.nix
View file

@ -1,29 +1,24 @@
{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}:
{stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4}:
stdenv.mkDerivation {
name = "tyxml-3.0.0";
name = "tyxml-3.1.1";
src = fetchurl {
url = http://ocsigen.org/download/tyxml-3.0.0.tar.gz;
sha256 = "0cvbmyg4g0lg4f23032cjlxqklisccbjgj47117wm6gva8xi7xa3";
url = http://github.com/ocsigen/tyxml/archive/3.1.1.tar.gz;
sha256 = "1r8im382r68kn8qy0857nv3y7h42i6ajyclxzmigfai7v2xdd05z";
};
buildInputs = [ocaml findlib ocaml_oasis];
buildInputs = [ocaml findlib ocaml_oasis camlp4];
createFindlibDestdir = true;
configurePhase = ''
make setup-dev.exe
./setup-dev.exe -configure --prefix $out
'';
meta = {
meta = with stdenv.lib; {
homepage = http://ocsigen.org/tyxml/;
description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML ouput, using static typing";
license = "LGPL";
license = licenses.lgpl21;
platforms = ocaml.meta.platforms;
maintainers = [
stdenv.lib.maintainers.gal_bolle
maintainers = with maintainers; [
gal_bolle vbgl
];
};