From 3930092ac1cc04b7f3c62c71956592cf158ef8bb Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 25 Feb 2024 14:07:27 -0800 Subject: [PATCH] prep 3.11 release (#2735) --- CHANGES.md | 2 +- flake.lock | 26 +++++++++++++------------- nix/shell.nix | 8 ++------ 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 19e49c883..d66d84a4a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -## Unreleased +## 3.11.0 - Print structure items extension nodes correctly inside modules (@anmonteiro, [#2723](https://github.com/reasonml/reason/pull/2723)) diff --git a/flake.lock b/flake.lock index 1f84b9ff7..ff9502fa0 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1694857738, - "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", "owner": "numtide", "repo": "nix-filter", - "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1696357929, - "narHash": "sha256-FJ8SgB4rgAXD1qjplpWAr14mudSSnOrShjbuhC9w2M0=", + "lastModified": 1708894150, + "narHash": "sha256-amV4DC5QFAT+e3JaixEz8bHtMPkGJhzvyGPXzWF4hCM=", "owner": "nix-ocaml", "repo": "nix-overlays", - "rev": "6fe39115c01d42e452f837ed38ae7a244a78f699", + "rev": "d13d05740e729e02dc5da17814caac57387fb3af", "type": "github" }, "original": { @@ -56,17 +56,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696303624, - "narHash": "sha256-mL5k0klTRO3/59HCI8U1QujzGsnyL0GtQI+5XABXDNA=", + "lastModified": 1708494689, + "narHash": "sha256-7AVzwWeIC2rG6CdqRbbu3ON8EP5of6q5fGyg8MvbXmg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d29250d5b55fe14280906afad7afacd910850b8", + "rev": "79597053bebcbccd1991157c3292c3705307220c", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d29250d5b55fe14280906afad7afacd910850b8", + "rev": "79597053bebcbccd1991157c3292c3705307220c", "type": "github" } }, diff --git a/nix/shell.nix b/nix/shell.nix index 0bb704648..613f20524 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -11,14 +11,10 @@ mkShell { inputsFrom = [ reason ]; - buildInputs = with ocamlPackages; [ - utop - merlin - ] - ++ (if release-mode then [ + buildInputs = with ocamlPackages; [ utop merlin ] ++ (if release-mode then [ cacert curl - ocamlPackages.dune-release + dune-release git ] else [ ]) ;