From 3a04ea47b74b0c5fbc8b9233666b2cb1fec44901 Mon Sep 17 00:00:00 2001
From: Felix Andreas <felix.andreas95@googlemail.com>
Date: Wed, 4 Nov 2020 00:28:51 +0100
Subject: [PATCH 1/2] maintainers: add andreasfelix
---
maintainers/maintainer-list.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bacd3dab9aa..6a5582d2c92 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -514,6 +514,12 @@
githubId = 69135;
name = "Andrea Bedini";
};
+ andreasfelix = {
+ email = "fandreas@physik.hu-berlin.de";
+ github = "andreasfelix";
+ githubId = 24651767;
+ name = "Felix Andreas";
+ };
andres = {
email = "ksnixos@andres-loeh.de";
github = "kosmikus";
From 49280e8bb8b874355a1245e36b9276b6573a60af Mon Sep 17 00:00:00 2001
From: Felix Andreas <felix.andreas95@googlemail.com>
Date: Mon, 9 Nov 2020 03:44:08 +0100
Subject: [PATCH 2/2] vala-language-server: init at 0.48.1
---
.../tools/vala-language-server/default.nix | 59 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 61 insertions(+)
create mode 100644 pkgs/development/tools/vala-language-server/default.nix
diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix
new file mode 100644
index 00000000000..f26615e26b7
--- /dev/null
+++ b/pkgs/development/tools/vala-language-server/default.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, fetchFromGitHub
+, nix-update-script
+, meson
+, ninja
+, pkg-config
+, scdoc
+, gnome-builder
+, gnused
+, glib
+, libgee
+, json-glib
+, jsonrpc-glib
+, vala
+}:
+
+stdenv.mkDerivation rec {
+ pname = "vala-language-server";
+ version = "0.48.1";
+
+ src = fetchFromGitHub {
+ owner = "benwaffle";
+ repo = pname;
+ rev = version;
+ sha256 = "12k095052jkvbiyz8gzkj6w7r7p16d5m18fyikl48yvh5nln8fw0";
+ };
+
+ passthru = {
+ updateScript = nix-update-script {
+ attrPath = pname;
+ };
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ scdoc
+ # GNOME Builder Plugin
+ gnused
+ gnome-builder
+ ];
+
+ buildInputs = [
+ glib
+ libgee
+ json-glib
+ jsonrpc-glib
+ vala
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Code Intelligence for Vala & Genie";
+ homepage = "https://github.com/benwaffle/vala-language-server";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ andreasfelix worldofpeace ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 006a9dbe765..cee7f463ba7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11899,6 +11899,8 @@ in
vagrant = callPackage ../development/tools/vagrant {};
+ vala-language-server = callPackage ../development/tools/vala-language-server {};
+
bashdb = callPackage ../development/tools/misc/bashdb { };
gdb = callPackage ../development/tools/misc/gdb {