From c155e18fdac6b7a032fb63dbea3f11675f21e0ba Mon Sep 17 00:00:00 2001
From: adelaett <90894311+adelaett@users.noreply.github.com>
Date: Mon, 12 Dec 2022 11:55:22 +0100
Subject: [PATCH] unpinning bindlib, cmdliner, re, ppx_yojson_conv

---
 .nix/bindlib.nix         | 28 ----------------------------
 .nix/catala.nix          |  4 ++--
 .nix/packages.nix        | 21 +--------------------
 .nix/ppx_yojson_conv.nix | 20 --------------------
 flake.lock               |  6 +++---
 5 files changed, 6 insertions(+), 73 deletions(-)
 delete mode 100644 .nix/bindlib.nix
 delete mode 100644 .nix/ppx_yojson_conv.nix

diff --git a/.nix/bindlib.nix b/.nix/bindlib.nix
deleted file mode 100644
index 1a3fc7d4..00000000
--- a/.nix/bindlib.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, fetchFromGitHub, buildDunePackage }:
-
-# We need the very last version "bleeding edge" since previous versions don't use dune.
-
-buildDunePackage rec {
-  pname = "bindlib";
-  version = "5.0.1a";
-
-  minimumOCamlVersion = "4.0.8";
-
-  useDune2 = true;
-
-  src = fetchFromGitHub {
-    owner = "rlepigre";
-    repo = "ocaml-${pname}";
-    rev = "317f195d22c75f556053039cd94b52bd0c423709";
-    name = pname;
-    hash = "sha256-uO/Ko9PmQ+wE0d9jfEngd4G014B4nxGgfQyEvB52Pz8=";
-  };
-
-  meta = with lib; {
-    homepage = "https://rlepigre.github.io/ocaml-bindlib/";
-    description =
-      "Bindlib is a library allowing the manipulation of data structures with bound variables";
-    license = licenses.lgpl3;
-    maintainers = [ ];
-  };
-}
diff --git a/.nix/catala.nix b/.nix/catala.nix
index d7a8b96e..51019102 100644
--- a/.nix/catala.nix
+++ b/.nix/catala.nix
@@ -5,7 +5,7 @@
 , bindlib
 , buildDunePackage
 , calendar
-, cmdliner_1_1_0
+, cmdliner
 , cppo
 , dates_calc
 , fetchFromGitHub
@@ -42,7 +42,7 @@ buildDunePackage rec {
     ansiterminal
     benchmark
     bindlib
-    cmdliner_1_1_0
+    cmdliner
     cppo
     dates_calc
     js_of_ocaml
diff --git a/.nix/packages.nix b/.nix/packages.nix
index 9b28fc12..15fdcebe 100644
--- a/.nix/packages.nix
+++ b/.nix/packages.nix
@@ -1,32 +1,13 @@
 { ocamlPackages, fetchurl }:
 
 ocamlPackages.overrideScope' (self: super: {
-  cmdliner_1_1_0 = super.cmdliner.overrideAttrs (o: rec {
-    version = "1.1.0";
-    src = fetchurl {
-      url = "https://erratique.ch/software/${o.pname}/releases/${o.pname }-${version}.tbz";
-      sha256 = "sha256-irWd4HTlJSYuz3HMgi1de2GVL2qus0QjeCe1WdsSs8Q=";
-    };
-  });
-  alcotest = (super.alcotest.override {
-    cmdliner = self.cmdliner_1_1_0;
-  }).overrideAttrs (_: {
+  alcotest = (super.alcotest.override {}).overrideAttrs (_: {
     doCheck = false;
   });
-  # Use a more recent version of `re` than the one packaged in nixpkgs
-  re = super.re.overrideAttrs (o: rec {
-    version = "1.10.4";
-    src = fetchurl {
-      url = "https://github.com/ocaml/ocaml-${o.pname}/releases/download/${version}/${o.pname}-${version}.tbz";
-      sha256 = "sha256-g+s+QwCqmx3HggdJAQ9DYuqDUkdCEwUk14wgzpnKdHw=";
-    };
-  });
   catala = self.callPackage ./catala.nix { };
-  bindlib = self.callPackage ./bindlib.nix { };
   unionfind = self.callPackage ./unionfind.nix { };
   ninja_utils = self.callPackage ./ninja_utils.nix { };
   clerk = self.callPackage ./clerk.nix { };
-  ppx_yojson_conv = self.callPackage ./ppx_yojson_conv.nix { };
   ubase = self.callPackage ./ubase.nix { };
   dates_calc = self.callPackage ./dates_calc.nix { };
 })
diff --git a/.nix/ppx_yojson_conv.nix b/.nix/ppx_yojson_conv.nix
deleted file mode 100644
index 6b5e14b3..00000000
--- a/.nix/ppx_yojson_conv.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, fetchurl, buildDunePackage, ppxlib, ppx_yojson_conv_lib, ppx_js_style }:
-
-buildDunePackage rec {
-  pname = "ppx_yojson_conv";
-  version = "0.14.0";
-
-  minimumOCamlVersion = "4.0.8";
-
-  useDune2 = true;
-
-  propagatedBuildInputs = [
-    ppxlib ppx_yojson_conv_lib ppx_js_style
-  ];
-
-  src = fetchurl
-    {
-      url = "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_yojson_conv-v0.14.0.tar.gz";
-      sha256 = "0ls6vzj7k0wrjliifqczs78anbc8b88as5w7a3wixfcs1gjfsp2w";
-    };
-}
diff --git a/flake.lock b/flake.lock
index 43381179..39744fc7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1668087632,
-        "narHash": "sha256-T/cUx44aYDuLMFfaiVpMdTjL4kpG7bh0VkN6JEM78/E=",
+        "lastModified": 1670751203,
+        "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5f588eb4a958f1a526ed8da02d6ea1bea0047b9f",
+        "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60",
         "type": "github"
       },
       "original": {