package: restore original curl after cl/5842

Change-Id: I09b5cdd1a91ef471233cfcaf1c7ec1d16a6a6964

package.nix

@@ -21,8 +21,6 @@
   callPackage,
   capnproto,
   cmake,
-  curl-lix ? __forDefaults.curl-lix,
-  fetchpatch2,
   curl,
   doxygen,
   git,
@@ -125,37 +123,6 @@
       NIX_CFLAGS_COMPILE = (oldAttrs.NIX_CFLAGS_COMPILE or "") + " -DINITIAL_MARK_STACK_SIZE=1048576";
     });
 
-    curl-lix =
-      # curl 8.21.0 /somehow/ breaks Lix unit tests.
-      # See https://github.com/NixOS/nixpkgs/issues/534713
-      # FIXME remove once fixed
-      if lib.versionAtLeast curl.version "8.21" then
-        curl.overrideAttrs (
-          {
-            patches ? [ ],
-            ...
-          }:
-          {
-            patches = patches ++ [
-              # See https://github.com/curl/curl/commit/2a2104f3cff44bb28bb570a093be52bbeeed8f23
-              (fetchpatch2 {
-                name = "fix-wakeup-consumption-revert.patch";
-                url = "https://github.com/curl/curl/commit/2a2104f3cff44bb28bb570a093be52bbeeed8f23.patch";
-                hash = "sha256-dkwr1ZaR7XB408JxeIKhuHxJrlwf3J01jL6lnOLXo1I=";
-                revert = true;
-              })
-            ];
-          }
-        )
-      else
-        # Filter out the version backported in Nixpkgs
-        # https://github.com/NixOS/nixpkgs/issues/534713#event-27130052199
-        curl.overrideAttrs (prev: {
-          patches = lib.filter (patch: !lib.strings.hasSuffix "fix-wakeup-consumption.patch" patch) (
-            prev.patches or [ ]
-          );
-        });
-
     # Avoid a bunch of build closure of the tracer, we just need the dtrace
     # generator.
     systemtap-lix = buildPackages.linuxPackages.systemtap.override { withStap = false; };
@@ -531,7 +498,7 @@ stdenv.mkDerivation (finalAttrs: {
     lsof
     zstd
     # For mTLS tests
-    curl-lix
+    curl
   ]
   ++ lib.optional useLld lldBintools
   ++ lib.optional hostPlatform.isLinux util-linuxMinimal
@@ -550,7 +517,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    curl-lix
+    curl
     bzip2
     xz
     brotli
@@ -762,7 +729,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     inherit (__forDefaults)
       boehmgc-nix
-      curl-lix
       build-release-notes
       pegtl
       ;