pantheon: use latest vala

elementary OS's ecosystem is curated around Ubuntu's LTS releases.
This means the development platform for their curated applications
always includes a LTS version of vala (in 18.04 it's 0.40).
Because of how vala development works it suspect some of these
applications to have serious issues if complied with the latest vala.
However in the past year or so, for Pantheon at least, I don't think
their applications will have much issues with latest vala, and if there
is I don't think they'd be difficult to fix. In this single regard they've
become more responsive since their preferred language is vala.

As for the curated applications I have less of this confidence in.
So I'd have to be accept less applications, but that's something
I'm willing to compromise on. And this is easily reversible or
could be done on a per-application basis. And nix already makes
this trivial.
This commit is contained in:
worldofpeace 2019-10-09 22:47:37 -04:00
parent a7b3728c64
commit bdb851ee2d
24 changed files with 65 additions and 35 deletions

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, ninja , ninja
, vala
, pkgconfig , pkgconfig
, pantheon , pantheon
, gtk3 , gtk3
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
cmake cmake
libxml2 libxml2
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
]; ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3 { stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, vala
, gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon , gtk3, desktop-file-utils, gtksourceview, webkitgtk, gtkspell3, pantheon
, libgee, discount, wrapGAppsHook }: , libgee, discount, wrapGAppsHook }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
desktop-file-utils desktop-file-utils
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, pantheon , pantheon
, vala
, pkgconfig , pkgconfig
, meson , meson
, ninja , ninja
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, vala
, pkgconfig , pkgconfig
, python3 , python3
, glib , glib
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
hicolor-icon-theme # for setup-hook hicolor-icon-theme # for setup-hook
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, vala
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
gettext gettext
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, meson , meson
, ninja , ninja
, vala
, pkgconfig , pkgconfig
, pantheon , pantheon
, python3 , python3
@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
gettext gettext
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, meson , meson
, ninja , ninja
, vala
, pkgconfig , pkgconfig
, pantheon , pantheon
, python3 , python3
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, meson, ninja, python3, pantheon { stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, pantheon
, gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, vala
, gettext , gettext
, libxml2 , libxml2
, pkgconfig , pkgconfig
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pantheon.vala vala
gettext gettext
gobject-introspection gobject-introspection
libxml2 libxml2

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils
, gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }:
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
sha256 = "16vc3v9qls9fxg9h8fsi67z68s4acl5hj14gbcrnqm7mf3kmk3aw"; sha256 = "16vc3v9qls9fxg9h8fsi67z68s4acl5hj14gbcrnqm7mf3kmk3aw";
}; };
nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ]; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ];
buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas , vala, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
, gnome3, pantheon, gobject-introspection, wrapGAppsHook , gnome3, pantheon, gobject-introspection, wrapGAppsHook
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme , gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
}: }:
@ -23,7 +23,7 @@ in stdenv.mkDerivation {
ninja ninja
pkgconfig pkgconfig
python3 python3
pantheon.vala vala
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [

View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, desktop-file-utils , desktop-file-utils
, vala
, gettext , gettext
, glib , glib
, gtk3 , gtk3
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
gettext gettext
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, vala
, gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pantheon.vala vala
gobject-introspection gobject-introspection
meson meson
ninja ninja

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, pkgconfig , pkgconfig
, vala
, pantheon , pantheon
, curl , curl
, glib , glib
@ -14,7 +15,8 @@
, libunity , libunity
, miniupnpc , miniupnpc
, openssl , openssl
, wrapGAppsHook }: , wrapGAppsHook
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "torrential"; pname = "torrential";
@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pantheon.vala vala
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
]; ];

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, meson , meson
, ninja , ninja
, vala
, pkgconfig , pkgconfig
, pantheon , pantheon
, python3 , python3
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, meson , meson
, ninja , ninja
, vala
, pkgconfig , pkgconfig
, gtk3 , gtk3
, python3 , python3
@ -31,7 +32,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ nativeBuildInputs = [
appstream-glib appstream-glib
desktop-file-utils desktop-file-utils
pantheon.vala vala
gettext gettext
gobject-introspection # For setup hook gobject-introspection # For setup hook
libxml2 libxml2

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3 { stdenv, vala, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3
, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook }: , desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
ninja ninja
pkgconfig pkgconfig
python3 python3
pantheon.vala vala
wrapGAppsHook wrapGAppsHook
]; ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pantheon, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk { stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }: , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
ninja ninja
pkgconfig pkgconfig
python3 python3
pantheon.vala vala
wrapGAppsHook wrapGAppsHook
]; ];

View File

@ -1,4 +1,19 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, cmake, ninja, gtk3, gtksourceview3, webkitgtk, gtkspell3, glib, libgee, sqlite, discount, wrapGAppsHook { stdenv
, fetchFromGitHub
, pantheon
, pkgconfig
, vala
, cmake
, ninja
, gtk3
, gtksourceview3
, webkitgtk
, gtkspell3
, glib
, libgee
, sqlite
, discount
, wrapGAppsHook
, withPantheon ? false }: , withPantheon ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
]; ];

View File

@ -3,6 +3,7 @@
, cmake , cmake
, gdk-pixbuf , gdk-pixbuf
, gtk3 , gtk3
, vala
, gettext , gettext
, ninja , ninja
, pantheon , pantheon
@ -12,7 +13,8 @@
, libevdev , libevdev
, libgee , libgee
, libsoup , libsoup
, wrapGAppsHook }: , wrapGAppsHook
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spice-up"; pname = "spice-up";
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
gettext gettext
ninja ninja
pkgconfig pkgconfig
pantheon.vala vala
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [

View File

@ -2,6 +2,7 @@
, fetchFromGitHub , fetchFromGitHub
, glib , glib
, gtk3 , gtk3
, vala
, hicolor-icon-theme , hicolor-icon-theme
, json-glib , json-glib
, libgee , libgee
@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkgconfig pkgconfig
pantheon.vala vala
python3 python3
wrapGAppsHook wrapGAppsHook
]; ];

View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, pkgconfig , pkgconfig
, vala
, gtk3 , gtk3
, glib , glib
, pantheon , pantheon
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pantheon.vala vala
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
]; ];

View File

@ -59,7 +59,6 @@ lib.makeScope pkgs.newScope (self: with self; {
maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ];
mutter = pkgs.gnome3.mutter328; mutter = pkgs.gnome3.mutter328;
vala = pkgs.vala_0_40;
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hashit"; pname = "hashit";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
desktop-file-utils desktop-file-utils
meson meson
ninja ninja
pantheon.vala vala
pkgconfig pkgconfig
python3 python3
wrapGAppsHook wrapGAppsHook