diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/by-name/rc/rclone-browser/package.nix similarity index 51% rename from pkgs/applications/networking/sync/rclone/browser.nix rename to pkgs/by-name/rc/rclone-browser/package.nix index 3b6be7da5e6b..ddb7109bda79 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/by-name/rc/rclone-browser/package.nix @@ -4,8 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - wrapQtAppsHook, - qtbase, + qt5, }: stdenv.mkDerivation rec { @@ -15,33 +14,34 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "kapitainsky"; repo = "RcloneBrowser"; - rev = version; - sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33"; + tag = version; + hash = "sha256-Y0QFzpvAV01k9fYN5iMpxd8A+ThLePDtxdG7eX2bk5E="; }; 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"; + hash = "sha256-iAEeYDqW//CvSsu7j0B+aLMeIgr3NiKT2vVgVakTpFo="; }) ]; nativeBuildInputs = [ cmake - wrapQtAppsHook + qt5.wrapQtAppsHook ]; - cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; + cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ]; - buildInputs = [ qtbase ]; + buildInputs = [ qt5.qtbase ]; - meta = with lib; { - inherit (src.meta) homepage; + meta = { + changelog = "https://github.com/kapitainsky/RcloneBrowser/blob/${src.tag}/CHANGELOG.md"; + homepage = "https://github.com/kapitainsky/RcloneBrowser"; description = "Graphical Frontend to Rclone written in Qt"; mainProgram = "rclone-browser"; - license = licenses.unlicense; - platforms = platforms.linux; - maintainers = with maintainers; [ dotlambda ]; + license = lib.licenses.unlicense; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ dotlambda ]; }; } diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/by-name/rc/rclone/package.nix similarity index 100% rename from pkgs/applications/networking/sync/rclone/default.nix rename to pkgs/by-name/rc/rclone/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfb14a45b91d..293fe85c5651 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12367,10 +12367,6 @@ with pkgs; fftw = fftwSinglePrec; }; - rclone = callPackage ../applications/networking/sync/rclone { }; - - rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; - reaper = callPackage ../applications/audio/reaper { jackLibrary = libjack2; # Another option is "pipewire.jack". ffmpeg = ffmpeg_4-headless;