From bbf75a3c3e4fd7453ab14166eb631f9fbb345866 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 3 Sep 2024 20:48:54 +0800 Subject: [PATCH 1/6] =?UTF-8?q?libgedit-amtk:=205.8.0=20=E2=86=92=205.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gedit/libgedit-amtk/-/compare/5.8.0...5.9.0 --- pkgs/by-name/li/libgedit-amtk/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libgedit-amtk/package.nix b/pkgs/by-name/li/libgedit-amtk/package.nix index 4de7207660c9..76b5bfd5fcae 100644 --- a/pkgs/by-name/li/libgedit-amtk/package.nix +++ b/pkgs/by-name/li/libgedit-amtk/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , glib , gtk3 , meson @@ -17,15 +17,17 @@ stdenv.mkDerivation rec { pname = "libgedit-amtk"; - version = "5.8.0"; + version = "5.9.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-amtk"; rev = version; - hash = "sha256-U77/KMZw9k9ukebCXVXAsCa4uJaTgw9irfZ/l0303kk="; + hash = "sha256-D6jZmadUHDtxedw/tCsKHzcWXobs6Vb7dyhbVKqu2Zc="; }; strictDeps = true; @@ -62,12 +64,10 @@ stdenv.mkDerivation rec { runHook postCheck ''; - passthru.updateScript = gitUpdater { - odd-unstable = true; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://github.com/gedit-technology/libgedit-amtk"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-amtk"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl21Plus; From eade58d202e65fb8bf602bf5d4e2f74939999c2e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 Sep 2024 22:42:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?libgedit-gfls:=200.1.0=20=E2=86=92=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gedit/libgedit-gfls/-/compare/0.1.0...0.2.0 --- pkgs/by-name/li/libgedit-gfls/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index 8964898851cf..2d919479bc6f 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , docbook-xsl-nons , gobject-introspection , gtk-doc @@ -14,15 +14,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gfls"; - version = "0.1.0"; + version = "0.2.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-gfls"; rev = finalAttrs.version; - hash = "sha256-tES8UGWcCT8lRd/fnOt9EN3wHkNSLRM4j8ONrCDPBK0="; + hash = "sha256-oxsqggn4O4SwGEas840qE103hKU4f+GP+ItOtD3M+ac="; }; nativeBuildInputs = [ @@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - homepage = "https://github.com/gedit-technology/libgedit-gfls"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls"; description = "Module dedicated to file loading and saving"; maintainers = with lib.maintainers; [ bobby285271 ]; license = lib.licenses.lgpl3Plus; From e35907492cfa4f2630fb42c49fa28a566ee853fb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 Sep 2024 22:44:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?libgedit-gtksourceview:=20299.2.1=20?= =?UTF-8?q?=E2=86=92=20299.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview/-/compare/299.2.1...299.3.0 --- .../li/libgedit-gtksourceview/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 70b3fb276e95..3e6a7fc5891e 100644 --- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , docbook-xsl-nons , gobject-introspection , gtk-doc @@ -16,15 +16,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gtksourceview"; - version = "299.2.1"; + version = "299.3.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-gtksourceview"; rev = finalAttrs.version; - hash = "sha256-fmYIZvsB3opstpPEd9vahcD9yUZKPBpSIrlNDs+eCdw="; + hash = "sha256-C2Bq01PlALJMr7kHsSr9VaSNcktc250yGevRYQ7Ipck="; }; patches = [ @@ -55,13 +57,11 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - passthru.updateScript = gitUpdater { - odd-unstable = true; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "Source code editing widget for GTK"; - homepage = "https://github.com/gedit-technology/libgedit-gtksourceview"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gtksourceview"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.linux; From f85803fd889665d3120c0950067a545c6a1c8fa6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 4 Sep 2024 22:49:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?libgedit-tepl:=206.10.0=20=E2=86=92=206.11.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gedit/libgedit-tepl/-/compare/6.10.0...6.11.0 --- pkgs/by-name/li/libgedit-tepl/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index 5c2c84ac9a40..c3cebb631f17 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab , meson , mesonEmulatorHook , ninja @@ -18,15 +18,17 @@ stdenv.mkDerivation rec { pname = "libgedit-tepl"; - version = "6.10.0"; + version = "6.11.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchFromGitHub { - owner = "gedit-technology"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; repo = "libgedit-tepl"; rev = version; - hash = "sha256-lGmOaDNu+iqwpeaP0AL28exoTqx1j03Z8gdhTBgk1i8="; + hash = "sha256-8y3EQZKYRcx2ocG7aR7tGBCE/68yPdrBcPNm6O2lM4c="; }; strictDeps = true; @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/gedit-technology/libgedit-tepl"; + homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl"; description = "Text editor product line"; maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl3Plus; From ce8da7980164ba7ac7db37707475c775f768e256 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 18 Sep 2024 23:53:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?gedit:=2047.0=20=E2=86=92=2048.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/World/gedit/gedit/-/compare/47.0...48.0 The snippets plugin is considered buggy and is disabled by default. --- .../editors/gedit/correct-gir-lib-path.patch | 21 +++++++++++-------- pkgs/applications/editors/gedit/default.nix | 18 +++------------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch index b3689e420669..324324376000 100644 --- a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch +++ b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch @@ -1,13 +1,16 @@ diff --git a/gedit/meson.build b/gedit/meson.build -index a8683e61a..fc48669f7 100644 +index bc689e5..e3b90d8 100644 --- a/gedit/meson.build +++ b/gedit/meson.build -@@ -191,7 +191,7 @@ libgedit_shared_lib = shared_library( - c_args: libgedit_c_args, - link_args: libgedit_link_args, - install: true, -- install_dir: get_option('libdir') / 'gedit', -+ install_dir: get_option('prefix') / get_option('libdir') / 'gedit', - ) +@@ -165,9 +165,9 @@ libgedit_private_headers += 'gedit-enum-types-private.h' + subdir('resources') - # GObject Introspection + if host_machine.system() == 'windows' +- libgedit_shared_lib_install_dir = get_option('libdir') ++ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') + else +- libgedit_shared_lib_install_dir = get_option('libdir') / 'gedit' ++ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') / 'gedit' + endif + + libgedit_shared_lib = shared_library( diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index c3fc6fae2dcf..7a7d05df52e8 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -4,7 +4,6 @@ , mesonEmulatorHook , fetchurl , python3 -, python3Packages , pkg-config , gtk3 , gtk-mac-integration @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "47.0"; + version = "48.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o="; + sha256 = "/g/vm3sHmRINuGrok6BgA2oTRFNS3tkWm6so04rPDoA="; }; patches = [ @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { perl pkg-config python3 - python3Packages.wrapPython vala wrapGAppsHook3 gtk-doc @@ -87,16 +85,6 @@ stdenv.mkDerivation rec { # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; - pythonPath = with python3Packages; [ - # https://github.com/NixOS/nixpkgs/issues/298716 - pycairo - ]; - - postFixup = '' - buildPythonPath "$pythonPath" - patchPythonScript $out/lib/gedit/plugins/snippets/document.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gedit"; @@ -104,7 +92,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://gedit-technology.github.io/apps/gedit/"; + homepage = "https://gitlab.gnome.org/World/gedit/gedit"; description = "Former GNOME text editor"; maintainers = with maintainers; [ bobby285271 ]; license = licenses.gpl2Plus; From 9052a2df9d77163bd707864b49134f60634ce36d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 18 Sep 2024 23:54:17 +0800 Subject: [PATCH 6/6] =?UTF-8?q?enter-tex:=203.46.0=20=E2=86=92=203.47.0,?= =?UTF-8?q?=20renamed=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 { };