From b744ee2d939aa1af64795330c9671971db66f7bd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 20 Aug 2017 04:39:14 +0000 Subject: [PATCH] ocamlPackages.ocamlnet: 4.1.{2,3} -> 4.1.4 --- .../ocaml-modules/ocamlnet/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 7e0cad538d5..51a30d7c91a 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,23 +1,14 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" - then { - version = "4.1.3"; - sha256 = "1ifm3izml9hnr7cic1413spnd8x8ka795awsm2xpam3cs8z3j0ca"; - } else { - version = "4.1.2"; - sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i"; - }; -in +let version = "4.1.4"; in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocamlnet-${param.version}"; + name = "ocaml${ocaml.version}-ocamlnet-${version}"; src = fetchurl { - url = "http://download.camlcity.org/download/ocamlnet-${param.version}.tar.gz"; - inherit (param) sha256; + url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; + sha256 = "0hhi3s4xas5i3p7214qfji5pvr7d30d89vnmkznxsfqj4v7dmhs6"; }; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ];