Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fcf2d5745e80
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e68986fe9a4d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 21, 2019

  1. ffsend: 0.2.46 -> 0.2.48

    @lilyball
    lilyball committed Jun 21, 2019
    Copy the full SHA
    68be0c7 View commit details

  2. Merge pull request #63597 from lilyball/ffsend 

    ffsend: 0.2.46 -> 0.2.48
    @peterhoeg
    peterhoeg authored Jun 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e68986f View commit details
Showing with 3 additions and 19 deletions.
  1. +0 −13 pkgs/tools/misc/ffsend/Cargo.lock.patch
  2. +3 −6 pkgs/tools/misc/ffsend/default.nix
13 changes: 0 additions & 13 deletions pkgs/tools/misc/ffsend/Cargo.lock.patch
View file

This file was deleted.

9 changes: 3 additions & 6 deletions pkgs/tools/misc/ffsend/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,25 +16,22 @@ with rustPlatform;

buildRustPackage rec {
pname = "ffsend";
version = "0.2.46";
version = "0.2.48";

src = fetchFromGitLab {
owner = "timvisee";
repo = "ffsend";
rev = "v${version}";
sha256 = "048kmhy8l2dy7v1b3vzlhcw5qhnz82y1wki6wpd2nz8siyd7dnpi";
sha256 = "0hs74z76yayv3hxcpcfb1bsyq6dclyri7q7siap98nxlv650896n";
};

cargoSha256 = "09i44vpxbww972zyv393xxwk7wz26cnqzq4gi1mg4703h02jkpjk";
cargoSha256 = "1hkdpzz2q2lqnq15gr1npipmbvdda637ylgkzn443bl09jd3j1q6";

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]
++ 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) (
if preferXsel && xsel != null then ''
export XSEL_PATH="${xsel}/bin/xsel"