diff options
| author | vbgl <vbgl@users.noreply.github.com> | 2016-06-08 17:40:08 +0200 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-06-08 16:40:08 +0100 |
| commit | 0a4e806f8f6532098284238e15dfb9801309c70c (patch) | |
| tree | 1de84705ff857d5d470eaef21b335152713a2bc3 /pkgs/development/ocaml-modules | |
| parent | d220132f222979db1350dde527408e445af3cf43 (diff) | |
| download | nixlib-0a4e806f8f6532098284238e15dfb9801309c70c.tar nixlib-0a4e806f8f6532098284238e15dfb9801309c70c.tar.gz nixlib-0a4e806f8f6532098284238e15dfb9801309c70c.tar.bz2 nixlib-0a4e806f8f6532098284238e15dfb9801309c70c.tar.lz nixlib-0a4e806f8f6532098284238e15dfb9801309c70c.tar.xz nixlib-0a4e806f8f6532098284238e15dfb9801309c70c.tar.zst nixlib-0a4e806f8f6532098284238e15dfb9801309c70c.zip | |
ocamlnet: 3.7.7 -> 4.1.1 (#16008)
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/ocamlnet/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 8ef940e75b00..e67eebeb7a05 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,20 +1,19 @@ -{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl, cryptokit }: +{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip +, gnutls, nettle }: let ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation { - name = "ocamlnet-3.7.7"; + name = "ocamlnet-4.1.1"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-3.7.7.tar.gz; - sha256 = "02bnks9jshpq9nqva5lky5hl009yp19cgvf1izjca620hx54d3jv"; + url = http://download.camlcity.org/download/ocamlnet-4.1.1.tar.gz; + sha256 = "1z0j542dfzfimsn4asw1ycb4ww561pv92cz6s6kxazvgx60c5rb1"; }; - buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; - - propagatedbuildInputs = [ncurses ocaml_pcre camlzip openssl ocaml_ssl cryptokit]; + buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ]; createFindlibDestdir = true; @@ -23,10 +22,9 @@ stdenv.mkDerivation { preConfigure = '' configureFlagsArray=( -bindir $out/bin - -enable-ssl + -enable-gnutls -enable-zip -enable-pcre - -enable-crypto -disable-gtk2 -with-nethttpd -datadir $out/lib/ocaml/${ocaml_version}/ocamlnet |