diff --git a/nixos/tests/installed-tests/geocode-glib.nix b/nixos/tests/installed-tests/geocode-glib.nix index 76a32ee2849a..3fc5dc313a24 100644 --- a/nixos/tests/installed-tests/geocode-glib.nix +++ b/nixos/tests/installed-tests/geocode-glib.nix @@ -11,5 +11,5 @@ makeInstalledTest { ]; }; - tested = pkgs.geocode-glib; + tested = pkgs.geocode-glib_2; } diff --git a/pkgs/by-name/ge/geocode-glib/installed-tests-path.patch b/pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch similarity index 100% rename from pkgs/by-name/ge/geocode-glib/installed-tests-path.patch rename to pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch diff --git a/pkgs/by-name/ge/geocode-glib/package.nix b/pkgs/by-name/ge/geocode-glib_2/package.nix similarity index 70% rename from pkgs/by-name/ge/geocode-glib/package.nix rename to pkgs/by-name/ge/geocode-glib_2/package.nix index 9461c9fcb412..46cf04ba34d4 100644 --- a/pkgs/by-name/ge/geocode-glib/package.nix +++ b/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; }; -} +}) diff --git a/pkgs/by-name/tu/tuner/package.nix b/pkgs/by-name/tu/tuner/package.nix index ce4dc34a82e2..5c3be6074447 100644 --- a/pkgs/by-name/tu/tuner/package.nix +++ b/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 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index be6e15e7baeb..bf73af27c39e 100644 --- a/pkgs/top-level/aliases.nix +++ b/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d87089c5c08..59533d28d173 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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;