ejabberd: 26.03 → 26.04

as the patches are merged, the patch juggling can be removed

Author: toastal

pkgs/by-name/ej/ejabberd/package.nix

@@ -17,11 +17,9 @@
   gd,
   autoreconfHook,
   gawk,
-  applyPatches,
   fetchFromGitHub,
   fetchgit,
   fetchNpmDeps,
-  fetchpatch2,
   beamPackages,
   nixosTests,
   withMysql ? false,
@@ -146,7 +144,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "26.03";
+  version = "26.04";
 
   nativeBuildInputs = [
     makeWrapper
@@ -178,35 +176,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   npmDeps = lib.optionalDrvAttr npmToolingUsed (fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
-    src =
-      if builtins.isNull finalAttrs.patches || builtins.length finalAttrs.patches <= 0 then
-        finalAttrs.src
-      else
-        # A bit of a hack, but if the package*.json files are patched,
-        # fetchNpmDeps will be out of sync
-        applyPatches {
-          inherit (finalAttrs) src patches;
-          name = "${finalAttrs.pname}-${finalAttrs.version}-patched";
-        };
+    src = finalAttrs.src;
     hash = "sha256-MTyoc8ozrCi3W0CXmxyLpyU8v+vlUjcbLnv/1ev/Qqo=";
   });
 
   src = fetchFromGitHub {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-M38niXEW++SPAvqQ2cqEd23+w7lBDO5EPgu/QRdYbXo=";
+    hash = "sha256-PF65TgHvKeSEudEqqJVEotu2zgiWgGtRuNvbiyE0nwc=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Makes Bootstrap optional, drops jQuery
-      # https://github.com/processone/ejabberd/pull/4558
-      url = "https://patch-diff.githubusercontent.com/raw/processone/ejabberd/pull/4558.patch";
-      hash = "sha256-ETl2Zf7O6roxtf7DthJqL+tj4RvEfW94735sGM8x/GM=";
-    })
-  ];
-
   passthru.tests = {
     inherit (nixosTests) ejabberd;
   };

pkgs/by-name/ej/ejabberd/rebar-deps.nix

@@ -24,11 +24,11 @@ let
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.13.1";
+      version = "1.13.3";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.13.1";
-        sha256 = "sha256-oCTu98y094uftS431jhaV73RUL515Q1Ru8uvOamriD0=";
+        version = "1.13.3";
+        sha256 = "sha256-BWSKpNvM/uYqqnlLKSowWEY50DyR9cCGa+jDQ0tqb0g=";
       };
       beamDeps = [
         ezlib
@@ -188,11 +188,11 @@ let
     };
     fast_xml = builder {
       name = "fast_xml";
-      version = "1.1.58";
+      version = "1.1.60";
       src = fetchHex {
         pkg = "fast_xml";
-        version = "1.1.58";
-        sha256 = "sha256-o21uA6OYxTuhiekSv0x1WaNwSsY8UFDxJtR0FAGLTKA=";
+        version = "1.1.60";
+        sha256 = "sha256-z54nSd1HIEcCy3oEq1BFZC+gCW/fyc/y6cptPyq9N8U=";
       };
       beamDeps = [ p1_utils ];
     };