Unverified Commit 8a11a371 authored by Grimmauld's avatar Grimmauld
Browse files

geocode-glib: drop, geocode-glib_2: refactor

parent 25aeff88

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

+13 −11
Original line number Diff line number Diff line
@@ -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/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -669,6 +669,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

+0 −4
Original line number Diff line number Diff line
@@ -9415,10 +9415,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;