From 6626f00d755961cd34c5ddf63889caa0c40a5059 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 29 Aug 2025 04:23:08 +0800
Subject: [PATCH 1/3] xbps: 0.59.2 -> 0.60.5

Diff: https://github.com/void-linux/xbps/compare/0.59.2...0.60.5
---
 pkgs/by-name/xb/xbps/package.nix | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 052e1338eb6d..f0780ad03d3a 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -9,15 +9,15 @@
   libarchive,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xbps";
-  version = "0.59.2";
+  version = "0.60.5";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
-    rev = version;
-    hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14=";
+    tag = finalAttrs.version;
+    hash = "sha256-ht5hhaaE9QAsp+5xmOAYQE9fgL0GBuQvz0qB64z0cbs=";
   };
 
   nativeBuildInputs = [
@@ -37,24 +37,10 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations";
 
+  # Don't try to install keys to /var/db/xbps, put in $out/share for now
   postPatch = ''
-    # _BSD_SOURCE causes cpp warning
-    # https://github.com/void-linux/xbps/issues/576
-    substituteInPlace bin/xbps-fbulk/main.c lib/util.c lib/external/dewey.c lib/external/fexec.c \
-      --replace 'define _BSD_SOURCE' 'define _DEFAULT_SOURCE' \
-      --replace '# define _BSD_SOURCE' '#define _DEFAULT_SOURCE'
-
-    # fix calloc argument cause a build failure
-    substituteInPlace bin/xbps-fbulk/main.c \
-      --replace-fail 'calloc(sizeof(*depn), 1)' 'calloc(1UL, sizeof(*depn))'
-
-    # fix unprefixed ranlib (needed on cross)
-    substituteInPlace lib/Makefile \
-      --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) '
-
-    # Don't try to install keys to /var/db/xbps, put in $out/share for now
     substituteInPlace data/Makefile \
-      --replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
+      --replace-fail '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
   '';
 
   enableParallelBuilding = true;
@@ -66,4 +52,4 @@ stdenv.mkDerivation rec {
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
   };
-}
+})

From 64f4a38ca27d71724ad5ab7c6745cd562620ba71 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 29 Aug 2025 04:24:06 +0800
Subject: [PATCH 2/3] xbps: remove with lib

---
 pkgs/by-name/xb/xbps/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index f0780ad03d3a..8a8af14eb073 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/void-linux/xbps";
     description = "X Binary Package System";
-    platforms = platforms.linux; # known to not work on Darwin, at least
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    platforms = lib.platforms.linux; # known to not work on Darwin, at least
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ dtzWill ];
   };
 })

From d94119f94ebf77ce13ad7ce264217d80e80dd66c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 22 Nov 2025 02:11:58 +0000
Subject: [PATCH 3/3] xbps: 0.60.5 -> 0.60.6

Diff: https://github.com/void-linux/xbps/compare/0.60.5...0.60.6
---
 pkgs/by-name/xb/xbps/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 8a8af14eb073..cf79497e1e4d 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xbps";
-  version = "0.60.5";
+  version = "0.60.6";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
     tag = finalAttrs.version;
-    hash = "sha256-ht5hhaaE9QAsp+5xmOAYQE9fgL0GBuQvz0qB64z0cbs=";
+    hash = "sha256-euV8oi1na+mfILnnUHK5S8Pi6+QuOUA8KhD0FHUqM70=";
   };
 
   nativeBuildInputs = [