From c391bdeedc95768003174ef3e98372a04e1960a6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Dec 2023 17:57:33 +0800 Subject: [PATCH 1/7] amtk: Propagate glib and gtk3 These are required by amtk-5.pc. --- pkgs/development/libraries/amtk/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 86d5a038a3f2..405754744345 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, glib , gtk3 , meson , mesonEmulatorHook @@ -38,7 +39,9 @@ stdenv.mkDerivation rec { mesonEmulatorHook ]; - buildInputs = [ + propagatedBuildInputs = [ + # Required by amtk-5.pc + glib gtk3 ]; From 304caff45e8f9a5d9da78c5635f333b9d4ae7289 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Dec 2023 17:59:11 +0800 Subject: [PATCH 2/7] amtk: Move dbus to nativeCheckInputs These is mostly for dbus-run-session I assume. --- pkgs/development/libraries/amtk/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 405754744345..d0a0982900f0 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - dbus gobject-introspection gtk-doc docbook-xsl-nons @@ -45,12 +44,20 @@ stdenv.mkDerivation rec { gtk3 ]; + nativeCheckInputs = [ + dbus # For dbus-run-session + ]; + doCheck = stdenv.isLinux; checkPhase = '' + runHook preCheck + export NO_AT_BRIDGE=1 ${xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus}/share/dbus-1/session.conf \ meson test --print-errorlogs + + runHook postCheck ''; passthru.updateScript = gnome.updateScript { From ced24ce9f3500a6140a2843882428f81fb3adafa Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Dec 2023 18:05:02 +0800 Subject: [PATCH 3/7] =?UTF-8?q?libgedit-amtk:=205.6.1=20=E2=86=92=205.8.0,?= =?UTF-8?q?=20renamed=20from=20amtk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See README.md in https://gitlab.gnome.org/Archive/amtk. --- .../li/libgedit-amtk/package.nix} | 27 ++++++++++--------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 15 insertions(+), 15 deletions(-) rename pkgs/{development/libraries/amtk/default.nix => by-name/li/libgedit-amtk/package.nix} (68%) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/by-name/li/libgedit-amtk/package.nix similarity index 68% rename from pkgs/development/libraries/amtk/default.nix rename to pkgs/by-name/li/libgedit-amtk/package.nix index d0a0982900f0..4de7207660c9 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/by-name/li/libgedit-amtk/package.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub , glib , gtk3 , meson @@ -10,20 +10,22 @@ , gobject-introspection , gtk-doc , docbook-xsl-nons -, gnome +, gitUpdater , dbus , xvfb-run }: stdenv.mkDerivation rec { - pname = "amtk"; - version = "5.6.1"; + pname = "libgedit-amtk"; + version = "5.8.0"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1QEVuFyHKqwpaTS17nJqP6FWxvWtltJ+Dt0Kpa0XMig="; + src = fetchFromGitHub { + owner = "gedit-technology"; + repo = "libgedit-amtk"; + rev = version; + hash = "sha256-U77/KMZw9k9ukebCXVXAsCa4uJaTgw9irfZ/l0303kk="; }; strictDeps = true; @@ -39,7 +41,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # Required by amtk-5.pc + # Required by libgedit-amtk-5.pc glib gtk3 ]; @@ -60,15 +62,14 @@ stdenv.mkDerivation rec { runHook postCheck ''; - passthru.updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "none"; + passthru.updateScript = gitUpdater { + odd-unstable = true; }; meta = with lib; { - homepage = "https://wiki.gnome.org/Projects/Amtk"; + homepage = "https://github.com/gedit-technology/libgedit-amtk"; description = "Actions, Menus and Toolbars Kit for GTK applications"; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0b2c369d43f7..c87ee8c5d1da 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -67,6 +67,7 @@ mapAliases ({ alsaPlugins = alsa-plugins; # Added 2021-06-10 alsaTools = alsa-tools; # Added 2021-06-10 alsaUtils = alsa-utils; # Added 2021-06-10 + amtk = throw "amtk has been renamed to libgedit-amtk and is now maintained by Gedit Technology"; # Added 2023-12-31 angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06 ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ba31c6d6db2..2c4b87a8c424 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18153,8 +18153,6 @@ with pkgs; h3 = h3_3; - amtk = callPackage ../development/libraries/amtk { }; - avrlibc = callPackage ../development/misc/avr/libc { }; avrlibcCross = callPackage ../development/misc/avr/libc { stdenv = crossLibcStdenv; From 0e4d873e289beaba632bec8eca8887fd952b6a80 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Dec 2023 17:26:40 +0800 Subject: [PATCH 4/7] libgedit-gtksourceview: init at 299.0.5 Version scheme is now documented in upstream README.md, which suggests that even 299.x.y can be stable as long as minor version is even. --- .../nix-share-path.patch | 11 +++ .../li/libgedit-gtksourceview/package.nix | 69 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 pkgs/by-name/li/libgedit-gtksourceview/nix-share-path.patch create mode 100644 pkgs/by-name/li/libgedit-gtksourceview/package.nix diff --git a/pkgs/by-name/li/libgedit-gtksourceview/nix-share-path.patch b/pkgs/by-name/li/libgedit-gtksourceview/nix-share-path.patch new file mode 100644 index 000000000000..a35d9a88d0df --- /dev/null +++ b/pkgs/by-name/li/libgedit-gtksourceview/nix-share-path.patch @@ -0,0 +1,11 @@ +--- a/gtksourceview/gtksourceutils.c ++++ b/gtksourceview/gtksourceutils.c +@@ -232,6 +232,8 @@ + NULL)); + } + ++ g_ptr_array_add (dirs, g_build_filename (DATADIR, GSV_DATA_SUBDIR, basename, NULL)); ++ + g_ptr_array_add (dirs, NULL); + + return (gchar **) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix new file mode 100644 index 000000000000..3de70506f330 --- /dev/null +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, docbook-xsl-nons +, gobject-introspection +, gtk-doc +, meson +, ninja +, pkg-config +, libxml2 +, glib +, gtk3 +, shared-mime-info +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libgedit-gtksourceview"; + version = "299.0.5"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitHub { + owner = "gedit-technology"; + repo = "libgedit-gtksourceview"; + rev = finalAttrs.version; + hash = "sha256-PQ7cpul9h1JzywDWm9YyD95B1ONSdUUk0EQJMEGoRN0="; + }; + + patches = [ + # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory + # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS). + # Since this is not generally true with Nix, let’s add $out/share unconditionally. + ./nix-share-path.patch + ]; + + nativeBuildInputs = [ + docbook-xsl-nons + gobject-introspection + gtk-doc + meson + ninja + pkg-config + ]; + + buildInputs = [ + libxml2 + ]; + + propagatedBuildInputs = [ + # Required by libgedit-gtksourceview-300.pc + glib + gtk3 + # Used by gtk_source_language_manager_guess_language + shared-mime-info + ]; + + passthru.updateScript = gitUpdater { + odd-unstable = true; + }; + + meta = with lib; { + description = "Source code editing widget for GTK"; + homepage = "https://github.com/gedit-technology/libgedit-gtksourceview"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ bobby285271 ]; + platforms = platforms.linux; + }; +}) From f0283e42848cc1fa1e990260f099b3092bdb50c5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Dec 2023 10:15:11 +0000 Subject: [PATCH 5/7] =?UTF-8?q?tepl:=206.4.0=20=E2=86=92=206.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/swilmet/tepl/-/compare/6.4.0...6.8.0 --- pkgs/development/libraries/tepl/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 796810ade97a..5ceb76b9bf7f 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , mesonEmulatorHook , ninja -, amtk , gnome , gobject-introspection , gtk3 -, gtksourceview4 , icu +, libgedit-amtk +, libgedit-gtksourceview , pkg-config , gtk-doc , docbook-xsl-nons @@ -16,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "6.4.0"; + version = "6.8.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XlayBmnQzwX6HWS1jIw0LFkVgSLcUYEA0JPVnfm4cyE="; + sha256 = "Rubl8b/bxS5ZVvBq3VdenHaXxnPVPTgD3+do9JC1YPA="; }; strictDeps = true; @@ -42,9 +43,9 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - amtk - gtksourceview4 gtk3 + libgedit-amtk + libgedit-gtksourceview ]; doCheck = false; @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.lgpl3Plus; platforms = platforms.linux; }; From fc0ec239225fa7d51be9e4fcd1542346af12823a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Dec 2023 11:09:08 +0000 Subject: [PATCH 6/7] =?UTF-8?q?gedit:=2044.2=20=E2=86=92=2046.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gedit/-/compare/44.2...46.1 I don't see how libsoup is used here, even using `grep -inr 'soup'`. --- pkgs/applications/editors/gedit/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index a7f1fd135fd6..7e4b4040737e 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -8,18 +8,17 @@ , gtk3 , gtk-mac-integration , glib -, amtk , tepl +, libgedit-amtk +, libgedit-gtksourceview , libpeas , libxml2 -, gtksourceview4 , gsettings-desktop-schemas , wrapGAppsHook , gtk-doc , gobject-introspection , docbook-xsl-nons , ninja -, libsoup , gnome , gspell , perl @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "44.2"; + version = "46.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "O7sbN3XUwnfa9UqqtEsOuDpOsfCfA5GAAEHJ5WiT7BE="; + sha256 = "oabjfwQXZd/3InofVXi29J+q8Bax4X6GnK9b+5TGqk4="; }; patches = [ @@ -64,15 +63,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - amtk tepl glib gsettings-desktop-schemas gspell gtk3 - gtksourceview4 + libgedit-amtk + libgedit-gtksourceview libpeas - libsoup ] ++ lib.optionals stdenv.isDarwin [ gtk-mac-integration ]; @@ -96,7 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Former GNOME text editor"; - maintainers = [ ]; + maintainers = with maintainers; [ bobby285271 ]; license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "gedit"; From fd522475ce533de20f65142d75a9af6d59b38e89 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 31 Dec 2023 11:25:08 +0000 Subject: [PATCH 7/7] =?UTF-8?q?gnome-latex:=203.44.0=20=E2=86=92=203.46.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/swilmet/gnome-latex/-/compare/3.44.0...3.46.0 --- pkgs/applications/editors/gnome-latex/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 90b145c50330..8962629c8bdc 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -8,10 +8,10 @@ , wrapGAppsHook , gsettings-desktop-schemas , gspell -, gtksourceview4 +, libgedit-amtk +, libgedit-gtksourceview , libgee , tepl -, amtk , gnome , glib , pkg-config @@ -21,12 +21,12 @@ }: stdenv.mkDerivation rec { - version = "3.44.0"; + version = "3.46.0"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "iL1TQL0ox+0Bx5ZqOgBzK72QJ3PfWsZZvmrRGAap50Q="; + sha256 = "1nVVY5sqFaiuvVTzNTVORP40MxQ648s8ynqOJvgRKto="; }; nativeBuildInputs = [ @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - amtk gnome.adwaita-icon-theme glib gsettings-desktop-schemas gspell - gtksourceview4 + libgedit-amtk + libgedit-gtksourceview libgee libxml2 tepl @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; description = "A LaTeX editor for the GNOME desktop"; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ manveru bobby285271 ]; license = licenses.gpl3Plus; platforms = platforms.linux; mainProgram = "gnome-latex";