ocamlPackages.uri_1_9: remove at 1.9.6

This commit is contained in:
Vincent Laporte 2019-04-28 06:35:44 +00:00 committed by Vincent Laporte
parent f38bf3ba4e
commit eff7bc3f33
2 changed files with 5 additions and 24 deletions

View File

@ -1,33 +1,18 @@
{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit { lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit
, re, sexplib0, sexplib, stringext , re, sexplib0, stringext
, legacy ? false
}: }:
let params =
if legacy then rec {
version = "1.9.6";
archive = version;
sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0";
inherit sexplib;
} else rec {
version = "2.2.0";
archive = "v${version}";
sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi";
sexplib = sexplib0;
}
; in
buildDunePackage rec { buildDunePackage rec {
pname = "uri"; pname = "uri";
inherit (params) version; version = "2.2.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${params.archive}.tbz"; url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
inherit (params) sha256; sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi";
}; };
buildInputs = [ ounit ]; buildInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv re params.sexplib stringext ]; propagatedBuildInputs = [ ppx_sexp_conv re sexplib0 stringext ];
doCheck = true; doCheck = true;
meta = { meta = {

View File

@ -738,10 +738,6 @@ let
then callPackage ../development/ocaml-modules/uri { } then callPackage ../development/ocaml-modules/uri { }
else callPackage ../development/ocaml-modules/uri/legacy.nix { }; else callPackage ../development/ocaml-modules/uri/legacy.nix { };
uri_1_9 = callPackage ../development/ocaml-modules/uri {
legacy = true;
};
uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix {
legacyVersion = true; legacyVersion = true;
}; };