From 6fc32fe79b06eda3c1be3023f4e0be4f7bc7e3ae Mon Sep 17 00:00:00 2001
From: Yingchi Long <i@lyc.dev>
Date: Tue, 18 Jun 2024 17:48:57 +0800
Subject: [PATCH] vendor: 2.2.1

---
 default.nix             | 27 ++++++++++++++-------------
 libnixf/default.nix     | 30 +++++++++++++++++-------------
 libnixf/meson.build     |  2 +-
 libnixf/src/meson.build |  2 +-
 libnixt/default.nix     | 25 ++++++++++++++-----------
 libnixt/lib/meson.build |  2 +-
 libnixt/meson.build     |  2 +-
 meson.build             |  2 +-
 nixd/default.nix        | 31 +++++++++++++++++--------------
 nixd/meson.build        |  2 +-
 10 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/default.nix b/default.nix
index b09c8b812..f3f21055c 100644
--- a/default.nix
+++ b/default.nix
@@ -1,20 +1,21 @@
-{ lib
-, stdenv
-, boost182
-, gtest
-, lit
-, llvmPackages
-, meson
-, ninja
-, nix
-, nixpkgs-fmt
-, pkg-config
-, nlohmann_json
+{
+  lib,
+  stdenv,
+  boost182,
+  gtest,
+  lit,
+  llvmPackages,
+  meson,
+  ninja,
+  nix,
+  nixpkgs-fmt,
+  pkg-config,
+  nlohmann_json,
 }:
 
 stdenv.mkDerivation {
   pname = "nixd";
-  version = "2.1.0";
+  version = "2.2.1";
 
   src = ./.;
 
diff --git a/libnixf/default.nix b/libnixf/default.nix
index 35495b4d6..65e339628 100644
--- a/libnixf/default.nix
+++ b/libnixf/default.nix
@@ -1,22 +1,27 @@
-{ lib
-, stdenv
-, meson
-, ninja
-, pkg-config
-, lit
-, nixpkgs-fmt
-, gtest
-, boost182
-, nlohmann_json
+{
+  lib,
+  stdenv,
+  meson,
+  ninja,
+  pkg-config,
+  lit,
+  nixpkgs-fmt,
+  gtest,
+  boost182,
+  nlohmann_json,
 }:
 
 stdenv.mkDerivation {
   pname = "nixf";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = ../.;
 
-  outputs = [ "out" "bin" "dev" ];
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+  ];
 
   mesonBuildType = "release";
 
@@ -41,7 +46,6 @@ stdenv.mkDerivation {
     nlohmann_json
   ];
 
-
   meta = {
     mainProgram = "nixf";
     description = "Nix language frontend, parser & semantic analysis";
diff --git a/libnixf/meson.build b/libnixf/meson.build
index f8a303779..477191925 100644
--- a/libnixf/meson.build
+++ b/libnixf/meson.build
@@ -1,7 +1,7 @@
 project( 'nixf'
        , ['c', 'cpp']
        , default_options : ['cpp_std=gnu++20']
-       , version: '2.2.0'
+       , version: '2.2.1'
        )
 
 nlohmann_json = dependency('nlohmann_json')
diff --git a/libnixf/src/meson.build b/libnixf/src/meson.build
index 4861b5d1f..8f98ac0a9 100644
--- a/libnixf/src/meson.build
+++ b/libnixf/src/meson.build
@@ -26,7 +26,7 @@ libnixf = library(
 
 pkgconfig.generate(
     name: 'nixf',
-    version: '2.2.0',
+    version: '2.2.1',
     description: 'libnixf',
     libraries: libnixf
 )
diff --git a/libnixt/default.nix b/libnixt/default.nix
index 354e80fe7..4ed7ccf6d 100644
--- a/libnixt/default.nix
+++ b/libnixt/default.nix
@@ -1,20 +1,24 @@
-{ lib
-, stdenv
-, meson
-, ninja
-, pkg-config
-, nix
-, gtest
-, boost182
+{
+  lib,
+  stdenv,
+  meson,
+  ninja,
+  pkg-config,
+  nix,
+  gtest,
+  boost182,
 }:
 
 stdenv.mkDerivation {
   pname = "nixt";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = ../.;
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   mesonBuildType = "release";
 
@@ -36,7 +40,6 @@ stdenv.mkDerivation {
 
   env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
 
-
   meta = {
     mainProgram = "nixt";
     description = "Nix language frontend, parser & semantic analysis";
diff --git a/libnixt/lib/meson.build b/libnixt/lib/meson.build
index ae2b795c1..298859b42 100644
--- a/libnixt/lib/meson.build
+++ b/libnixt/lib/meson.build
@@ -15,7 +15,7 @@ libnixt = library('nixt',
 )
 
 pkgconfig.generate(name: 'nixt',
-                   version: '2.2.0',
+                   version: '2.2.1',
                    description: 'nix compatible layer',
                    subdirs: [ 'nixt' ],
                    libraries: libnixt,
diff --git a/libnixt/meson.build b/libnixt/meson.build
index 0fb098969..aa787bb12 100644
--- a/libnixt/meson.build
+++ b/libnixt/meson.build
@@ -1,7 +1,7 @@
 project( 'nixt'
        , ['c', 'cpp']
        , default_options : ['cpp_std=gnu++20']
-       , version: '2.2.0'
+       , version: '2.2.1'
        )
 
 boost = dependency('boost')
diff --git a/meson.build b/meson.build
index 9ef1169dd..4da423af9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project( 'nixd'
        , ['c', 'cpp']
        , default_options : ['cpp_std=gnu++20']
-       , version: '2.1.0'
+       , version: '2.2.1'
        )
 
 config_h = configuration_data()
diff --git a/nixd/default.nix b/nixd/default.nix
index b7195d125..1fe0e5379 100644
--- a/nixd/default.nix
+++ b/nixd/default.nix
@@ -1,14 +1,15 @@
-{ lib
-, stdenv
-, meson
-, ninja
-, pkg-config
-, nix
-, nixf
-, nixt
-, llvmPackages
-, gtest
-, boost182
+{
+  lib,
+  stdenv,
+  meson,
+  ninja,
+  pkg-config,
+  nix,
+  nixf,
+  nixt,
+  llvmPackages,
+  gtest,
+  boost182,
 }:
 
 let
@@ -16,11 +17,14 @@ let
 in
 stdenv.mkDerivation {
   inherit pname;
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = ../.;
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   mesonBuildType = "release";
 
@@ -45,7 +49,6 @@ stdenv.mkDerivation {
 
   env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";
 
-
   meta = {
     mainProgram = "nixd";
     description = "Nix language server";
diff --git a/nixd/meson.build b/nixd/meson.build
index b1f9a84b0..1d118a0ed 100644
--- a/nixd/meson.build
+++ b/nixd/meson.build
@@ -1,7 +1,7 @@
 project( 'nixd'
        , ['c', 'cpp']
        , default_options : ['cpp_std=gnu++20']
-       , version: '2.2.0'
+       , version: '2.2.1'
        )
 
 config_h = configuration_data()