From 3c9ee9da53173b27d3f2d8bdc6e83aedf9278476 Mon Sep 17 00:00:00 2001 From: Myzel394 Date: Thu, 29 May 2025 18:02:17 +0200 Subject: [PATCH] fix(server): Update version; Small fixes Signed-off-by: Myzel394 --- flake.lock | 12 ++++++------ flake.nix | 12 ++++++------ server/root-handler/common.go | 2 +- vs-code-extension/package.json | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 35d34f1..ec4995b 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1745875161, - "narHash": "sha256-0YkWCS13jpoo3+sX/3kcgdxBNt1VZTmvF+FhZb4rFKI=", + "lastModified": 1742209644, + "narHash": "sha256-jMy1XqXqD0/tJprEbUmKilTkvbDY/C0ZGSsJJH4TNCE=", "owner": "tweag", "repo": "gomod2nix", - "rev": "2cbd7fdd6eeab65c494cc426e18f4e4d2a5e35c0", + "rev": "8f3534eb8f6c5c3fce799376dc3b91bae6b11884", "type": "github" }, "original": { @@ -41,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a0158d2..8b05f9a 100644 --- a/flake.nix +++ b/flake.nix @@ -23,26 +23,26 @@ "aarch64-windows" ] (system: let - version = "0.2.1"; # CI:CD-VERSION + version = "0.2.2"; # CI:CD-VERSION pkgs = import nixpkgs { inherit system; overlays = [ (final: prev: { - go = prev.go_1_24; - buildGoModule = prev.buildGo124Module; + go = prev.go_1_22; + buildGoModule = prev.buildGo122Module; }) gomod2nix.overlays.default ]; }; inputs = [ - pkgs.go_1_24 + pkgs.go_1_22 ]; serverUncompressed = pkgs.buildGoModule { nativeBuildInputs = inputs; pname = "github.com/Myzel394/config-lsp"; version = version; src = ./server; - vendorHash = "sha256-ttr45N8i86mSJX9Scy/Cf+YlxU5wAKMVb0YhKg28JKM="; + vendorHash = "sha256-kfWB99unxBmDVseOt9LmFBVSE3DBS5969M5oZJMlAAQ="; ldflags = [ "-s" "-w" ]; checkPhase = '' go test -v $(pwd)/... @@ -133,7 +133,7 @@ }; devShells.default = let - version = "0.18.1"; + version = "0.16.2"; ourGopls = pkgs.buildGoModule { pname = "gopls"; inherit version; diff --git a/server/root-handler/common.go b/server/root-handler/common.go index a6fea7a..f2841df 100644 --- a/server/root-handler/common.go +++ b/server/root-handler/common.go @@ -2,4 +2,4 @@ package roothandler // The comment below at the end of the line is required for the CI:CD to work. // Do not remove it -var Version = "0.2.1" // CI:CD-VERSION +var Version = "0.2.2" // CI:CD-VERSION diff --git a/vs-code-extension/package.json b/vs-code-extension/package.json index 1cf4393..b45df48 100644 --- a/vs-code-extension/package.json +++ b/vs-code-extension/package.json @@ -2,7 +2,7 @@ "name": "config-lsp", "description": "Language Features (completions, diagnostics, etc.) for your config files: gitconfig, fstab, aliases, hosts, wireguard, ssh_config, sshd_config, and more to come!", "author": "Myzel394", - "version": "0.2.1", + "version": "0.2.2", "repository": { "type": "git", "url": "https://github.com/Myzel394/config-lsp"