diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 052e1338eb6d..cf79497e1e4d 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.6";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
-    rev = version;
-    hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14=";
+    tag = finalAttrs.version;
+    hash = "sha256-euV8oi1na+mfILnnUHK5S8Pi6+QuOUA8KhD0FHUqM70=";
   };
 
   nativeBuildInputs = [
@@ -37,33 +37,19 @@ 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;
 
-  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 ];
   };
-}
+})