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

Merge branch 'master' into staging-next

Browse Source 
Hydra: ?compare=1473892
This commit is contained in:
Vladimír Čunát
2018-08-17 13:45:21 +02:00
parent 7a22083e12 93147d737d
commit cbabebcc2e
263 changed files with 5922 additions and 4627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/atd/default.nix
+13 -25
View File
@@ -1,41 +1,29 @@
{ stdenv, menhir, easy-format, ocaml, findlib, fetchurl, jbuilder, which }:
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
then {
version = "1.12.0";
sha256 = "1pcd4fqbilv8zm2mc1nj2s26vc5y8vnisg1q1y6bjx23wxidb09y";
buildPhase = "jbuilder build -p atd";
inherit (jbuilder) installPhase;
} else {
version = "1.1.2";
sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291";
buildPhase = "";
installPhase = ''
mkdir -p $out/bin
make PREFIX=$out install
'';
};
in
{ stdenv, menhir, easy-format, ocaml, findlib, fetchFromGitHub, jbuilder, which, biniou, yojson }:
stdenv.mkDerivation rec {
inherit (param) version buildPhase installPhase;
version = "2.0.0";
name = "ocaml${ocaml.version}-atd-${version}";
src = fetchurl {
url = "https://github.com/mjambon/atd/archive/v${version}.tar.gz";
inherit (param) sha256;
src = fetchFromGitHub {
owner = "mjambon";
repo = "atd";
rev = version;
sha256 = "0alzmk97rxg7s6irs9lvf89dy9n3r769my5n4j9p9qyigcdgjaia";
};
createFindlibDestdir = true;
buildInputs = [ which jbuilder ocaml findlib menhir ];
propagatedBuildInputs = [ easy-format ];
propagatedBuildInputs = [ easy-format biniou yojson ];
buildPhase = "jbuilder build";
inherit (jbuilder) installPhase;
meta = with stdenv.lib; {
homepage = https://github.com/mjambon/atd;
description = "Syntax for cross-language type definitions";
license = licenses.bsd3;
maintainers = [ maintainers.jwilberding ];
maintainers = with maintainers; [ aij jwilberding ];
};
}
pkgs/development/ocaml-modules/atdgen/default.nix
-25
View File
@@ -1,25 +0,0 @@
{stdenv, atd, yojson, biniou, buildOcaml, fetchurl, which}:
buildOcaml rec {
name = "atdgen";
version = "1.6.0";
src = fetchurl {
url = "https://github.com/mjambon/atdgen/archive/v${version}.tar.gz";
sha256 = "1icdxgb7qqq1pcbfqi0ikryiwaljd594z3acyci8g3bnlq0yc7zn";
};
installPhase = ''
mkdir -p $out/bin
make PREFIX=$out install
'';
buildInputs = [ which atd biniou yojson ];
meta = with stdenv.lib; {
homepage = https://github.com/mjambon/atdgen;
description = "Generates optimized boilerplate OCaml code for JSON and Biniou IO from type definitions";
license = licenses.bsd3;
maintainers = [ maintainers.jwilberding ];
};
}
pkgs/development/ocaml-modules/extlib/default.nix
+3 -3
View File
@@ -3,11 +3,11 @@
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation {
name = "ocaml-extlib-1.7.4";
name = "ocaml${ocaml.version}-extlib-1.7.5";
src = fetchurl {
url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.4.tar.gz;
sha256 = "18jb4rvkk6p3mqnkamwb41x8q49shgn43h020bs4cp4vac7nrhnr";
url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz;
sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
};
buildInputs = [ ocaml findlib cppo ];
pkgs/development/ocaml-modules/janestreet/default.nix
+8 -5
View File
@@ -299,9 +299,9 @@ rec {
};
core = janePackage {
version = "0.11.1";
version = "0.11.2";
name = "core";
hash = "0wa2dsfk5m5wlhz915664y9h08idijj5s41hyg8n54dhihvxw2ci";
hash = "0vpsvd75lxb09il2rnzyib9mlr51v1hzqdc9fdxgx353pb5agh8a";
propagatedBuildInputs = [ core_kernel spawn ];
meta.description = "Jane Street's standard library overlay";
};
@@ -341,8 +341,9 @@ rec {
};
async_kernel = janePackage {
version = "0.11.1";
name = "async_kernel";
hash = "1drxawih7vhhb1mhd291698ly7yb38qzif82jk1adqcvwdb547af";
hash = "1ssv0gqbdns6by1wdjrrs35cj1c1n1qcfkxs8hj04b7x89wzvf1q";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Jane Street Capital's asynchronous execution library (core)";
};
@@ -369,8 +370,9 @@ rec {
};
async_extra = janePackage {
version = "0.11.1";
name = "async_extra";
hash = "1qac95zlvq34fh2wbwbw0vdzxnba6si8lkal7n09y2lzpwvsifx3";
hash = "0dmplvqf41820rm5i0l9bx1xmmdlq8zsszi36y2rkjna8991f7s2";
propagatedBuildInputs = [ async_rpc_kernel async_unix ];
meta.description = "Jane Street's asynchronous execution library (extra)";
};
@@ -548,8 +550,9 @@ rec {
};
incremental_kernel = janePackage {
version = "0.11.1";
name = "incremental_kernel";
hash = "02arw8blpmnzlw5jlvavyvpgh3s9q0j9mhi2byz0x8cxknqvvasg";
hash = "1qp9dqncx2h0np0rndqaic4dna8f1dlkqnbjfcdhcim5dp2vg4x6";
propagatedBuildInputs = [ core_kernel ];
meta.description = "Library for incremental computations depending only on core_kernel";
};
pkgs/development/ocaml-modules/javalib/default.nix
+7 -5
View File
@@ -1,4 +1,6 @@
{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}:
{ stdenv, fetchurl, which, ocaml, findlib, camlp4
, camlzip, camomile, extlib
}:
if !stdenv.lib.versionAtLeast ocaml.version "4"
then throw "javalib not supported for ocaml ${ocaml.version}"
@@ -10,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.3.4";
version = "2.3.5";
src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/37154/javalib-2.3.4.tar.bz2";
sha256 = "1ajzbyli5a3y9s8f46913drpxdzlby3i4g3c2fqacmnbyvhpaqb6";
url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2";
sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd";
};
buildInputs = [ which ocaml findlib camlp4 ];
@@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH;
'';
propagatedBuildInputs = [ camlzip extlib ];
propagatedBuildInputs = [ camlzip camomile extlib ];
meta = with stdenv.lib; {
description = "A library that parses Java .class files into OCaml data structures";