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

Merge pull request #70890 from worldofpeace/pantheon-no-lts-vala

Browse Source 
pantheon: use latest vala
This commit is contained in:
worldofpeace 2019-10-10 15:18:38 +00:00 committed by GitHub
commit dfe338e464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 108 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/audio/vocal/default.nix
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
]; ];

4
pkgs/applications/editors/quilter/default.nix
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

3
pkgs/applications/graphics/fondo/default.nix
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

3
pkgs/applications/graphics/ideogram/default.nix
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

3
pkgs/applications/misc/appeditor/default.nix
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

3
pkgs/applications/misc/cipher/default.nix
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

3
pkgs/applications/misc/formatter/default.nix
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

4
pkgs/applications/misc/notejot/default.nix
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

3
pkgs/applications/misc/regextester/default.nix
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

4
pkgs/applications/misc/sequeler/default.nix
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 ];

4
pkgs/applications/misc/tootle/default.nix
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 = [

3
pkgs/applications/networking/browsers/ephemeral/default.nix
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

4
pkgs/applications/networking/ftp/taxi/default.nix
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

6
pkgs/applications/networking/p2p/torrential/default.nix
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
]; ];

3
pkgs/applications/networking/ping/default.nix
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

3
pkgs/applications/networking/transporter/default.nix
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

4
pkgs/applications/office/aesop/default.nix
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
]; ];

4
pkgs/applications/office/bookworm/default.nix
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
]; ];

19
pkgs/applications/office/notes-up/default.nix
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
]; ];

6
pkgs/applications/office/spice-up/default.nix
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 = [

3
pkgs/applications/office/timetable/default.nix
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
]; ];

3
pkgs/applications/science/math/nasc/default.nix
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
]; ];

6
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, pantheon , pantheon
, fetchpatch
, substituteAll , substituteAll
, meson , meson
, ninja , ninja
@ -55,6 +56,11 @@ stdenv.mkDerivation rec {
src = ./xkb.patch; src = ./xkb.patch;
config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"; config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml";
}) })
# Fix build with latest vala.
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-keyboard/commit/28fa960f607f0b1d67f2864965a079bdfc23e3a8.patch";
sha256 = "0121qcg8n7gkz7gpwrxc1cx0nnypj02zy2jmp3cks5r9sc0yi0hw";
})
]; ];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

9
pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pantheon , pantheon
, meson , meson
, ninja , ninja
@ -54,6 +55,14 @@ stdenv.mkDerivation rec {
webkitgtk webkitgtk
]; ];
patches = [
# Fix build with latest vala
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882f765076d20c6ef4886198a34a05159f8a.patch";
sha256 = "1szryyy7shdmbvx9yhpi0bhzaayg7hl6pq2c456j1qf9kfv0m4hf";
})
];
PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers"; PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";
PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services"; PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services";
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";

9
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pantheon , pantheon
, meson , meson
, ninja , ninja
@ -44,6 +45,14 @@ stdenv.mkDerivation rec {
switchboard switchboard
]; ];
patches = [
# Fix build with latest vala.
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-printers/commit/3175c2ebf106145a95355d2571e0a2aa4834e884.patch";
sha256 = "1b2q48a1284037nz79vjcrz8g2qpsyg7s5rag6bfp03a1ijb7gw3";
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; { meta = with stdenv.lib; {

9
pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pantheon , pantheon
, meson , meson
, ninja , ninja
@ -42,6 +43,14 @@ stdenv.mkDerivation rec {
switchboard switchboard
]; ];
patches = [
# Fix build with latest vala
(fetchpatch {
url = "https://github.com/elementary/switchboard-plug-sharing/commit/22c9d52577a2e8c36c840a99009420266a39e1fe.patch";
sha256 = "0rbf1yxhc7k44cwikd45mv2g6slzw0rkwn5s38q3yxai9jnpvqch";
})
];
PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
meta = with stdenv.lib; { meta = with stdenv.lib; {

5
pkgs/desktops/pantheon/default.nix
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 { };
@ -220,4 +219,8 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { }; elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
### ALIASES
vala = pkgs.vala; # added 2019-10-10
}) })

6
pkgs/desktops/pantheon/granite/default.nix
View File

@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
url = "https://src.fedoraproject.org/rpms/granite/raw/0550b44ed6400c9b1ff7e70871913747df2ff323/f/00-datetime-clock-format-gsettings.patch"; url = "https://src.fedoraproject.org/rpms/granite/raw/0550b44ed6400c9b1ff7e70871913747df2ff323/f/00-datetime-clock-format-gsettings.patch";
sha256 = "0i9yvdmn77x5fjdwd1raw6ym8js8yxa7w6ydc7syx7hcyls00dmq"; sha256 = "0i9yvdmn77x5fjdwd1raw6ym8js8yxa7w6ydc7syx7hcyls00dmq";
}) })
# Fix build latest vala.
(fetchpatch {
url = "https://github.com/elementary/granite/commit/fd26013c84afdeb6300ae2f4a574856753fc2b58.patch";
sha256 = "01nxqhj8gr61n6wx6ccrqdn25nmbrhhk437k21g4mxqx0gnih265";
})
]; ];
passthru = { passthru = {

4
pkgs/tools/misc/hashit/default.nix
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