From eff7bc3f337d50fece03d3d2b009f4278b9166af Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 28 Apr 2019 06:35:44 +0000
Subject: [PATCH] ocamlPackages.uri_1_9: remove at 1.9.6

---
 .../development/ocaml-modules/uri/default.nix | 25 ++++---------------
 pkgs/top-level/ocaml-packages.nix             |  4 ---
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index 0f3578806d8..011acf01839 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -1,33 +1,18 @@
 { lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit
-, re, sexplib0, sexplib, stringext
-, legacy ? false
+, re, sexplib0, stringext
 }:
 
-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 {
   pname = "uri";
-  inherit (params) version;
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-${params.archive}.tbz";
-    inherit (params) sha256;
+    url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
+    sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi";
   };
 
   buildInputs = [ ounit ];
-  propagatedBuildInputs = [ ppx_sexp_conv re params.sexplib stringext ];
+  propagatedBuildInputs = [ ppx_sexp_conv re sexplib0 stringext ];
   doCheck = true;
 
   meta = {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 2d4e34f270f..8886647420c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -738,10 +738,6 @@ let
       then callPackage ../development/ocaml-modules/uri { }
       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 {
       legacyVersion = true;
     };