From 11b67ac1c3671798739ff1816f7390270c4a5c92 Mon Sep 17 00:00:00 2001
From: fendor <fendor@posteo.de>
Date: Fri, 1 Aug 2025 18:43:15 +0200
Subject: [PATCH] Prepare release 2.6.1

---
 Changelog.md |  9 +++++++++
 package.json | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 22c61b5d..db24c1d5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,14 @@
 # Changelog for vscode-haskell
 
+## 2.6.1
+
+- Prefer the `set` version for `cabal` and `stack` if there is any
+  ([#1275](https://github.com/haskell/vscode-haskell/pull/1275))  by @fendor
+- Make js debugger work
+  ([#1258](https://github.com/haskell/vscode-haskell/pull/1258))  by @dyniec
+- Prepare release 2.6.0
+  ([#1103](https://github.com/haskell/vscode-haskell/pull/1103))  by @fendor
+
 ## 2.6.0
 
 - Add option to enable/disable `.cabal` file support
diff --git a/package.json b/package.json
index 6f6bf7aa..d8e0cf08 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "haskell",
   "displayName": "Haskell",
   "description": "Haskell language support powered by the Haskell Language Server",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "license": "MIT",
   "publisher": "haskell",
   "engines": {
@@ -334,6 +334,18 @@
           "scope": "resource",
           "type": "boolean"
         },
+        "haskell.plugin.eval.codeActionsOn": {
+          "default": true,
+          "description": "Enables eval code actions",
+          "scope": "resource",
+          "type": "boolean"
+        },
+        "haskell.plugin.eval.codeLensOn": {
+          "default": true,
+          "description": "Enables eval code lenses",
+          "scope": "resource",
+          "type": "boolean"
+        },
         "haskell.plugin.eval.config.diff": {
           "default": true,
           "markdownDescription": "Enable the diff output (WAS/NOW) of eval lenses",
@@ -346,12 +358,6 @@
           "scope": "resource",
           "type": "boolean"
         },
-        "haskell.plugin.eval.globalOn": {
-          "default": true,
-          "description": "Enables eval plugin",
-          "scope": "resource",
-          "type": "boolean"
-        },
         "haskell.plugin.explicit-fields.codeActionsOn": {
           "default": true,
           "description": "Enables explicit-fields code actions",