From de4e752da1628eedfb8e2da92806c4318e9db1d7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 24 Mar 2026 12:17:28 +0000 Subject: [PATCH] =?UTF-8?q?libgweather:=204.4.4=20=E2=86=92=204.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libgweather/-/compare/4.4.4...4.6.0 --- pkgs/by-name/li/libgweather/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/li/libgweather/package.nix b/pkgs/by-name/li/libgweather/package.nix index aba8c805fbe7..09b1c6a92035 100644 --- a/pkgs/by-name/li/libgweather/package.nix +++ b/pkgs/by-name/li/libgweather/package.nix @@ -3,7 +3,6 @@ stdenv, buildPackages, fetchurl, - makeWrapper, meson, ninja, pkg-config, @@ -11,10 +10,10 @@ json-glib, glib, gettext, + gweather-locations, libsoup_3, gi-docgen, gobject-introspection, - python3, tzdata, geocode-glib_2, vala, @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "4.4.4"; + version = "4.6.0"; outputs = [ "out" @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libgweather/${lib.versions.majorMinor version}/libgweather-${version}.tar.xz"; - hash = "sha256-cBdnd1PN99H9w1Xkv82x66g2l5Oo3yTSQUJ6k5y/QoM="; + hash = "sha256-f10OjJaF7y/0bC86V8rkjXvzVAstg5IfiJ7yjmqHZ4g="; }; patches = [ @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { ]; depsBuildBuild = [ - makeWrapper pkg-config ]; @@ -57,7 +55,6 @@ stdenv.mkDerivation rec { pkg-config gettext glib - (python3.pythonOnBuildForHost.withPackages (ps: [ ps.pygobject3 ])) ] ++ lib.optionals withIntrospection [ gi-docgen @@ -67,6 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib + gweather-locations libsoup_3 libxml2 json-glib @@ -82,10 +80,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs --build build-aux/meson/gen_locations_variant.py - wrapProgram $PWD/build-aux/meson/gen_locations_variant.py \ - --prefix GI_TYPELIB_PATH : ${lib.getLib buildPackages.glib}/lib/girepository-1.0 \ - # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) # it should be a build-time dep for build # TODO: send upstream