Merge pull request #84916 from worldofpeace/pantheon-update-04-10

Pantheon update 2020-04-10
2020-04-10 14:17:48 -04:00
parent 168a045e25 dd805599a9
commit 0e27a1f2b4
15 changed files with 30 additions and 81 deletions
@@ -1,24 +0,0 @@
-diff --git a/lib/synapse-plugins/calculator-plugin.vala b/lib/synapse-plugins/calculator-plugin.vala
-index 1b5fa06..076c0c7 100644
--- a/lib/synapse-plugins/calculator-plugin.vala
-+++ b/lib/synapse-plugins/calculator-plugin.vala
-@@ -51,9 +51,7 @@ namespace Synapse {
-                                                                     _("Calculator"),
-                                                                     _("Calculate basic expressions."),
-                                                                     "accessories-calculator",
-                                                                    register_plugin,
-                                                                    Environment.find_program_in_path ("bc") != null,
-                                                                    _("bc is not installed"));
-+                                                                    register_plugin);
-         }
- 
-         static construct {
-@@ -90,7 +88,7 @@ namespace Synapse {
-             if (matched) {
-                 Pid pid;
-                 int read_fd, write_fd;
-                string[] argv = {"bc", "-l"};
-+                string[] argv = {"@exec@", "-l"};
-                 string? solution = null;
- 
-                 try {
@@ -26,7 +26,7 @@

 stdenv.mkDerivation rec {
  pname = "wingpanel-applications-menu";
-  version = "2.5.0";
+  version = "2.6.0";

  repoName = "applications-menu";

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    owner = "elementary";
    repo = repoName;
    rev = version;
-    sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d";
+    sha256 = "16ki1x6697jmfqajynx2zvwqrpjpshnd08y7vf6g7xc7zwwh38c5";
  };

  passthru = {
@@ -7,6 +7,7 @@
 , ninja
 , vala
 , gtk3
+, glib
 , granite
 , libnotify
 , wingpanel
@@ -16,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "wingpanel-indicator-bluetooth";
-  version = "2.1.4";
+  version = "2.1.5";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1";
+    sha256 = "0ylbpai05b300h07b94xcmw9xi7qx13l1q38zlg2n95d3c5264dp";
  };

  passthru = {
@@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [
+    glib # for glib-compile-schemas
    libxml2
    meson
    ninja
@@ -41,6 +43,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
+    glib
    granite
    gtk3
    libgee