From 66d220960cb0fedc3674a1e80aa13b599e9a633e Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Mon, 22 Jul 2024 21:17:09 -0700
Subject: [PATCH] prep 3.12.0

---
 CHANGES.md    |  2 +-
 flake.lock    | 14 +++++++-------
 nix/shell.nix | 11 +++--------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a261ed92f..f2dfd5704 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 3.12.0
 
 - Add `\u{hex-escape}` syntax (@anmonteiro,
   [#2738](https://github.com/reasonml/reason/pull/2738))
diff --git a/flake.lock b/flake.lock
index 00fd4078e..f44c0c3ca 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1721519712,
-        "narHash": "sha256-4YoSuU3bB6nSpSjYoCKtheuQl+U0N/Cbu5TRYzf0/vI=",
+        "lastModified": 1721686842,
+        "narHash": "sha256-IJbA2AeIk6l83E20/3utoNY8bORapbtZ3+urCCNglhQ=",
         "owner": "nix-ocaml",
         "repo": "nix-overlays",
-        "rev": "339dcd74db4907db0d75ddcf00dc35fa63531272",
+        "rev": "24fc6eca8fc6d4e0a125bfeea32b07f726d9d7e7",
         "type": "github"
       },
       "original": {
@@ -56,17 +56,17 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1721481798,
-        "narHash": "sha256-GOwbtcTDS7KnVseckF+H8OCRNrwYEqCZ34QOZ+i51e4=",
+        "lastModified": 1721660125,
+        "narHash": "sha256-q2t9tTFk0KrcnfU879WZ4cZJD1OONOq8tZXZXPo6llI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a2aeb0fcca8ef063c03ef57fa5de49084d4e9687",
+        "rev": "09f65ccafc83ce77148375672be19e6746e45db8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a2aeb0fcca8ef063c03ef57fa5de49084d4e9687",
+        "rev": "09f65ccafc83ce77148375672be19e6746e45db8",
         "type": "github"
       }
     },
diff --git a/nix/shell.nix b/nix/shell.nix
index 613f20524..1a45ecba7 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -11,12 +11,7 @@
 
 mkShell {
   inputsFrom = [ reason ];
-  buildInputs = with ocamlPackages; [ utop merlin ] ++ (if release-mode then [
-    cacert
-    curl
-    dune-release
-    git
-  ] else [ ])
-  ;
-
+  buildInputs =
+    with ocamlPackages; [ utop merlin odoc ]
+      ++ (if release-mode then [ cacert curl dune-release git ] else [ ]);
 }