From 3a2fd9a3e2d9e6409ec8ff4d15904f56e1c37500 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 11 Sep 2025 20:15:06 +0100
Subject: [PATCH] cmake: drop sequence numbers from patches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These aren’t that helpful, since most of the patches don’t have
a strict ordering and a lot of them have been dropped anyway.
---
 ...n-bsd-ps-abspath.diff => darwin-bsd-ps-abspath.patch} | 0
 ...CURLOPT_PROXYTYPE-values.diff => fix-curl-8.16.patch} | 0
 ...-prefix-path.diff => nixpkgs-cmake-prefix-path.patch} | 0
 pkgs/by-name/cm/cmake/package.nix                        | 9 ++++-----
 .../cm/cmake/{001-search-path.diff => search-path.patch} | 0
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/by-name/cm/cmake/{007-darwin-bsd-ps-abspath.diff => darwin-bsd-ps-abspath.patch} (100%)
 rename pkgs/by-name/cm/cmake/{009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff => fix-curl-8.16.patch} (100%)
 rename pkgs/by-name/cm/cmake/{000-nixpkgs-cmake-prefix-path.diff => nixpkgs-cmake-prefix-path.patch} (100%)
 rename pkgs/by-name/cm/cmake/{001-search-path.diff => search-path.patch} (100%)

diff --git a/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff b/pkgs/by-name/cm/cmake/darwin-bsd-ps-abspath.patch
similarity index 100%
rename from pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff
rename to pkgs/by-name/cm/cmake/darwin-bsd-ps-abspath.patch
diff --git a/pkgs/by-name/cm/cmake/009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff b/pkgs/by-name/cm/cmake/fix-curl-8.16.patch
similarity index 100%
rename from pkgs/by-name/cm/cmake/009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff
rename to pkgs/by-name/cm/cmake/fix-curl-8.16.patch
diff --git a/pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff b/pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch
similarity index 100%
rename from pkgs/by-name/cm/cmake/000-nixpkgs-cmake-prefix-path.diff
rename to pkgs/by-name/cm/cmake/nixpkgs-cmake-prefix-path.patch
diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index a980f7623ddd..9880ae6f3d5f 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -59,9 +59,9 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Add NIXPKGS_CMAKE_PREFIX_PATH to cmake which is like CMAKE_PREFIX_PATH
     # except it is not searched for programs
-    ./000-nixpkgs-cmake-prefix-path.diff
+    ./nixpkgs-cmake-prefix-path.patch
     # Don't search in non-Nix locations such as /usr, but do search in our libc.
-    ./001-search-path.diff
+    ./search-path.patch
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     (replaceVars ./darwin-binary-paths.patch {
@@ -71,14 +71,13 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.
   ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) (
-    replaceVars ./007-darwin-bsd-ps-abspath.diff {
+    replaceVars ./darwin-bsd-ps-abspath.patch {
       ps = lib.getExe ps;
     }
   )
   ++ [
     # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134
-    # Fixes build against curl 8.16 and later
-    ./009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff
+    ./fix-curl-8.16.patch
   ];
 
   outputs = [
diff --git a/pkgs/by-name/cm/cmake/001-search-path.diff b/pkgs/by-name/cm/cmake/search-path.patch
similarity index 100%
rename from pkgs/by-name/cm/cmake/001-search-path.diff
rename to pkgs/by-name/cm/cmake/search-path.patch