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

ocamlPackages.batteries: 2.7.0 -> 2.8.0

Browse Source 
Also renames the attribute from ocaml_batteries to batteries.
This commit is contained in:
Vincent Laporte 2017-11-14 17:43:21 +00:00
parent a3aae2c831
commit 26798bd6e0
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/fstar/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [
z3 ocaml findlib ocaml_batteries menhir stdint z3 ocaml findlib batteries menhir stdint
zarith camlp4 yojson pprint zarith camlp4 yojson pprint
]; ];

13
pkgs/development/ocaml-modules/batteries/default.nix
View File

@ -1,18 +1,21 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: { stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest, num }:
let version = "2.7.0"; in let version = "2.8.0"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-batteries-${version}"; name = "ocaml${ocaml.version}-batteries-${version}";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
sha256 = "02rgfylz6x4y2030cclf9zwk2i8xqsydn1y9hjkja2qsk895bwfb"; sha256 = "1cvgljg8lxvfx0v3367z3p43dysg9m33v8gfy43bhw7fjr1bmyas";
}; };
buildInputs = [ ocaml findlib ocamlbuild qtest ]; buildInputs = [ ocaml findlib ocamlbuild qtest ];
propagatedBuildInputs = [ num ];
configurePhase = "true"; # Skip configure configurePhase = if num != null then ''
export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs/"
'' else "true"; # Skip configure
doCheck = true; doCheck = true;
checkTarget = "test test"; checkTarget = "test test";

4
pkgs/development/ocaml-modules/sqlexpr/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildOcaml, fetchurl, ocaml_batteries, csv, ocaml_lwt, ocaml_sqlite3, estring }: { stdenv, buildOcaml, fetchurl, batteries, csv, ocaml_lwt, ocaml_sqlite3, estring }:
buildOcaml rec { buildOcaml rec {
name = "sqlexpr"; name = "sqlexpr";
@ -9,7 +9,7 @@ buildOcaml rec {
sha256 = "02pi0xxr3xzalwpvcaq96k57wz2vxj20l2mga1a4d2ddvhran8kr"; sha256 = "02pi0xxr3xzalwpvcaq96k57wz2vxj20l2mga1a4d2ddvhran8kr";
}; };
propagatedBuildInputs = [ ocaml_batteries csv ocaml_lwt ocaml_sqlite3 estring ]; propagatedBuildInputs = [ batteries csv ocaml_lwt ocaml_sqlite3 estring ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mfp/ocaml-sqlexpr; homepage = https://github.com/mfp/ocaml-sqlexpr;

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

@ -56,6 +56,8 @@ let
bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; }; bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; };
batteries = callPackage ../development/ocaml-modules/batteries { };
bitstring = callPackage ../development/ocaml-modules/bitstring { }; bitstring = callPackage ../development/ocaml-modules/bitstring { };
bolt = callPackage ../development/ocaml-modules/bolt { }; bolt = callPackage ../development/ocaml-modules/bolt { };
@ -286,7 +288,6 @@ let
inifiles = callPackage ../development/ocaml-modules/inifiles { }; inifiles = callPackage ../development/ocaml-modules/inifiles { };
jingoo = callPackage ../development/ocaml-modules/jingoo { jingoo = callPackage ../development/ocaml-modules/jingoo {
batteries = ocaml_batteries;
pcre = ocaml_pcre; pcre = ocaml_pcre;
}; };
@ -391,8 +392,6 @@ let
then callPackage ../development/ocaml-modules/num {} then callPackage ../development/ocaml-modules/num {}
else null; else null;
ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
comparelib = callPackage ../development/ocaml-modules/comparelib { }; comparelib = callPackage ../development/ocaml-modules/comparelib { };
core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { };