diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
| commit | 9becdcc5df71b47a5da84ad670e9a7eae9e0c65a (patch) | |
| tree | 2ddf0335eb393f89501e3753b50c3f7ab0552d12 /nixpkgs/pkgs/applications/networking/sync | |
| parent | 49f2a77ac9abc88c253f68952eda26557fc3b555 (diff) | |
| parent | ff96a0fa5635770390b184ae74debea75c3fd534 (diff) | |
| download | nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.gz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.bz2 nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.lz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.xz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.zst nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.zip | |
nixpkgs: merge nixos-unstable
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/sync')
4 files changed, 14 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix index 2f83873fbf8e..49fc578377c2 100644 --- a/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPythonApplication, fuse +{ lib, fetchFromGitHub, buildPythonApplication, fuse , appdirs, colorama, dateutil, requests, requests_toolbelt , fusepy, sqlalchemy }: diff --git a/nixpkgs/pkgs/applications/networking/sync/desync/default.nix b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix index 689a2b3fddaa..bc2776657c20 100644 --- a/nixpkgs/pkgs/applications/networking/sync/desync/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/desync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "desync"; diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix index 8dbbc0cf2218..1917fc40c0ee 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, wrapQtAppsHook, qtbase }: stdenv.mkDerivation rec { pname = "rclone-browser"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33"; }; + patches = [ + # patch for Qt 5.15, https://github.com/kapitainsky/RcloneBrowser/pull/126 + (fetchpatch { + url = "https://github.com/kapitainsky/RcloneBrowser/commit/ce9cf52e9c584a2cc85a5fa814b0fd7fa9cf0152.patch"; + sha256 = "0nm42flmaq7mva9j4dpp18i1xcv8gr08zfyb9apz1zwn79h1w0c8"; + }) + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index ef130d003295..e2199cfcfb92 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.53.4"; + version = "1.54.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d"; + sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk="; }; - vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; + vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M="; subPackages = [ "." ]; |