From df071433bbbfbfe842e8573da2e5c5a60ec3dd7b Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 4 Sep 2026 21:49:07 +0200 Subject: [PATCH] gtksourceview: drop unversioned alias Having the older ABI version as the default seems odd and the different gtksourceview packages appear to be fundamentally incompatible, so drop the unsuffixed version similar to webkitgtk and as discussed in [1]. [1] https://github.com/NixOS/nixpkgs/pull/543345#issuecomment-5199018730 --- pkgs/applications/audio/quodlibet/default.nix | 4 ++-- pkgs/by-name/de/denemo/package.nix | 4 ++-- pkgs/by-name/lu/lutris/package.nix | 2 +- pkgs/by-name/ma/marker/package.nix | 4 ++-- pkgs/by-name/re/rednotebook/package.nix | 4 ++-- pkgs/by-name/ya/yad/package.nix | 4 ++-- pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 7d0703e47c08..6169917a7d09 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -16,7 +16,7 @@ glib, glib-networking, gtk3, - gtksourceview, + gtksourceview3, kakasi, keybinder3, libappindicator, @@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { glib glib-networking gtk3 - gtksourceview + gtksourceview3 kakasi keybinder3 libappindicator diff --git a/pkgs/by-name/de/denemo/package.nix b/pkgs/by-name/de/denemo/package.nix index 80f7970597a5..92734fa6af91 100644 --- a/pkgs/by-name/de/denemo/package.nix +++ b/pkgs/by-name/de/denemo/package.nix @@ -15,7 +15,7 @@ libsndfile, aubio, gtk3, - gtksourceview, + gtksourceview3, evince, fluidsynth, rubberband, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { libsndfile aubio gtk3 - gtksourceview + gtksourceview3 evince fluidsynth rubberband diff --git a/pkgs/by-name/lu/lutris/package.nix b/pkgs/by-name/lu/lutris/package.nix index d40cd205f224..2ec975da987d 100644 --- a/pkgs/by-name/lu/lutris/package.nix +++ b/pkgs/by-name/lu/lutris/package.nix @@ -18,7 +18,7 @@ let gnomeDeps = pkgs: with pkgs; [ zenity - gtksourceview + gtksourceview3 gnome-desktop libgnome-keyring webkitgtk_4_1 diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix index f22d93f73584..b0824a79952c 100644 --- a/pkgs/by-name/ma/marker/package.nix +++ b/pkgs/by-name/ma/marker/package.nix @@ -8,7 +8,7 @@ pkg-config, wrapGAppsHook3, gtk3, - gtksourceview, + gtksourceview3, gtkspell3, webkitgtk_4_1, pandoc, @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 - gtksourceview + gtksourceview3 gtkspell3 webkitgtk_4_1 pandoc diff --git a/pkgs/by-name/re/rednotebook/package.nix b/pkgs/by-name/re/rednotebook/package.nix index 98a14bbca26d..00d1656a6082 100644 --- a/pkgs/by-name/re/rednotebook/package.nix +++ b/pkgs/by-name/re/rednotebook/package.nix @@ -6,7 +6,7 @@ glib, gobject-introspection, gtk3, - gtksourceview, + gtksourceview3, pango, webkitgtk_4_1, }: @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: { gdk-pixbuf glib gtk3 - gtksourceview + gtksourceview3 pango webkitgtk_4_1 ] diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix index 52a921e783a0..a33b4978139a 100644 --- a/pkgs/by-name/ya/yad/package.nix +++ b/pkgs/by-name/ya/yad/package.nix @@ -8,7 +8,7 @@ gettext, gspell, gtk3, - gtksourceview, + gtksourceview3, libappindicator, netpbm, webkitgtk_4_1, @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gspell gtk3 - gtksourceview + gtksourceview3 libappindicator webkitgtk_4_1 ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index 0fa1039c62cb..9deb1b3a08ac 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -1,12 +1,12 @@ { buildDunePackage, - gtksourceview, + gtksourceview3, lablgtk3, }: buildDunePackage { pname = "lablgtk3-sourceview3"; - buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; + buildInputs = lablgtk3.buildInputs ++ [ gtksourceview3 ]; propagatedBuildInputs = [ lablgtk3 ]; inherit (lablgtk3) src diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f3b83d44a238..c901e4d99f2a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1109,6 +1109,7 @@ mapAliases { gtklp = throw "'gtklp' has been removed, as it depended on GTK 2. Consider using 'system-config-printer' instead."; # Added 2026-05-22 gtkmm2 = throw "'gtkmm2' has been removed as it depended on the deprecated gtk2. Consider using 'gtkmm3' or 'gtkmm4' instead."; # Added 2026-08-09 gtkradiant = throw "'gtkradiant' has been removed, as it relies on gtk2"; # Added 2026-06-18 + gtksourceview = throw "'gtksourceview' attribute has been removed from nixpkgs. Use a 'gtksourceview*' attribute with an explicit ABI version instead."; # Added 2026-09-04 gtkspell2 = throw "'gtkspell2' has been removed as it depended on the deprecated GTK2 engine. Consider using 'gtkspell3' instead"; # Added 2026-07-23 gtuber = throw "'gtuber' has been removed due to being discontinued by upstream."; # Added 2025-12-12 gui-for-clash = throw "'gui-for-clash' has been removed, as it is unmaintained"; # Added 2026-05-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4e905968199..7f7c08e3e675 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5795,8 +5795,6 @@ with pkgs; gtk-mac-integration-gtk3 = gtk-mac-integration; - gtksourceview = gtksourceview3; - gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { }; gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; @@ -9052,7 +9050,7 @@ with pkgs; }; quodlibet-full = quodlibet.override { - inherit gtksourceview; + inherit gtksourceview3; kakasi = kakasi; keybinder3 = keybinder3; libappindicator = libappindicator;