From 7ed1c991f11b15762da41ed337ab4dd5e0adbc11 Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Fri, 11 Jul 2025 19:08:47 -0400 Subject: [PATCH] ldmud: 3.6.7 -> 3.6.8 Notably this update allows dropping the libxm2 compat patch since the fix has landed upstream. See https://groups.google.com/g/ldmud-talk/c/yCvuj6WWEBk/m/40BonmTqCwAJ for more information. --- .../ld/ldmud/libxml2-2.12.0-compat.patch | 18 ------------------ pkgs/by-name/ld/ldmud/package.nix | 5 ++--- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch diff --git a/pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch b/pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch deleted file mode 100644 index 372bdc8cafbd..000000000000 --- a/pkgs/by-name/ld/ldmud/libxml2-2.12.0-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git src/pkg-xml2.c src/pkg-xml2.c -index 048ca38c..9ea4de35 100644 ---- src/pkg-xml2.c -+++ src/pkg-xml2.c -@@ -507,8 +507,13 @@ f_xml_generate (svalue_t *sp) - return sp; - } - -+#if LIBXML_VERSION >= 21200 -+static void -+xml_pkg_error_handler(void * userData, const xmlError *error) -+#else - static void - xml_pkg_error_handler(void * userData, xmlErrorPtr error) -+#endif - { - if (error) - { diff --git a/pkgs/by-name/ld/ldmud/package.nix b/pkgs/by-name/ld/ldmud/package.nix index c1ffc7f2f97e..f97923fa4e59 100644 --- a/pkgs/by-name/ld/ldmud/package.nix +++ b/pkgs/by-name/ld/ldmud/package.nix @@ -28,17 +28,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldmud"; - version = "3.6.7"; + version = "3.6.8"; src = fetchFromGitHub { owner = "ldmud"; repo = "ldmud"; tag = finalAttrs.version; - hash = "sha256-PkrjP7tSZMaj61Hsn++7+CumhqFPLbf0+eAI6afP9HA="; + hash = "sha256-ojOLM1vkuwuF0vXx6lCH0+OlyLkkOOnTJEUiZPpUhzo="; }; patches = [ - ./libxml2-2.12.0-compat.patch ./mysql-compat.patch ];