From 7f434211a192bd9850a1981d1fc9dedc0e484a2f Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 7 Oct 2025 00:18:47 +0900
Subject: [PATCH] cloudflare-warp: modernize

* Drop `with lib;`
* Prefer `finalAttrs` over `rec`
  As part of this refactoring, I dropped versionCheckProgram.
  It is the same as the default setting since befb2beebd2382aa9a6274b0fd609fbd872d8cc8.
---
 pkgs/by-name/cl/cloudflare-warp/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index 4e2644b37018..1b325a4b427c 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -36,7 +36,7 @@ let
     };
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   inherit version;
 
   pname = "cloudflare-warp" + lib.optionalString headless "-headless";
@@ -130,7 +130,6 @@ stdenv.mkDerivation rec {
   '';
 
   doInstallCheck = true;
-  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
   versionCheckProgramArg = "--version";
 
   passthru = {
@@ -156,22 +155,22 @@ stdenv.mkDerivation rec {
             rg '([^/]+)\.0\.yaml\b' --only-matching --replace '$1'
         )"
 
-        for platform in ${lib.escapeShellArgs meta.platforms}; do
-          update-source-version "${pname}" "$new_version" --ignore-same-version --source-key="sources.$platform"
+        for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
+          update-source-version "${finalAttrs.pname}" "$new_version" --ignore-same-version --source-key="sources.$platform"
         done
       '';
     });
   };
 
-  meta = with lib; {
+  meta = {
     description =
       "Replaces the connection between your device and the Internet with a modern, optimized, protocol"
       + lib.optionalString headless " (headless version)";
     homepage = "https://pkg.cloudflareclient.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
     mainProgram = "warp-cli";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       marcusramberg
     ];
     platforms = [
@@ -179,4 +178,4 @@ stdenv.mkDerivation rec {
       "aarch64-linux"
     ];
   };
-}
+})