diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/by-name/wa/warp/package.nix similarity index 56% rename from pkgs/applications/networking/warp/default.nix rename to pkgs/by-name/wa/warp/package.nix index a41f48944c72d..823519ca4289c 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/by-name/wa/warp/package.nix @@ -19,39 +19,28 @@ libadwaita, zbar, gst_all_1, - Security, - Foundation, }: stdenv.mkDerivation rec { pname = "warp"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "warp"; rev = "v${version}"; - hash = "sha256-GRxZ3y1PdJpBDnGCfmOmZgN8n1aaYf9IhyszRwo3MjQ="; + hash = "sha256-RmihaFv+U11CAa5ax53WzpwYJ2PFOrhYt4w2iboW4m8="; }; - 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-w3gQhyRpma+aJY7IC9Vb3FdIECHZBJoSjiPmKpJ2nM8="; }; nativeBuildInputs = [ @@ -68,22 +57,16 @@ stdenv.mkDerivation rec { rustc ]; - buildInputs = - [ - glib - gtk4 - libadwaita - zbar - ] - ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-bad - ]) - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Security - Foundation - ]; + buildInputs = [ + glib + gtk4 + libadwaita + zbar + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-bad + ]); meta = { description = "Fast and secure file transfer"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec98c1903d3db..73a397603d596 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16246,10 +16246,6 @@ with pkgs; whispers = with python3Packages; toPythonApplication whispers; - warp = callPackage ../applications/networking/warp { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - warp-plus = callPackage ../by-name/wa/warp-plus/package.nix { buildGoModule = buildGo122Module; };