Merge geocode-glib: drop, geocode-glib_2: refactor (#399091)

nixos/tests/installed-tests/geocode-glib.nix

@@ -11,5 +11,5 @@ makeInstalledTest {
     ];
   };
 
-  tested = pkgs.geocode-glib;
+  tested = pkgs.geocode-glib_2;
 }

pkgs/by-name/ge/geocode-glib_2/package.nix

@@ -11,13 +11,13 @@
   docbook-xsl-nons,
   gobject-introspection,
   gnome,
-  libsoup_2_4,
+  libsoup_3,
   json-glib,
   glib,
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "geocode-glib";
   version = "3.26.4";
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz";
+    url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor finalAttrs.version}/geocode-glib-${finalAttrs.version}.tar.xz";
     sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o=";
   };
 
@@ -53,28 +53,30 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib
-    libsoup_2_4
+    libsoup_3
     json-glib
   ];
 
   mesonFlags = [
-    "-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}"
+    "-Dsoup2=false"
     "-Dinstalled_test_prefix=${placeholder "installedTests"}"
   ];
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "geocode-glib";
     };
     tests = {
       installed-tests = nixosTests.installed-tests.geocode-glib;
     };
   };
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://gitlab.gnome.org/GNOME/geocode-glib/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     description = "Convenience library for the geocoding and reverse geocoding using Nominatim service";
-    license = licenses.lgpl2Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.unix;
+    homepage = "https://gitlab.gnome.org/GNOME/geocode-glib";
+    license = lib.licenses.lgpl2Plus;
+    maintainers = lib.teams.gnome.members;
+    platforms = lib.platforms.unix;
   };
-}
+})

pkgs/by-name/tu/tuner/package.nix

@@ -12,8 +12,6 @@
   desktop-file-utils,
   libsoup_3,
   json-glib,
-  geoclue2,
-  geocode-glib,
   libgee,
   gtk3,
   pantheon,
@@ -45,8 +43,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libsoup_3
     json-glib
-    geoclue2
-    geocode-glib
     libgee
     glib
     gtk3

pkgs/top-level/aliases.nix

@@ -683,6 +683,7 @@ mapAliases {
   gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
   gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
+  geocode-glib = "throw 'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16
   geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead.";
   gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
   gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11

pkgs/top-level/all-packages.nix

@@ -9376,10 +9376,6 @@ with pkgs;
 
   geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
 
-  geocode-glib_2 = geocode-glib.override {
-    libsoup_2_4 = libsoup_3;
-  };
-
   geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
     drvName = "geoip-tools";
     geoipDatabase = geolite-legacy;