Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD

Conflicts:
	nixpkgs/pkgs/servers/pr-tracker/default.nix

1 files changed, 39 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix b/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix
new file mode 100644
index 000000000000..19dcf84116dc
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/as/asm-lsp/package.nix
@@ -0,0 +1,39 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+}:
+let
+  pname = "asm-lsp";
+  version = "0.4.2";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "bergercookie";
+    repo = "asm-lsp";
+    rev = "v${version}";
+    hash = "sha256-EGgYOU6y23ULjnMGNjYhgF0JMPgvRuQ4UOWqwJxhBpU=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  cargoHash = "sha256-x8Cj39Wki+pdoNIO8QPGK29KFJrHtDMoZJIXFEldno0=";
+
+  meta = {
+    description = "Language server for NASM/GAS/GO Assembly";
+    homepage = "https://github.com/bergercookie/asm-lsp";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ NotAShelf ];
+    mainProgram = pname;
+    platforms = lib.platforms.linux;
+  };
+}