pantheon.wingpanel-applications-menu: 2.11.1 -> 8.0.0

https://github.com/elementary/applications-menu/compare/2.11.1...8.0.0

pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix

@@ -1,12 +1,10 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , substituteAll
 , meson
 , ninja
-, python3
 , pkg-config
 , vala
 , granite
@@ -14,8 +12,6 @@
 , gettext
 , gtk3
 , json-glib
-, elementary-dock
-, bamf
 , switchboard-with-plugs
 , libsoup_2_4
 , wingpanel
@@ -26,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-applications-menu";
-  version = "2.11.1";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "applications-menu";
     rev = version;
-    sha256 = "sha256-WlRrEkX0DGIHYWvUc9G4BbvofzWJwqkiJaJFwQ43GPE=";
+    sha256 = "sha256-HA82CcVC2+hJFksOuZ8pFmw7phpkCEjPCgE/5naaPcg=";
   };
 
   patches = [
@@ -40,14 +36,6 @@ stdenv.mkDerivation rec {
       src = ./fix-paths.patch;
       bc = "${bc}/bin/bc";
     })
-
-    # Build against switchboard-3
-    # https://github.com/elementary/applications-menu/pull/580
-    (fetchpatch {
-      url = "https://github.com/elementary/applications-menu/commit/9191ee5a2ee33477515d331b96945d51a13074a9.patch";
-      excludes = [ ".github/workflows/githubci.yml" ];
-      hash = "sha256-/LOIEOg9fVfKv/BWFsP1VyuUOIFYem9Gk+3e49M2b9E=";
-    })
   ];
 
   nativeBuildInputs = [
@@ -55,13 +43,10 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    python3
     vala
   ];
 
   buildInputs = [
-    bamf
-    elementary-dock
     granite
     gtk3
     json-glib
@@ -83,11 +68,6 @@ stdenv.mkDerivation rec {
     "--sysconfdir=${placeholder "out"}/etc"
   ];
 
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
   doCheck = true;
 
   passthru = {

pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch

@@ -1,42 +1,40 @@
 diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
-index 542e7aa..228c6d7 100644
+index 84454146..fb082fe4 100644
 --- a/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
 +++ b/src/synapse-plugins/calculator-plugin/calculator-plugin-backend.vala
-@@ -83,7 +83,7 @@ namespace Synapse {
-                 Pid pid;
-                 int read_fd, write_fd;
-                 /* Must include math library to get non-integer results and to access standard math functions */
--                string[] argv = {"bc", "-l"};
-+                string[] argv = {"@bc@", "-l"};
+@@ -73,7 +73,7 @@ namespace Synapse {
+             Pid pid;
+             int read_fd, write_fd;
+             /* Must include math library to get non-integer results and to access standard math functions */
+-            string[] argv = {"bc", "-l"};
++            string[] argv = {"@bc@", "-l"};
  
-                 Process.spawn_async_with_pipes (
-                     null, argv, null,
+             Process.spawn_async_with_pipes (
+                 null, argv, null,
 diff --git a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
-index d14f1de..35c8621 100644
+index 089b8278..0e532bfc 100644
 --- a/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
 +++ b/src/synapse-plugins/calculator-plugin/calculator-plugin.vala
-@@ -49,9 +49,7 @@ namespace Synapse {
-                 _("Calculator"),
-                 _("Calculate basic expressions."),
+@@ -47,8 +47,7 @@ namespace Synapse {
+             DataSink.PluginRegistry.get_default ().register_plugin (
+                 typeof (CalculatorPlugin),
                  "accessories-calculator",
 -                register_plugin,
--                Environment.find_program_in_path ("bc") != null,
--                _("bc is not installed")
+-                Environment.find_program_in_path ("bc") != null
 +                register_plugin
              );
          }
  
 diff --git a/src/synapse-plugins/converter-plugin/converter-plugin.vala b/src/synapse-plugins/converter-plugin/converter-plugin.vala
-index 8d230cc..ed31927 100644
+index 34391e6a..a5bfc71e 100644
 --- a/src/synapse-plugins/converter-plugin/converter-plugin.vala
 +++ b/src/synapse-plugins/converter-plugin/converter-plugin.vala
-@@ -46,9 +46,7 @@ namespace Synapse {
-                 _("Converter"),
-                 _("Convert between units."),
+@@ -44,8 +44,7 @@ namespace Synapse {
+             DataSink.PluginRegistry.get_default ().register_plugin (
+                 typeof (ConverterPlugin),
                  "accessories-converter",
 -                register_plugin,
--                Environment.find_program_in_path ("bc") != null,
--                _("bc is not installed")
+-                Environment.find_program_in_path ("bc") != null
 +                register_plugin
              );
          }