From 97cea36f8b8c3c97c79af1cf7b856507b63ddc7e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 21 May 2025 04:01:47 +0800
Subject: [PATCH] osinfo-db-tools: 1.11.0 -> 1.12.0

Changelog: https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v1.12.0/NEWS
---
 pkgs/by-name/os/osinfo-db-tools/package.nix | 33 +++++++--------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/os/osinfo-db-tools/package.nix b/pkgs/by-name/os/osinfo-db-tools/package.nix
index e89c7416888e..faf2aff4cdca 100644
--- a/pkgs/by-name/os/osinfo-db-tools/package.nix
+++ b/pkgs/by-name/os/osinfo-db-tools/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   pkg-config,
   meson,
   ninja,
@@ -19,27 +18,15 @@
   libsoup_3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "osinfo-db-tools";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
-    url = "https://releases.pagure.org/libosinfo/osinfo-db-tools-${version}.tar.xz";
-    sha256 = "sha256-i6bTG7XvBwVuOIeeBwZxr7z+wOtBqH+ZUEULu4MbCh0=";
+    url = "https://releases.pagure.org/libosinfo/osinfo-db-tools-${finalAttrs.version}.tar.xz";
+    hash = "sha256-8zFfZ10Ydw8l3qjtBLILj8gO+wD2DDfuXoFfnDd25/M=";
   };
 
-  patches = [
-    # Fix build with libxml 2.12
-    (fetchpatch {
-      url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/019487cbc79925e49988789bf533c78dab7e1842.patch";
-      hash = "sha256-skuspjHDRilwym+hFInrSvIZ+rrzBOoI7WeFj2SrGkc=";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4ac257f2f5fcf364786d1634a8c36b304f.patch";
-      hash = "sha256-I9vRRbnotqRi8+7q1eZLJwQLaT9J4G3h+3rKxlaCME4=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -60,12 +47,12 @@ stdenv.mkDerivation rec {
     libsoup_3
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools for managing the osinfo database";
     homepage = "https://libosinfo.org/";
-    changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${version}/NEWS";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
+    changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${finalAttrs.version}/NEWS";
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.bjornfor ];
   };
-}
+})