diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix similarity index 87% rename from pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix rename to pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix index 4bd6869d2def..7b2f6523f13b 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-MacOSX-universal.dmg"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; - sha256 = "0k72fdnx1zmyi9z5n3lazc7s70gcddxq0s73akp0al0y9hzq9prh"; + hash = "sha256-haD2QsBF9Dps1V/2tkkALAc7+kUY3PSNj7BjTIqnNcU="; }; sourceRoot = "."; diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix similarity index 92% rename from pkgs/tools/admin/realvnc-vnc-viewer/linux.nix rename to pkgs/by-name/re/realvnc-vnc-viewer/linux.nix index 552b1dc03539..30d2b60c2042 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { inherit pname version; - src = rec { + src = { "x86_64-linux" = fetchurl rec { name = "VNC-Viewer-${finalAttrs.version}-Linux-x64.rpm"; url = "https://downloads.realvnc.com/download/file/viewer.files/${name}"; - sha256 = "sha256-Ull9iNi8NxB12YwEThWE0P9k1xOV2LZnebuRrVH/zwI="; + hash = "sha256-KJZbH3mfxuyUslkYvB/RKquEsB7ayJSv6yNqfLmAsGI="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix similarity index 71% rename from pkgs/tools/admin/realvnc-vnc-viewer/default.nix rename to pkgs/by-name/re/realvnc-vnc-viewer/package.nix index 9776ececcfd2..6e1dc6762b14 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix @@ -4,19 +4,19 @@ }: let pname = "realvnc-vnc-viewer"; - version = "7.5.1"; + version = "7.12.0"; - meta = with lib; { + meta = { description = "VNC remote desktop client software by RealVNC"; homepage = "https://www.realvnc.com/en/connect/download/viewer/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = { fullName = "VNC Connect End User License Agreement"; url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf"; free = false; }; - maintainers = with maintainers; [ emilytrau onedragon ]; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; + maintainers = with lib.maintainers; [ emilytrau onedragon ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; mainProgram = "vncviewer"; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea9d798a9749..3d4dc2bf795c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12259,8 +12259,6 @@ with pkgs; rtss = callPackage ../development/tools/misc/rtss { }; - realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer { }; - re-isearch = callPackage ../applications/search/re-isearch { }; reason-shell = callPackage ../applications/science/misc/reason-shell { };