From 9ab658e703b48e656fb36c6c444f1aa9ae94fb9d Mon Sep 17 00:00:00 2001
From: jackyliu16 <18922251299@163.com>
Date: Tue, 2 Jul 2024 12:09:33 +0800
Subject: [PATCH 1/2] realvnc-vnc-viewer: move to by-name/

---
 pkgs/{tools/admin => by-name/re}/realvnc-vnc-viewer/darwin.nix  | 0
 pkgs/{tools/admin => by-name/re}/realvnc-vnc-viewer/linux.nix   | 0
 .../default.nix => by-name/re/realvnc-vnc-viewer/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 4 files changed, 2 deletions(-)
 rename pkgs/{tools/admin => by-name/re}/realvnc-vnc-viewer/darwin.nix (100%)
 rename pkgs/{tools/admin => by-name/re}/realvnc-vnc-viewer/linux.nix (100%)
 rename pkgs/{tools/admin/realvnc-vnc-viewer/default.nix => by-name/re/realvnc-vnc-viewer/package.nix} (100%)

diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix
similarity index 100%
rename from pkgs/tools/admin/realvnc-vnc-viewer/darwin.nix
rename to pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix
diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
similarity index 100%
rename from pkgs/tools/admin/realvnc-vnc-viewer/linux.nix
rename to pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix
similarity index 100%
rename from pkgs/tools/admin/realvnc-vnc-viewer/default.nix
rename to pkgs/by-name/re/realvnc-vnc-viewer/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8112217897fee..009e8f52f6e7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12293,8 +12293,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 { };

From e4da2fc8367c9017d2c8f509bee83241c0c3770f Mon Sep 17 00:00:00 2001
From: jackyliu16 <18922251299@163.com>
Date: Tue, 2 Jul 2024 12:17:48 +0800
Subject: [PATCH 2/2] realvnc-vnc-viewer: 7.5.1 -> 7.12.0

---
 pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix  |  2 +-
 pkgs/by-name/re/realvnc-vnc-viewer/linux.nix   |  4 ++--
 pkgs/by-name/re/realvnc-vnc-viewer/package.nix | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix b/pkgs/by-name/re/realvnc-vnc-viewer/darwin.nix
index 4bd6869d2def1..7b2f6523f13bc 100644
--- a/pkgs/by-name/re/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/by-name/re/realvnc-vnc-viewer/linux.nix b/pkgs/by-name/re/realvnc-vnc-viewer/linux.nix
index 552b1dc035392..30d2b60c20427 100644
--- a/pkgs/by-name/re/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/by-name/re/realvnc-vnc-viewer/package.nix b/pkgs/by-name/re/realvnc-vnc-viewer/package.nix
index 9776ececcfd24..6e1dc6762b141 100644
--- a/pkgs/by-name/re/realvnc-vnc-viewer/package.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