[bug#41639] [PATCH 0/3] Adds vala-language-server and updates vala

[bug#41639] [PATCH 0/3] Adds vala-language-server and updates vala

[Ryan Prior via Guix-patches via]

The vala-language-server package just got its first production release, so
here's a Guix package! It requires a newer version of Vala than what we have,
so I include an up-to-date package in this patch series. I split vala into
vala-0.46 (with alias vala) and vala-0.48 which is required by the language
server. Hopefully we can update the vala package to point to 0.48 during the
next major core update cycle.


Ryan Prior (3):
  gnu: vala-0.46: Create alias for vala.
  gnu: Add vala-0.48
  gnu: Add vala-language-server.

 gnu/packages/gnome-xyz.scm | 30 ++++++++++++++++++++++++++++++
 gnu/packages/gnome.scm     | 16 +++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

-- 
2.26.2

[bug#41639] [PATCH 1/3] gnu: vala-0.46: Create alias for vala.

[Ryan Prior via Guix-patches via]

* gnu/packages/gnome.scm (vala-0.46): New symbol.

The vala package is now an alias for vala-0.46.
---
 gnu/packages/gnome.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index da69f1bdeb..fcc83e8e06 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3262,7 +3262,7 @@ engineering.")
 passwords in the GNOME keyring.")
     (license license:gpl2+)))
 
-(define-public vala
+(define-public vala-0.46
   (package
     (name "vala")
     (version "0.46.5")
@@ -3307,6 +3307,8 @@ requirements and without using a different ABI compared to applications and
 libraries written in C.")
     (license license:lgpl2.1+)))
 
+(define-public vala vala-0.46)
+
 (define-public vte
   (package
     (name "vte")
-- 
2.26.2

[bug#41639] [PATCH 2/3] gnu: Add vala-0.48

[Ryan Prior via Guix-patches via]

* gnu/packages/gnome.scm (vala-0.48): New variable.
---
 gnu/packages/gnome.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fcc83e8e06..ff9dad4d64 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3307,6 +3307,18 @@ requirements and without using a different ABI compared to applications and
 libraries written in C.")
     (license license:lgpl2.1+)))
 
+(define-public vala-0.48
+  (package/inherit vala-0.46
+    (version "0.48.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/vala/"
+                                  (version-major+minor version) "/"
+                                  "vala-" version ".tar.xz"))
+              (sha256
+               (base32
+                "01wppzgacdmp8dgf8047myz1any2yffmrhgl8kqf1q0c0gnhi3fi"))))))
+
 (define-public vala vala-0.46)
 
 (define-public vte
-- 
2.26.2

[bug#41639] [PATCH 3/3] gnu: Add vala-language-server.

[Ryan Prior via Guix-patches via]

* gnu/packages/gnome-xyz.scm (vala-language-server): New variable.
---
 gnu/packages/gnome-xyz.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 83e37f97b0..3c63829e99 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -585,3 +585,33 @@ dark elements.  It supports GNOME, Unity, Xfce, and Openbox.")
       (description "Papirus is a fork of the icon theme Paper with a lot of new icons
 and a few extra features.")
       (license license:gpl3))))
+
+(define-public vala-language-server
+  (package
+    (name "vala-language-server")
+    (version "0.48")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/benwaffle/vala-language-server.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "0chgfpci247skrvsiq1l8cas8sj2z6z42dlarka3df3qwxmh0if0"))))
+    (build-system meson-build-system)
+    (arguments '(#:glib-or-gtk? #t))
+    (inputs
+     `(("jsonrpc-glib" ,jsonrpc-glib)
+       ("libgee" ,libgee)
+       ("json-glib" ,json-glib)))
+    (native-inputs
+     `(("glib" ,glib)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala-0.48)))
+    (home-page "https://github.com/benwaffle/vala-language-server")
+    (synopsis "Language server for Vala")
+    (description "The Vala language server is an implementation of the Vala
+language specification for the Language Server Protocol (LSP).  This tool is
+used in text editing environments to provide a complete and integrated
+feature-set for programming Vala effectively.")
+    (license license:lgpl2.1+)))
-- 
2.26.2

[bug#41639] [PATCH 0/3] Adds vala-language-server and updates vala

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

On Mon, Jun 01, 2020 at 05:56:59AM +0000, Ryan Prior via Guix-patches via wrote:
> The vala-language-server package just got its first production release, so
> here's a Guix package! It requires a newer version of Vala than what we have,
> so I include an up-to-date package in this patch series. I split vala into
> vala-0.46 (with alias vala) and vala-0.48 which is required by the language
> server. Hopefully we can update the vala package to point to 0.48 during the
> next major core update cycle.
> 
> 
> Ryan Prior (3):
>   gnu: vala-0.46: Create alias for vala.
>   gnu: Add vala-0.48
>   gnu: Add vala-language-server.
> 
>  gnu/packages/gnome-xyz.scm | 30 ++++++++++++++++++++++++++++++
>  gnu/packages/gnome.scm     | 16 +++++++++++++++-
>  2 files changed, 45 insertions(+), 1 deletion(-)

Does the vala-language-server need to be the same version as the vala
version it is built with?  If so then you should add a note either with
vala or the language server noting which package it should be paired
with.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#41639] [PATCH 0/1] Added note to vala-language-server package

[Ryan Prior via Guix-patches via]

Hi Efraim, thanks for the question. I did the research and added a relevant
note. What do you think?

Ryan Prior (1):
  gnu: Add vala-language-server.

 gnu/packages/gnome-xyz.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

-- 
2.26.2

[bug#41639] [PATCH 1/1] gnu: Add vala-language-server.

[Ryan Prior via Guix-patches via]

* gnu/packages/gnome-xyz.scm (vala-language-server): New variable.
---
 gnu/packages/gnome-xyz.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 83e37f97b0..03621b8ccf 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -585,3 +585,36 @@ dark elements.  It supports GNOME, Unity, Xfce, and Openbox.")
       (description "Papirus is a fork of the icon theme Paper with a lot of new icons
 and a few extra features.")
       (license license:gpl3))))
+
+(define-public vala-language-server
+  (package
+    (name "vala-language-server")
+    ;; Note to maintainer: VLS must be built with a Vala toolchain the same
+    ;; version or newer. Therefore when you update this package you may need
+    ;; to update Vala too.
+    (version "0.48")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/benwaffle/vala-language-server.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "0chgfpci247skrvsiq1l8cas8sj2z6z42dlarka3df3qwxmh0if0"))))
+    (build-system meson-build-system)
+    (arguments '(#:glib-or-gtk? #t))
+    (inputs
+     `(("jsonrpc-glib" ,jsonrpc-glib)
+       ("libgee" ,libgee)
+       ("json-glib" ,json-glib)))
+    (native-inputs
+     `(("glib" ,glib)
+       ("pkg-config" ,pkg-config)
+       ("vala" ,vala-0.48)))
+    (home-page "https://github.com/benwaffle/vala-language-server")
+    (synopsis "Language server for Vala")
+    (description "The Vala language server is an implementation of the Vala
+language specification for the Language Server Protocol (LSP).  This tool is
+used in text editing environments to provide a complete and integrated
+feature-set for programming Vala effectively.")
+    (license license:lgpl2.1+)))
-- 
2.26.2

bug#41639: [PATCH 1/1] gnu: Add vala-language-server.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2656 bytes --]

Patch 2 and 3 pushed. I'm not convinced (yet!) about renaming vala to
vala-0.46 and making a vala -> vala-0.46 renaming package.

On Wed, Jun 03, 2020 at 03:06:35AM +0000, Ryan Prior via Guix-patches via wrote:
> * gnu/packages/gnome-xyz.scm (vala-language-server): New variable.
> ---
>  gnu/packages/gnome-xyz.scm | 33 +++++++++++++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
> 
> diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
> index 83e37f97b0..03621b8ccf 100644
> --- a/gnu/packages/gnome-xyz.scm
> +++ b/gnu/packages/gnome-xyz.scm
> @@ -585,3 +585,36 @@ dark elements.  It supports GNOME, Unity, Xfce, and Openbox.")
>        (description "Papirus is a fork of the icon theme Paper with a lot of new icons
>  and a few extra features.")
>        (license license:gpl3))))
> +
> +(define-public vala-language-server
> +  (package
> +    (name "vala-language-server")
> +    ;; Note to maintainer: VLS must be built with a Vala toolchain the same
> +    ;; version or newer. Therefore when you update this package you may need
> +    ;; to update Vala too.
> +    (version "0.48")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/benwaffle/vala-language-server.git")
> +                    (commit version)))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32 "0chgfpci247skrvsiq1l8cas8sj2z6z42dlarka3df3qwxmh0if0"))))
> +    (build-system meson-build-system)
> +    (arguments '(#:glib-or-gtk? #t))
> +    (inputs
> +     `(("jsonrpc-glib" ,jsonrpc-glib)
> +       ("libgee" ,libgee)
> +       ("json-glib" ,json-glib)))
> +    (native-inputs
> +     `(("glib" ,glib)
> +       ("pkg-config" ,pkg-config)
> +       ("vala" ,vala-0.48)))

vala-language-server keeps a reference to glib and vala so I moved them
to inputs.

> +    (home-page "https://github.com/benwaffle/vala-language-server")
> +    (synopsis "Language server for Vala")
> +    (description "The Vala language server is an implementation of the Vala
> +language specification for the Language Server Protocol (LSP).  This tool is
> +used in text editing environments to provide a complete and integrated
> +feature-set for programming Vala effectively.")
> +    (license license:lgpl2.1+)))
> -- 
> 2.26.2
> 
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]