From 25a572885e00e3d08f9e09098052a11dd15e9acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 22 Nov 2024 21:15:34 -0800
Subject: [PATCH 1/2] warp: 0.7.0 -> 0.8.0

Diff: https://gitlab.gnome.org/World/warp/-/compare/v0.7.0...v0.8.0
---
 pkgs/applications/networking/warp/default.nix | 26 +++++--------------
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix
index c41cc99df4b4..964bc29202aa 100644
--- a/pkgs/applications/networking/warp/default.nix
+++ b/pkgs/applications/networking/warp/default.nix
@@ -18,39 +18,28 @@
 , libadwaita
 , zbar
 , gst_all_1
-, Security
-, Foundation
 }:
 
 stdenv.mkDerivation rec {
   pname = "warp";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "warp";
     rev = "v${version}";
-    hash = "sha256-GRxZ3y1PdJpBDnGCfmOmZgN8n1aaYf9IhyszRwo3MjQ=";
+    hash = "sha256-BUCkENpL1soiYrM1vPNQAZGUbRj1KxWbbgXR0575zGU=";
   };
 
-  patches = [
-    # https://gitlab.gnome.org/World/warp/-/merge_requests/74
-    (fetchpatch2 {
-      name = "rust-1.80-compat.patch";
-      url = "https://gitlab.gnome.org/World/warp/-/commit/38747cc2dde79089df53fd8451ea2db13f9f3714.patch";
-      hash = "sha256-9P5LwCHaC6J5WR2OnjCaNE+4de/Jv6XGXS7bOfYrM7w=";
-    })
-  ];
-
   postPatch = ''
     patchShebangs build-aux
   '';
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src patches;
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-xF9AzcO2uawHu7XZay7Wwr2r+OVLbXhfSynnBYbVkZM=";
+    hash = "sha256-afRGCd30qJMqQeEOLDBRdVNJLMfa8/F9BO4Ib/OTtvI=";
   };
 
   nativeBuildInputs = [
@@ -76,10 +65,7 @@ stdenv.mkDerivation rec {
     gstreamer
     gst-plugins-base
     gst-plugins-bad
-  ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-    Foundation
-  ];
+  ]);
 
   meta = {
     description = "Fast and secure file transfer";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab255d872ce1..a0cae1bb1b60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16287,9 +16287,7 @@ with pkgs;
 
   whispers = with python3Packages; toPythonApplication whispers;
 
-  warp = callPackage ../applications/networking/warp {
-    inherit (darwin.apple_sdk.frameworks) Security Foundation;
-  };
+  warp = callPackage ../applications/networking/warp { };
 
   warp-plus = callPackage ../by-name/wa/warp-plus/package.nix {
     buildGoModule = buildGo122Module;

From 71527f55cd781890702b8a965f865301e671fb6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 22 Nov 2024 21:38:55 -0800
Subject: [PATCH 2/2] warp: move to pkgs/by-name

---
 .../networking/warp/default.nix => by-name/wa/warp/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/warp/default.nix => by-name/wa/warp/package.nix} (100%)

diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/by-name/wa/warp/package.nix
similarity index 100%
rename from pkgs/applications/networking/warp/default.nix
rename to pkgs/by-name/wa/warp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0cae1bb1b60..e5d35bf73374 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16287,8 +16287,6 @@ with pkgs;
 
   whispers = with python3Packages; toPythonApplication whispers;
 
-  warp = callPackage ../applications/networking/warp { };
-
   warp-plus = callPackage ../by-name/wa/warp-plus/package.nix {
     buildGoModule = buildGo122Module;
   };