public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63597 from lilyball/ffsend 

ffsend: 0.2.46 -> 0.2.48
This commit is contained in:
Peter Hoeg 2019-06-21 11:33:41 +08:00 committed by GitHub
parent fcf2d5745e 68be0c72ee
commit e68986fe9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/misc/ffsend/Cargo.lock.patch
View File

@ -1,13 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index 2344bfd..08413d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -614,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "ffsend"
-version = "0.2.45"
+version = "0.2.46"
dependencies = [
"chbs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

9
pkgs/tools/misc/ffsend/default.nix
View File

@ -16,25 +16,22 @@ with rustPlatform;
buildRustPackage rec { buildRustPackage rec {
pname = "ffsend"; pname = "ffsend";
version = "0.2.46"; version = "0.2.48";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "timvisee"; owner = "timvisee";
repo = "ffsend"; repo = "ffsend";
rev = "v${version}"; rev = "v${version}";
sha256 = "048kmhy8l2dy7v1b3vzlhcw5qhnz82y1wki6wpd2nz8siyd7dnpi"; sha256 = "0hs74z76yayv3hxcpcfb1bsyq6dclyri7q7siap98nxlv650896n";
}; };
cargoSha256 = "09i44vpxbww972zyv393xxwk7wz26cnqzq4gi1mg4703h02jkpjk"; cargoSha256 = "1hkdpzz2q2lqnq15gr1npipmbvdda637ylgkzn443bl09jd3j1q6";
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ] buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
; ;
# Patch for v0.2.45 only
patches = [ ./Cargo.lock.patch ];
preBuild = stdenv.lib.optionalString (x11Support && usesX11) ( preBuild = stdenv.lib.optionalString (x11Support && usesX11) (
if preferXsel && xsel != null then '' if preferXsel && xsel != null then ''
export XSEL_PATH="${xsel}/bin/xsel" export XSEL_PATH="${xsel}/bin/xsel"