From d29ec8753d5b6be6225f2d9e9072cdc7d9ea63c3 Mon Sep 17 00:00:00 2001 From: Jichao Ouyang Date: Tue, 23 Nov 2021 18:42:25 +1100 Subject: [PATCH 1/3] synology-drive-client: merge with "synology-drive" --- .../synology-drive-client/default.nix | 2 +- .../networking/synology-drive/default.nix | 45 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 pkgs/applications/networking/synology-drive/default.nix diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 990e9691516d..6a902de4a3cd 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -8,7 +8,7 @@ let description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; license = licenses.unfree; - maintainers = with maintainers; [ jcouyang ]; + maintainers = with maintainers; [ jcouyang MoritzBoehme ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/applications/networking/synology-drive/default.nix b/pkgs/applications/networking/synology-drive/default.nix deleted file mode 100644 index 20b0f1168cb3..000000000000 --- a/pkgs/applications/networking/synology-drive/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }: - -mkDerivation rec { - pname = "synology-drive"; - subVersion = "12674"; - version = "3.0.1-${subVersion}"; - - src = fetchurl { - url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb"; - sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a"; - }; - - nativeBuildInputs = [ autoPatchelfHook dpkg ]; - - buildInputs = [ glibc gnome.nautilus ]; - - unpackPhase = '' - mkdir -p $out - dpkg -x $src $out - ''; - - installPhase = '' - # synology-drive executable - cp -av $out/usr/* $out - rm -rf $out/usr - - runHook postInstall - ''; - - postInstall = '' - substituteInPlace $out/bin/synology-drive --replace /opt $out/opt - ''; - - meta = with lib; { - homepage = "https://www.synology.com/"; - description = "Synchronize files between client and Synology NAS."; - longDescription = '' - Drive for PC, the desktop utility of the DSM add-on package. - Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers. - ''; - license = licenses.unfree; - maintainers = with maintainers; [ MoritzBoehme ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89402dbb52b3..40fe6edb9212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27185,8 +27185,6 @@ with pkgs; mlt-qt5 = libsForQt514.mlt; }; - synology-drive = libsForQt5.callPackage ../applications/networking/synology-drive { }; - taxi = callPackage ../applications/networking/ftp/taxi { }; librep = callPackage ../development/libraries/librep { }; From b5080c691411e66dadd75286d97f26e72dd835c4 Mon Sep 17 00:00:00 2001 From: MoritzBoehme Date: Thu, 25 Nov 2021 20:57:02 +0100 Subject: [PATCH 2/3] synology-drive: added alias error message which points to synology-drive-client synology-drive-client: clear fmt and update error message --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9767edf86b51..a0f0efda747b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -901,6 +901,7 @@ mapAliases ({ swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 swtpm-tpm2 = swtpm; # added 2021-02-26 syncthing-cli = syncthing; # added 2021-04-06 + synology-drive = throw "synology-drive has been superseded by synology-drive-client"; # added 2021-11-26 system_config_printer = system-config-printer; # added 2016-01-03 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 From 92484333d1ccc43e2797d80a01743bb10f58ae3b Mon Sep 17 00:00:00 2001 From: Jichao Ouyang Date: Fri, 26 Nov 2021 21:32:16 +1100 Subject: [PATCH 3/3] synology-drive-client: inherit meta in both drv --- .../applications/networking/synology-drive-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 6a902de4a3cd..459e38970ddd 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -13,7 +13,7 @@ let }; linux = qt5.mkDerivation { - inherit pname version; + inherit pname version meta; src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; @@ -43,7 +43,7 @@ let }; darwin = stdenv.mkDerivation { - inherit pname version; + inherit pname version meta; src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg";