diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2024-04-23 00:14:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-23 00:14:20 -0500 |
commit | 72bc2ea5d1a591c44c4b63f7f96f282508f7eb8f (patch) | |
tree | a44dc8b030b354f2347c58b344c861eac496174c /pkgs | |
parent | 6a456955a262b419a35590c3e56a183f57e65949 (diff) | |
parent | 2eee5fcc2a5f87bd7a75bdac7f4b436613c67bc4 (diff) |
Merge pull request #305285 from marsam/update-nixd
nixd: 1.2.3 -> 2.0.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/language-servers/nixd/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 601a568554be8..becdbd892a03e 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -15,17 +15,18 @@ , nix , nixpkgs-fmt , pkg-config +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nixd"; - version = "1.2.3"; + version = "2.0.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; - rev = version; - hash = "sha256-i/z5VnsWPWloQfdk48i+a4XaGnTMPJ6QougChkT9IWw="; + rev = finalAttrs.version; + hash = "sha256-K6atInl+/58nzMj4JJHds//HY7luBRmX79g+Arj6iUw="; }; mesonBuildType = "release"; @@ -74,19 +75,29 @@ stdenv.mkDerivation rec { # Disable nixd regression tests, because it uses some features provided by # nix, and does not correctly work in the sandbox - meson test --print-errorlogs server regression/nix-ast-dump + meson test --print-errorlogs unit/libnixf/Basic unit/libnixf/Parse unit/libnixt runHook postCheck ''; passthru.updateScript = nix-update-script { }; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "libnixf" "libnixt" ]; + }; + }; + meta = { description = "Nix language server"; homepage = "https://github.com/nix-community/nixd"; - changelog = "https://github.com/nix-community/nixd/releases/tag/${version}"; + changelog = "https://github.com/nix-community/nixd/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth marsam ]; mainProgram = "nixd"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef270e40e08c7..055695e568c9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18069,7 +18069,7 @@ with pkgs; nixd = callPackage ../development/tools/language-servers/nixd { llvmPackages = llvmPackages_16; - nix = nixVersions.nix_2_16; + nix = nixVersions.nix_2_19; }; openscad-lsp = callPackage ../development/tools/language-servers/openscad-lsp { }; |