From 9052a2df9d77163bd707864b49134f60634ce36d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 18 Sep 2024 23:54:17 +0800 Subject: [PATCH] =?UTF-8?q?enter-tex:=203.46.0=20=E2=86=92=203.47.0,=20ren?= =?UTF-8?q?amed=20from=20gnome-latex?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/swilmet/enter-tex/-/compare/3.46.0...3.47.0 "3.47.alpha" is used for unstable releases, so I will consider this stable. --- .../editors/gnome-latex/default.nix | 84 ------------------- pkgs/by-name/en/enter-tex/package.nix | 84 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 85 insertions(+), 86 deletions(-) delete mode 100644 pkgs/applications/editors/gnome-latex/default.nix create mode 100644 pkgs/by-name/en/enter-tex/package.nix diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix deleted file mode 100644 index efa6aaf4cbdb..000000000000 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, autoreconfHook -, gtk-doc -, vala -, gobject-introspection -, wrapGAppsHook3 -, gsettings-desktop-schemas -, gspell -, libgedit-gtksourceview -, libgedit-tepl -, libgee -, adwaita-icon-theme -, gnome -, glib -, pkg-config -, gettext -, itstool -, libxml2 -}: - -stdenv.mkDerivation rec { - version = "3.46.0"; - pname = "gnome-latex"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - 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 - gtk-doc - vala - gobject-introspection - wrapGAppsHook3 - itstool - gettext - ]; - - buildInputs = [ - adwaita-icon-theme - glib - gsettings-desktop-schemas - gspell - libgedit-gtksourceview - libgedit-tepl - libgee - libxml2 - ]; - - configureFlags = [ - "--disable-dconf-migration" - ]; - - doCheck = true; - - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - passthru.updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/swilmet/gnome-latex"; - description = "LaTeX editor for the GNOME desktop"; - maintainers = with maintainers; [ manveru bobby285271 ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "gnome-latex"; - }; -} diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix new file mode 100644 index 000000000000..f0ee8ce9f387 --- /dev/null +++ b/pkgs/by-name/en/enter-tex/package.nix @@ -0,0 +1,84 @@ +{ + stdenv, + lib, + fetchurl, + desktop-file-utils, + docbook-xsl-nons, + gettext, + gobject-introspection, + gtk-doc, + itstool, + meson, + ninja, + pkg-config, + vala, + wrapGAppsHook3, + dconf, + glib, + gsettings-desktop-schemas, + gspell, + libgedit-amtk, + libgedit-gtksourceview, + libgedit-tepl, + libgee, + gnome, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "enter-tex"; + version = "3.47.0"; + + src = fetchurl { + url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz"; + hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o="; + }; + + nativeBuildInputs = [ + desktop-file-utils + docbook-xsl-nons + gettext + gobject-introspection + gtk-doc + itstool + meson + ninja + pkg-config + vala + wrapGAppsHook3 + ]; + + buildInputs = [ + dconf + glib + gsettings-desktop-schemas + gspell + libgedit-amtk + libgedit-gtksourceview + libgedit-tepl + libgee + ]; + + preBuild = '' + # Workaround the use case of C code mixed with Vala code. + # https://gitlab.gnome.org/swilmet/enter-tex/-/blob/3.47.0/docs/more-information.md#install-procedure + ninja src/gtex/Gtex-1.gir + ''; + + doCheck = true; + + passthru.updateScript = gnome.updateScript { + packageName = "enter-tex"; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/swilmet/enter-tex"; + description = "LaTeX editor for the GNOME desktop"; + maintainers = with maintainers; [ + manveru + bobby285271 + ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "enter-tex"; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85be9b0fa166..60cd92018196 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -532,6 +532,7 @@ mapAliases ({ gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 + gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18 gnu-cobol = gnucobol; # Added 2024-09-17 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b175f8c9e5b9..bcc4a4dfba88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17870,8 +17870,6 @@ with pkgs; gnome-inform7 = callPackage ../applications/editors/gnome-inform7 { }; - gnome-latex = callPackage ../applications/editors/gnome-latex { }; - gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer { };