appeditor: 1.1.0 -> 1.1.1

2 files changed, 5 insertions, 31 deletions

diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix
index d0db2b12dfdb0..a715681ae9f2b 100644
--- a/pkgs/applications/misc/appeditor/default.nix
+++ b/pkgs/applications/misc/appeditor/default.nix
@@ -11,17 +11,18 @@
 , glib
 , gtk3
 , libgee
-, wrapGAppsHook }:
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "appeditor";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "donadigo";
     repo = "appeditor";
     rev = version;
-    sha256 = "04x2f4x4dp5ca2y3qllqjgirbyl6383pfl4bi9bkcqlg8b5081rg";
+    sha256 = "14ycw1b6v2sa4vljpnx2lpx4w89mparsxk6s8w3yx4dqjglcg5bp";
   };
 
   nativeBuildInputs = [
@@ -41,11 +42,6 @@ stdenv.mkDerivation rec {
     libgee
   ];
 
-  patches = [
-    # See: https://github.com/donadigo/appeditor/issues/88
-    ./fix-build-vala-0.46.patch
-  ];
-
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py
@@ -62,6 +58,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/donadigo/appeditor";
     maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers;
     platforms = platforms.linux;
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch b/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
deleted file mode 100644
index f6c0b4cfd2879..0000000000000
--- a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/DesktopApp.vala b/src/DesktopApp.vala
-index 0e6fa47..ebcde0c 100644
---- a/src/DesktopApp.vala
-+++ b/src/DesktopApp.vala
-@@ -130,7 +130,7 @@ public class AppEditor.DesktopApp : Object {
- 
-     public unowned string get_path () {
-         if (path == null) {
--            unowned string _path = info.get_string (KeyFileDesktop.KEY_PATH);
-+            string _path = info.get_string (KeyFileDesktop.KEY_PATH);
-             if (_path == null) {
-                 _path = "";
-             }
-@@ -150,7 +150,7 @@ public class AppEditor.DesktopApp : Object {
-     }
- 
-     public bool get_should_show () {
--        return info.should_show () && !get_terminal (); 
-+        return info.should_show () && !get_terminal ();
-     }
- 
-     public string[] get_categories () {