diff options
author | Bobby Rong <rjl931189261@126.com> | 2024-04-30 19:53:41 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-30 19:53:41 +0800 |
commit | 705bad7ed6014a9957cb43e426e310f581ca1100 (patch) | |
tree | 9e2e99c2da087cf300cf78c4dcef1bb9c511427f /pkgs/applications/editors | |
parent | 2b05adee2cb17c08faa9b99c582f5b7f34f5352e (diff) | |
parent | d062f067d87f975951252a04c88da1126e9d2a3d (diff) |
Merge pull request #307483 from r-ryantm/auto-update/libgedit-gtksourceview
gedit 47.0, libgedit-gtksourceview 299.2.1, libgedit-tepl 6.10.0
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/gedit/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/editors/gnome-latex/default.nix | 17 |
2 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index eb985016b1783..9ec2d3329c1dc 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -9,9 +9,9 @@ , gtk3 , gtk-mac-integration , glib -, tepl , libgedit-amtk , libgedit-gtksourceview +, libgedit-tepl , libpeas , libxml2 , gsettings-desktop-schemas @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "46.2"; + version = "47.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "wIZkErrRR+us4tKC/8u1oOmjBLIP1VZAvuIcgebVAe8="; + sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o="; }; patches = [ @@ -65,13 +65,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - tepl glib gsettings-desktop-schemas gspell gtk3 libgedit-amtk libgedit-gtksourceview + libgedit-tepl libpeas ] ++ lib.optionals stdenv.isDarwin [ gtk-mac-integration diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 8962629c8bdc4..f78407731d264 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , autoreconfHook , gtk-doc , vala @@ -8,10 +9,9 @@ , wrapGAppsHook , gsettings-desktop-schemas , gspell -, libgedit-amtk , libgedit-gtksourceview +, libgedit-tepl , libgee -, tepl , gnome , glib , pkg-config @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { sha256 = "1nVVY5sqFaiuvVTzNTVORP40MxQ648s8ynqOJvgRKto="; }; + patches = [ + # Adapt for Tepl -> libgedit-tepl rename + (fetchpatch { + url = "https://gitlab.gnome.org/swilmet/gnome-latex/-/commit/41e532c427f43a5eed9081766963d6e29a9975a1.patch"; + hash = "sha256-gu8o/er4mP92dE5gWg9lGx5JwTHB8ytk3EMNlwlIpq4="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook @@ -45,11 +53,10 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gspell - libgedit-amtk libgedit-gtksourceview + libgedit-tepl libgee libxml2 - tepl ]; configureFlags = [ @@ -66,7 +73,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; + homepage = "https://gitlab.gnome.org/swilmet/gnome-latex"; description = "A LaTeX editor for the GNOME desktop"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.gpl3Plus; |