Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c0d5833156cd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dfe338e464a1
Choose a head ref
  • 8 commits
  • 29 files changed
  • 1 contributor

Commits on Oct 10, 2019

  1. 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.
    @worldofpeace
    worldofpeace committed Oct 10, 2019
    Copy the full SHA
    bdb851e View commit details

  2. pantheon.granite: fix build with latest vala 

    Still waiting for release #69052
    @worldofpeace
    worldofpeace committed Oct 10, 2019
    Copy the full SHA
    21c127f View commit details

  3. pantheon.switchboard-plug-keyboard: fix build

    @worldofpeace
    worldofpeace committed Oct 10, 2019
    Copy the full SHA
    e55bd86 View commit details

  4. pantheon.switchboard-plug-printers: fix build

    @worldofpeace
    worldofpeace committed Oct 10, 2019
    Copy the full SHA
    8b957f8 View commit details

  5. pantheon.switchboard-plug-sharing: fix build

    @worldofpeace
    worldofpeace committed Oct 10, 2019
    Copy the full SHA
    b9b1d9b View commit details

  6. pantheon.switchboard-plug-onlineaccounts: fix build

    @worldofpeace
    worldofpeace committed Oct 10, 2019
    Copy the full SHA
    f4c4087 View commit details

  7. pantheon: add vala alias

    @worldofpeace
    worldofpeace committed Oct 10, 2019
    Copy the full SHA
    feee419 View commit details

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

    pantheon: use latest vala
    @worldofpeace
    worldofpeace authored Oct 10, 2019
    Copy the full SHA
    dfe338e View commit details
Showing with 108 additions and 35 deletions.
  1. +2 −1 pkgs/applications/audio/vocal/default.nix
  2. +2 −2 pkgs/applications/editors/quilter/default.nix
  3. +2 −1 pkgs/applications/graphics/fondo/default.nix
  4. +2 −1 pkgs/applications/graphics/ideogram/default.nix
  5. +2 −1 pkgs/applications/misc/appeditor/default.nix
  6. +2 −1 pkgs/applications/misc/cipher/default.nix
  7. +2 −1 pkgs/applications/misc/formatter/default.nix
  8. +2 −2 pkgs/applications/misc/notejot/default.nix
  9. +2 −1 pkgs/applications/misc/regextester/default.nix
  10. +2 −2 pkgs/applications/misc/sequeler/default.nix
  11. +2 −2 pkgs/applications/misc/tootle/default.nix
  12. +2 −1 pkgs/applications/networking/browsers/ephemeral/default.nix
  13. +2 −2 pkgs/applications/networking/ftp/taxi/default.nix
  14. +4 −2 pkgs/applications/networking/p2p/torrential/default.nix
  15. +2 −1 pkgs/applications/networking/ping/default.nix
  16. +2 −1 pkgs/applications/networking/transporter/default.nix
  17. +2 −2 pkgs/applications/office/aesop/default.nix
  18. +2 −2 pkgs/applications/office/bookworm/default.nix
  19. +17 −2 pkgs/applications/office/notes-up/default.nix
  20. +4 −2 pkgs/applications/office/spice-up/default.nix
  21. +2 −1 pkgs/applications/office/timetable/default.nix
  22. +2 −1 pkgs/applications/science/math/nasc/default.nix
  23. +6 −0 pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
  24. +9 −0 pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
  25. +9 −0 pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
  26. +9 −0 pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
  27. +4 −1 pkgs/desktops/pantheon/default.nix
  28. +6 −0 pkgs/desktops/pantheon/granite/default.nix
  29. +2 −2 pkgs/tools/misc/hashit/default.nix
3 changes: 2 additions & 1 deletion pkgs/applications/audio/vocal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, cmake
, ninja
, vala
, pkgconfig
, pantheon
, gtk3
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
cmake
libxml2
ninja
pantheon.vala
vala
pkgconfig
wrapGAppsHook
];
4 changes: 2 additions & 2 deletions pkgs/applications/editors/quilter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
, libgee, discount, wrapGAppsHook }:

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
desktop-file-utils
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
3 changes: 2 additions & 1 deletion pkgs/applications/graphics/fondo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, fetchpatch
, pantheon
, vala
, pkgconfig
, meson
, ninja
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
3 changes: 2 additions & 1 deletion pkgs/applications/graphics/ideogram/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, vala
, pkgconfig
, python3
, glib
@@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
hicolor-icon-theme # for setup-hook
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
3 changes: 2 additions & 1 deletion pkgs/applications/misc/appeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, vala
, meson
, ninja
, pkgconfig
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
gettext
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
3 changes: 2 additions & 1 deletion pkgs/applications/misc/cipher/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, meson
, ninja
, vala
, pkgconfig
, pantheon
, python3
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
gettext
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
3 changes: 2 additions & 1 deletion pkgs/applications/misc/formatter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, meson
, ninja
, vala
, pkgconfig
, pantheon
, python3
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
4 changes: 2 additions & 2 deletions pkgs/applications/misc/notejot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 }:

stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
3 changes: 2 additions & 1 deletion pkgs/applications/misc/regextester/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, vala
, gettext
, libxml2
, pkgconfig
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
pantheon.vala
vala
gettext
gobject-introspection
libxml2
4 changes: 2 additions & 2 deletions pkgs/applications/misc/sequeler/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ 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 }:


@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
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 ];

4 changes: 2 additions & 2 deletions pkgs/applications/misc/tootle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
, vala, meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
, gnome3, pantheon, gobject-introspection, wrapGAppsHook
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
}:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
ninja
pkgconfig
python3
pantheon.vala
vala
wrapGAppsHook
];
buildInputs = [
3 changes: 2 additions & 1 deletion pkgs/applications/networking/browsers/ephemeral/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, desktop-file-utils
, vala
, gettext
, glib
, gtk3
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
gettext
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
4 changes: 2 additions & 2 deletions pkgs/applications/networking/ftp/taxi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 }:

stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
pantheon.vala
vala
gobject-introspection
meson
ninja
6 changes: 4 additions & 2 deletions pkgs/applications/networking/p2p/torrential/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, cmake
, pkgconfig
, vala
, pantheon
, curl
, glib
@@ -14,7 +15,8 @@
, libunity
, miniupnpc
, openssl
, wrapGAppsHook }:
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
pname = "torrential";
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cmake
pantheon.vala
vala
pkgconfig
wrapGAppsHook
];
3 changes: 2 additions & 1 deletion pkgs/applications/networking/ping/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, meson
, ninja
, vala
, pkgconfig
, pantheon
, python3
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
pantheon.vala
vala
pkgconfig
python3
wrapGAppsHook
3 changes: 2 additions & 1 deletion pkgs/applications/networking/transporter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, meson
, ninja
, vala
, pkgconfig
, gtk3
, python3
@@ -31,7 +32,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
appstream-glib
desktop-file-utils
pantheon.vala
vala
gettext
gobject-introspection # For setup hook
libxml2
4 changes: 2 additions & 2 deletions pkgs/applications/office/aesop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 }:

stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
python3
pantheon.vala
vala
wrapGAppsHook
];

4 changes: 2 additions & 2 deletions pkgs/applications/office/bookworm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 }:

stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
python3
pantheon.vala
vala
wrapGAppsHook
];

19 changes: 17 additions & 2 deletions pkgs/applications/office/notes-up/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 }:

stdenv.mkDerivation rec {
@@ -15,7 +30,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
ninja
pantheon.vala
vala
pkgconfig
wrapGAppsHook
];
6 changes: 4 additions & 2 deletions pkgs/applications/office/spice-up/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, cmake
, gdk-pixbuf
, gtk3
, vala
, gettext
, ninja
, pantheon
@@ -12,7 +13,8 @@
, libevdev
, libgee
, libsoup
, wrapGAppsHook }:
, wrapGAppsHook
}:

stdenv.mkDerivation rec {
pname = "spice-up";
@@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
gettext
ninja
pkgconfig
pantheon.vala
vala
wrapGAppsHook
];
buildInputs = [
3 changes: 2 additions & 1 deletion pkgs/applications/office/timetable/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, fetchFromGitHub
, glib
, gtk3
, vala
, hicolor-icon-theme
, json-glib
, libgee
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkgconfig
pantheon.vala
vala
python3
wrapGAppsHook
];
3 changes: 2 additions & 1 deletion pkgs/applications/science/math/nasc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, pkgconfig
, vala
, gtk3
, glib
, pantheon
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
cmake
pantheon.vala
vala
pkgconfig
wrapGAppsHook
];
Loading