mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 11:02:05 +00:00
Code Issues Wiki Activity

Merge pull request #19618 from vbgl/cryptokit-1.11

Browse source 
ocamlPackages.cryptokit: 1.10 -> 1.11
This commit is contained in:
Jörg Thalheim 2016-10-22 19:17:34 +02:00 committed by GitHub
parent c47c2ee02f 99edbe65c1
commit 881908920d
2 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/ocaml-modules/cryptokit/default.nix
View file

@ -1,17 +1,32 @@
{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, ncurses }:
{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, zarith, ncurses }:
assert stdenv.lib.versionAtLeast ocaml.version "3.12";
stdenv.mkDerivation rec {
name = "cryptokit-${version}";
version = "1.10";
src = fetchurl {
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
then {
version = "1.11";
url = http://forge.ocamlcore.org/frs/download.php/1618/cryptokit-1.11.tar.gz;
sha256 = "1c1vn15lf2b5a8nfa2v2brxm7bwby540nf6q0vkndgkq5qcw96j8";
inherit zarith;
} else {
version = "1.10";
url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz;
sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv";
zarith = null;
};
in
stdenv.mkDerivation rec {
name = "cryptokit-${version}";
inherit (param) version;
src = fetchurl {
inherit (param) url sha256;
};
buildInputs = [ zlib ocaml findlib ocamlbuild ncurses ];
propagatedBuildInputs = [ param.zarith ];
buildFlags = "setup.data build";

22
pkgs/development/ocaml-modules/zarith/default.nix
View file

@ -2,14 +2,26 @@
assert stdenv.lib.versionAtLeast ocaml.version "3.12.1";
stdenv.mkDerivation rec {
name = "zarith-${version}";
version = "1.3";
src = fetchurl {
let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02"
then {
version = "1.4.1";
url = http://forge.ocamlcore.org/frs/download.php/1574/zarith-1.4.1.tgz;
sha256 = "0l36hzmfbvdai2kcgynh13vfdim5x2grnaw61fxqalyjm90c3di3";
} else {
version = "1.3";
url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll";
};
in
stdenv.mkDerivation rec {
name = "zarith-${version}";
inherit (param) version;
src = fetchurl {
inherit (param) url sha256;
};
buildInputs = [ ocaml findlib pkgconfig perl ];
propagatedBuildInputs = [ gmp ];