chore: sort entries alphabetically

fossar · Dec 8, 2024 · 4d1ea7f · 4d1ea7f
1 parent 108d1a7
commit 4d1ea7f
Showing 1 changed file with 27 additions and 27 deletions.
diff --git a/pkgs/package-overrides.nix b/pkgs/package-overrides.nix
@@ -270,6 +270,21 @@ in
       else
         prev.extensions.grpc;
 
+    iconv = prev.extensions.iconv.overrideAttrs (attrs: {
+      patches =
+        let
+          upstreamPatches =
+            attrs.patches or [];
+
+          ourPatches =
+            lib.optionals (lib.versionOlder prev.php.version "8.0") [
+              # Header path defaults to FHS location, preventing the configure script from detecting errno support.
+              ./patches/iconv-header-path.patch
+            ];
+        in
+        ourPatches ++ upstreamPatches;
+    });
+
     igbinary =
       if lib.versionOlder prev.php.version "7.0" then
         prev.extensions.igbinary.overrideAttrs (attrs: {
@@ -283,6 +298,18 @@ in
       else
         prev.extensions.igbinary;
 
+    imap =
+      if lib.versionOlder prev.php.version "8.1" && pkgs.stdenv.cc.isClang then
+        prev.extensions.imap.overrideAttrs (attrs: {
+          patches = (attrs.patches or [ ]) ++ [
+            (pkgs.fetchpatch {
+              url = "https://github.com/php/php-src/commit/f9cbeaa0338520f6c4a4b17555f558634b0dd955.patch";
+              hash = "sha256-Gzxsh99e0HIrDz6r+9XWUw1BQLKWuRm8RQq9p0KxBVs=";
+            })
+          ];
+        })
+      else prev.extensions.imap;
+
     inotify =
       if lib.versionOlder prev.php.version "7.0" then
         prev.extensions.inotify.overrideAttrs (attrs: {
@@ -334,33 +361,6 @@ in
       NIX_CFLAGS_COMPILE = (attrs.NIX_CFLAGS_COMPILE or "") + " -Wno-register";
     });
 
-    iconv = prev.extensions.iconv.overrideAttrs (attrs: {
-      patches =
-        let
-          upstreamPatches =
-            attrs.patches or [];
-
-          ourPatches =
-            lib.optionals (lib.versionOlder prev.php.version "8.0") [
-              # Header path defaults to FHS location, preventing the configure script from detecting errno support.
-              ./patches/iconv-header-path.patch
-            ];
-        in
-        ourPatches ++ upstreamPatches;
-    });
-
-    imap =
-      if lib.versionOlder prev.php.version "8.1" && pkgs.stdenv.cc.isClang then
-        prev.extensions.imap.overrideAttrs (attrs: {
-          patches = (attrs.patches or [ ]) ++ [
-            (pkgs.fetchpatch {
-              url = "https://github.com/php/php-src/commit/f9cbeaa0338520f6c4a4b17555f558634b0dd955.patch";
-              hash = "sha256-Gzxsh99e0HIrDz6r+9XWUw1BQLKWuRm8RQq9p0KxBVs=";
-            })
-          ];
-        })
-      else prev.extensions.imap;
-
     json =
       if lib.versionAtLeast prev.php.version "8.0" then
         throw "php.extensions.json is enabled by default in PHP >= 8.0."