From e29d735e792d8893eae0a85cad09b4a439183583 Mon Sep 17 00:00:00 2001
From: Florian Franzen <Florian.Franzen@gmail.com>
Date: Sat, 21 Sep 2024 09:33:19 +0200
Subject: [PATCH] librdf_raptor2: unstable-2022-06-06 -> 2.0.16 (#280822)

---
 pkgs/development/libraries/librdf/raptor2.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index a747ad8eb8de..eace8af8156c 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -15,13 +15,14 @@
 
 stdenv.mkDerivation rec {
   pname = "raptor2";
-  version = "unstable-2022-06-06";
+  version = "2.0.16";
+  underscoredVersion = lib.strings.replaceStrings ["."] ["_"] version;
 
   src = fetchFromGitHub {
     owner = "dajobe";
     repo = "raptor";
-    rev = "3cca62a33da68143b687c9e486eefc7c7cbb4586";
-    sha256 = "sha256-h03IyFH1GHPqajfHBBTb19lCEu+VXzQLGC1wiEGVvgY=";
+    rev = "${pname}_${underscoredVersion}";
+    sha256 = "sha256-Eic63pV2p154YkSmkqWr86fGTr+XmVGy5l5/6q14LQM=";
   };
 
   cmakeFlags = [
@@ -30,13 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # https://github.com/dajobe/raptor/pull/52
-    (fetchpatch {
-      name = "fix-cmake-generated-pc-file";
-      url = "https://github.com/dajobe/raptor/commit/fa1ef9a27d8762f5588ac2e92554a188e73dee9f.diff";
-      sha256 = "sha256-zXIbrYGgC9oTpiD0WUikT4vRdc9b6bsyfnDkwUSlqao=";
-    })
-    # pull upstream fix for libxml2-2.11 API compatibility:
+    # pull upstream fix for libxml2-2.11 API compatibility, part of unreleased 2.0.17
     #   https://github.com/dajobe/raptor/pull/58
     (fetchpatch {
       name = "libxml2-2.11.patch";