From beb6fe987b2428126c435cefe41262dcf22aa1ca Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 25 Nov 2024 20:09:46 +0900
Subject: [PATCH 1/2] cloudflare-warp: format with nixfmt-rfc-style

---
 pkgs/by-name/cl/cloudflare-warp/package.nix | 60 ++++++++++++---------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index dd8a48bddd26..cc629fb850a0 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -1,34 +1,39 @@
-{ stdenv
-, lib
-, autoPatchelfHook
-, copyDesktopItems
-, dbus
-, dpkg
-, fetchurl
-, gtk3
-, libpcap
-, makeDesktopItem
-, makeWrapper
-, nftables
-, nss
-, openssl
+{
+  stdenv,
+  lib,
+  autoPatchelfHook,
+  copyDesktopItems,
+  dbus,
+  dpkg,
+  fetchurl,
+  gtk3,
+  libpcap,
+  makeDesktopItem,
+  makeWrapper,
+  nftables,
+  nss,
+  openssl,
 }:
 
 stdenv.mkDerivation rec {
   pname = "cloudflare-warp";
   version = "2024.11.309";
 
-  suffix = {
-    aarch64-linux = "arm64";
-    x86_64-linux = "amd64";
-  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  suffix =
+    {
+      aarch64-linux = "arm64";
+      x86_64-linux = "amd64";
+    }
+    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   src = fetchurl {
     url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}.0_${suffix}.deb";
-    hash = {
-      aarch64-linux = "sha256-pdCPN4NxaQqWNRPZY1CN03KnTdzl62vJ3JNfxGozI4k=";
-      x86_64-linux = "sha256-THxXETyy08rBmvghrc8HIQ2cBSLeNVl8SkD43CVY/tE=";
-    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+    hash =
+      {
+        aarch64-linux = "sha256-pdCPN4NxaQqWNRPZY1CN03KnTdzl62vJ3JNfxGozI4k=";
+        x86_64-linux = "sha256-THxXETyy08rBmvghrc8HIQ2cBSLeNVl8SkD43CVY/tE=";
+      }
+      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 
   nativeBuildInputs = [
@@ -51,7 +56,11 @@ stdenv.mkDerivation rec {
     (makeDesktopItem {
       name = "com.cloudflare.WarpCli";
       desktopName = "Cloudflare Zero Trust Team Enrollment";
-      categories = [ "Utility" "Security" "ConsoleOnly" ];
+      categories = [
+        "Utility"
+        "Security"
+        "ConsoleOnly"
+      ];
       noDisplay = true;
       mimeTypes = [ "x-scheme-handler/com.cloudflare.warp" ];
       exec = "warp-cli --accept-tos registration token %u";
@@ -100,6 +109,9 @@ stdenv.mkDerivation rec {
       devpikachu
       marcusramberg
     ];
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
   };
 }

From 191f38e09634ccf0159a3d57eb958385fe401e67 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 25 Nov 2024 20:12:13 +0900
Subject: [PATCH 2/2] cloudflare-warp: add versionCheckHook

Preferred hook rather than passthru.tests.version here.
Especially this package is unfree and ofboard skips.

- https://github.com/NixOS/nixpkgs/pull/358956#discussion_r1871002548
- f42d4debf076b03f48b24fb59a7a75d0d8c29363
---
 pkgs/by-name/cl/cloudflare-warp/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix
index cc629fb850a0..a20d7bf95ddc 100644
--- a/pkgs/by-name/cl/cloudflare-warp/package.nix
+++ b/pkgs/by-name/cl/cloudflare-warp/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   autoPatchelfHook,
+  versionCheckHook,
   copyDesktopItems,
   dbus,
   dpkg,
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     dpkg
     autoPatchelfHook
+    versionCheckHook
     makeWrapper
     copyDesktopItems
   ];
@@ -99,6 +101,10 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/warp-svc --prefix PATH : ${lib.makeBinPath [ nftables ]}
   '';
 
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";
+  versionCheckProgramArg = [ "--version" ];
+
   meta = with lib; {
     description = "Replaces the connection between your device and the Internet with a modern, optimized, protocol";
     homepage = "https://pkg.cloudflareclient.com/packages/cloudflare-warp";