warp: 0.7.0 -> 0.8.0 (#358325)
This commit is contained in:
commit
a6d28112ea
@ -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";
|
@ -16251,10 +16251,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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user