From e2611a4bfebaee9d2e72661b7e480eb9c5d10463 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 14 Sep 2024 02:20:00 +0000 Subject: [PATCH] =?UTF-8?q?gobject-introspection:=201.80.1=20=E2=86=92=201?= =?UTF-8?q?.82.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gobject-introspection/-/compare/1.80.1...1.82.0 Changelog-reviewed-by: Bobby Rong --- .../libraries/gobject-introspection/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 7687fbc25fee..925db88c9d01 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch2 , glib , flex , bison @@ -41,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; - version = "1.80.1"; + version = "1.82.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -50,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; - hash = "sha256-od98Qk4VvaGrY5wA6QUbmt9c6hqeUS+KYDtTzRmbxtg="; + hash = "sha256-D1pMGQhCS/JrxB6TYRaMNjaFCA+9uHoZbIkchAHKLwk="; }; patches = [ @@ -61,11 +60,6 @@ stdenv.mkDerivation (finalAttrs: { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) - (fetchpatch2 { - name = "setuptools-74.0-compat.patch"; - url = "https://github.com/GNOME/gobject-introspection/commit/a2139dba59eac283a7f543ed737f038deebddc19.patch"; - hash = "sha256-n++wpQuJhAEYtcu8LZDC4+Tx1MYuFIMysFgrvz68jWU="; - }) ] ++ lib.optionals x11Support [ # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080