colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #305285 from marsam/update-nixd 

nixd: 1.2.3 -> 2.0.2
This commit is contained in:
Mario Rodas 2024-04-23 00:14:20 -05:00 committed by GitHub
parent 6a456955a2 2eee5fcc2a
commit 72bc2ea5d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/tools/language-servers/nixd/default.nix
View File

@ -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;
};
}
})

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };