Skip to content

Commit 8a11a37

Browse files
committed
geocode-glib: drop, geocode-glib_2: refactor
1 parent 25aeff8 commit 8a11a37

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
docbook-xsl-nons,
1212
gobject-introspection,
1313
gnome,
14-
libsoup_2_4,
14+
libsoup_3,
1515
json-glib,
1616
glib,
1717
nixosTests,
1818
}:
1919

20-
stdenv.mkDerivation rec {
20+
stdenv.mkDerivation (finalAttrs: {
2121
pname = "geocode-glib";
2222
version = "3.26.4";
2323

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929
];
3030

3131
src = fetchurl {
32-
url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor version}/geocode-glib-${version}.tar.xz";
32+
url = "mirror://gnome/sources/geocode-glib/${lib.versions.majorMinor finalAttrs.version}/geocode-glib-${finalAttrs.version}.tar.xz";
3333
sha256 = "LZpoJtFYRwRJoXOHEiFZbaD4Pr3P+YuQxwSQiQVqN6o=";
3434
};
3535

@@ -53,28 +53,30 @@ stdenv.mkDerivation rec {
5353

5454
buildInputs = [
5555
glib
56-
libsoup_2_4
56+
libsoup_3
5757
json-glib
5858
];
5959

6060
mesonFlags = [
61-
"-Dsoup2=${lib.boolToString (lib.versionOlder libsoup_2_4.version "2.99")}"
61+
"-Dsoup2=false"
6262
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
6363
];
6464

6565
passthru = {
6666
updateScript = gnome.updateScript {
67-
packageName = pname;
67+
packageName = "geocode-glib";
6868
};
6969
tests = {
7070
installed-tests = nixosTests.installed-tests.geocode-glib;
7171
};
7272
};
7373

74-
meta = with lib; {
74+
meta = {
75+
changelog = "https://gitlab.gnome.org/GNOME/geocode-glib/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
7576
description = "Convenience library for the geocoding and reverse geocoding using Nominatim service";
76-
license = licenses.lgpl2Plus;
77-
maintainers = teams.gnome.members;
78-
platforms = platforms.unix;
77+
homepage = "https://gitlab.gnome.org/GNOME/geocode-glib";
78+
license = lib.licenses.lgpl2Plus;
79+
maintainers = lib.teams.gnome.members;
80+
platforms = lib.platforms.unix;
7981
};
80-
}
82+
})

pkgs/top-level/aliases.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,7 @@ mapAliases {
669669
gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
670670
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
671671
gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
672+
geocode-glib = "throw 'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16
672673
geos_3_11 = throw "geos_3_11 has been removed from nixpgks. Please use a more recent 'geos' instead.";
673674
gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
674675
gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9415,10 +9415,6 @@ with pkgs;
94159415

94169416
geoclue2-with-demo-agent = geoclue2.override { withDemoAgent = true; };
94179417

9418-
geocode-glib_2 = geocode-glib.override {
9419-
libsoup_2_4 = libsoup_3;
9420-
};
9421-
94229418
geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) {
94239419
drvName = "geoip-tools";
94249420
geoipDatabase = geolite-legacy;

0 commit comments

Comments
 (0)