movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

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

Browse source
This commit is contained in:
Jan Tojnar 2025-04-17 21:44:37 +02:00 • committed by GitHub
commit ef88c3a180
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/installed-tests/geocode-glib.nix
View file

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

0
pkgs/by-name/ge/geocode-glib/installed-tests-path.patch → pkgs/by-name/ge/geocode-glib_2/installed-tests-path.patch
View file

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

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

4
pkgs/by-name/tu/tuner/package.nix
View file

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

1
pkgs/top-level/aliases.nix
View file

@ -683,6 +683,7 @@ mapAliases {
gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13 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 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 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."; 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 gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11

4
pkgs/top-level/all-packages.nix
View file

@ -9376,10 +9376,6 @@ with pkgs;
geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; }; 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) { geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
drvName = "geoip-tools"; drvName = "geoip-tools";
geoipDatabase = geolite-legacy; geoipDatabase = geolite-legacy;