Unverified Commit b00f806e authored by Pascal Wittmann's avatar Pascal Wittmann Committed by GitHub
Browse files

Merge pull request #32400 from vbgl/ocamlnet-4.1.5

 ocamlPackages.ocamlnet: 4.1.4 -> 4.1.5
parents cdde22ae d3e488c3
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
{ callPackage, fetchurl, ... } @ args:

callPackage ./generic.nix (args // rec {
  version = "3.3";

  src = fetchurl {
    url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
    sha256 = "07mif3af077763vc35s1x8vzhzlgqcgxh67c1xr13jnhslkjd526";
  };
})
+3 −9
Original line number Diff line number Diff line
{ stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle_3_3 }:
, gnutls, nettle }:

# These overrides are just temporary, until ocamlnet supports nettle-3.4.
let gnutls_orig = gnutls; in
let gnutls = gnutls_orig.override { nettle = nettle_3_3; };
    nettle = nettle_3_3;
in

let version = "4.1.4"; in
let version = "4.1.5"; in

stdenv.mkDerivation {
  name = "ocaml${ocaml.version}-ocamlnet-${version}";

  src = fetchurl {
    url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
    sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6";
    sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm";
  };

  nativeBuildInputs = [ pkgconfig ];
+0 −1
Original line number Diff line number Diff line
@@ -10060,7 +10060,6 @@ with pkgs;
  };
  nettle = callPackage ../development/libraries/nettle { };
  nettle_3_3 = callPackage ../development/libraries/nettle/3.3.nix { };
  newt = callPackage ../development/libraries/newt { };