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

ocamlPackages.erm_xmpp: 0.3 -> 0.3+20180112

Browse Source
This commit is contained in:
Vincent Laporte 2018-09-21 17:01:52 +00:00
parent ab2f86aec3
commit 26aa4c36ba
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
4 changed files with 22 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/jackline/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = with ocamlPackages; [
ocaml ocamlbuild findlib topkg ppx_sexp_conv
erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring
erm_xmpp tls nocrypto x509 ocaml_lwt otr astring
ptime notty sexplib hex uutf
];

29
pkgs/development/ocaml-modules/erm_xmpp/0.3.nix
View File

@ -1,29 +0,0 @@
{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib, erm_xml, nocrypto }:
buildOcaml rec {
version = "0.3";
name = "erm_xmpp";
src = fetchFromGitHub {
owner = "hannesm";
repo = "xmpp";
rev = "eee18bd3dd343550169969c0b45548eafd51cfe1";
sha256 = "0hzs528lrx1ayalv6fh555pjn0b4l8xch1f72hd3b07g1xahdas5";
};
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ erm_xml nocrypto ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;
meta = {
homepage = https://github.com/hannesm/xmpp;
description = "OCaml based XMPP implementation (fork)";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
};
}

43
pkgs/development/ocaml-modules/erm_xmpp/default.nix
View File

@ -1,33 +1,32 @@
{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocamlbuild, erm_xml, cryptokit, camlp4 }:
{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild
, erm_xml, nocrypto
}:
let
version = "0.2";
disable-tests = fetchurl {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/erm_xmpp/erm_xmpp.0.2/files/disable_tests.patch;
sha256 = "09d8630nmx2x8kb8ap1zmsb93zs14cqg7ga1gmdl92jvsjxbhgc1";
stdenv.mkDerivation rec {
version = "0.3+20180112";
name = "ocaml${ocaml.version}-erm_xmpp-${version}";
src = fetchFromGitHub {
owner = "hannesm";
repo = "xmpp";
rev = "184dc70fab7d46d09b9148ca4448f07f1e0a2df2";
sha256 = "1dsqsfacvd9xqsqjzh6xwbnf2mv1dvhy210riyvjd260q085ch6n";
};
in
stdenv.mkDerivation {
name = "ocaml-erm_xmpp-${version}";
src = fetchzip {
url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz";
sha256 = "0saw2dmrzv2aadrznvyvchnhivvcwm78x9nwf6flq5v0pqddapk2";
};
patches = [ disable-tests ];
buildInputs = [ ocaml findlib ocamlbuild camlp4 ];
propagatedBuildInputs = [ erm_xml cryptokit ];
propagatedBuildInputs = [ erm_xml nocrypto ];
configurePhase = "ocaml setup.ml -configure --prefix $out";
buildPhase = "ocaml setup.ml -build";
installPhase = "ocaml setup.ml -install";
createFindlibDestdir = true;
meta = {
homepage = https://github.com/ermine/xmpp;
description = "OCaml based XMPP implementation";
platforms = ocaml.meta.platforms or [];
homepage = https://github.com/hannesm/xmpp;
description = "OCaml based XMPP implementation (fork)";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ vbgl ];
maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
inherit (ocaml.meta) platforms;
};
}

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

@ -240,8 +240,6 @@ let
erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
erm_xmpp_0_3 = callPackage ../development/ocaml-modules/erm_xmpp/0.3.nix { };
estring = callPackage ../development/ocaml-modules/estring { };
ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };