From 8a46ae0b14e1c722e177a8fd3fd78ab478c637e2 Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Fri, 30 May 2025 22:22:34 +0200
Subject: [PATCH 1/2] oxigraph: add tnias to maintainers

---
 pkgs/by-name/ox/oxigraph/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix
index 9b85bc6e75ec..eb9760d041d7 100644
--- a/pkgs/by-name/ox/oxigraph/package.nix
+++ b/pkgs/by-name/ox/oxigraph/package.nix
@@ -53,7 +53,10 @@ rustPlatform.buildRustPackage rec {
       "aarch64-linux"
       "aarch64-darwin"
     ];
-    maintainers = with maintainers; [ astro ];
+    maintainers = with maintainers; [
+      astro
+      tnias
+    ];
     license = with licenses; [
       asl20
       mit

From 51efce3c9ba12c8db95af14ec2ae13d63744e7fc Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Fri, 30 May 2025 22:27:47 +0200
Subject: [PATCH 2/2] oxigraph: cleanup

---
 pkgs/by-name/ox/oxigraph/package.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix
index eb9760d041d7..12dbd9a83c83 100644
--- a/pkgs/by-name/ox/oxigraph/package.nix
+++ b/pkgs/by-name/ox/oxigraph/package.nix
@@ -5,14 +5,20 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+let
+  features = [
+    "rustls-webpki"
+    "geosparql"
+  ];
+in
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxigraph";
   version = "0.4.9";
 
   src = fetchFromGitHub {
     owner = "oxigraph";
     repo = "oxigraph";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sv9LpAoPQ4oFrGI6j6NgVZwEwpM1wt93lHkUwnvmhIY=";
     fetchSubmodules = true;
   };
@@ -27,10 +33,7 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = "cli";
   buildNoDefaultFeatures = true;
-  buildFeatures = [
-    "rustls-webpki"
-    "geosparql"
-  ];
+  buildFeatures = features;
 
   # Man pages and autocompletion
   postInstall = ''
@@ -43,9 +46,9 @@ rustPlatform.buildRustPackage rec {
   '';
 
   cargoCheckNoDefaultFeatures = true;
-  cargoCheckFeatures = buildFeatures;
+  cargoCheckFeatures = features;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/oxigraph/oxigraph";
     description = "SPARQL graph database";
     platforms = [
@@ -53,14 +56,14 @@ rustPlatform.buildRustPackage rec {
       "aarch64-linux"
       "aarch64-darwin"
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       astro
       tnias
     ];
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
     mainProgram = "oxigraph";
   };
-}
+})