From e882bcae4350b5d8986f5466d2bab702bb22b5a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Oct 2021 05:17:24 +0300 Subject: [PATCH 01/10] [Backport release-21.05] teamviewer: fix #96633, #44307 and #97148 + 15.15.5 -> 15.18.5 -> 15.22.3 (#141439) * teamviewer: fix issue #96633 Fix teamviewer's breakage post 15.5.3 -> 15.15.5. Teamviewer client was no longer able to connect to its backing server as it now uses dbus to do so. Following changes were required: - add missing dbus and polkit service/policy files to package. - add missing dbus lib to `LD_LIBRARY_PATH`. Changes to the nixos module as a separate changeset. (cherry picked from commit 506966d15658d8a411f364f47bbc0f3f9366dba3) * nixos/teamviewer: fix issue #96633 Add teamviewer package as a dbus package now that the client / server communication depends on dbus. (cherry picked from commit 200e959995fa8088b5722bc8255109c03f2a4f78) * nixos/teamviewer: fix issue #44307 Move to a forefront launch of the daemon. Doing so allowed us to move the service from forking to simple to avoid the missing pid error log. Also: - Make the dbus dependency explicit. (cherry picked from commit 953bbc0d7373102cf89625dc3bb7ab8e91134069) * teamviewer: 15.15.5 -> 15.18.5 Upgrading to the last version still using qt5.14. Later version will be using qt5.15 which is not in 21.05 stable branch. This fixes us the crash observed in 15.15.5 when stopping the service. (cherry picked from commit db889eb9137a859eedfc5b402de84271c0659662) * teamviewer: refactor executable wrapping This centralizes `PATH` and `LD_LIBRARY_PATH`, avoid multiple layers of wrappers. Refactor as suggested by @Artturin in PR provided patch: . (cherry picked from commit c55bc5bfd3377d54f5b6153d09c033cceadfcc05) * teamviewer: fix 97148 (busybox installed issue) Simply add `coreutils` as a runtime dependency which will prevent teamviewer from using incomplete busybox implementation of expected gnu binaries. As suggested by @Artturin in PR comment: . (cherry picked from commit 4fb188e1d190f2e08053dba3e2e95fff1e29183a) * teamviewer: 15.18.5 -> 15.22.3 Required move from libsForQt514 -> libsForQt515. Note that this changset won't be backportable to 21.05. (cherry picked from commit 975ab7f3a02ac0232afe7920a8f7d78fc22d5ccb) Co-authored-by: Raymond Gauthier --- .../services/monitoring/teamviewer.nix | 9 ++-- .../networking/remote/teamviewer/default.nix | 52 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index ce9e57a187cd..e2271e571c40 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -24,18 +24,21 @@ in environment.systemPackages = [ pkgs.teamviewer ]; + services.dbus.packages = [ pkgs.teamviewer ]; + systemd.services.teamviewerd = { description = "TeamViewer remote control daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "NetworkManager-wait-online.service" "network.target" ]; + after = [ "NetworkManager-wait-online.service" "network.target" "dbus.service" ]; + requires = [ "dbus.service" ]; preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; startLimitIntervalSec = 60; startLimitBurst = 10; serviceConfig = { - Type = "forking"; - ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -d"; + Type = "simple"; + ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -f"; PIDFile = "/run/teamviewerd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-abort"; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 1b564e8daf4b..158f2aa327e0 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,16 +1,16 @@ { mkDerivation, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg-utils, dbus -, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc -, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes +, qtbase, qtwebkit, qtwebengine, qtx11extras, qtquickcontrols, getconf, glibc +, libXrandr, libX11, libXext, libXdamage, libXtst, libSM, libXfixes, coreutils , wrapQtAppsHook }: mkDerivation rec { pname = "teamviewer"; - version = "15.15.5"; + version = "15.22.3"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-H/CSc2RcjI+Fm8awYcXm3ioAJpbSNEMwGVrTozMux3A="; + sha256 = "15fvzhdq7mnx2l2w4byvij8ww16qwdlkbadal60rm66yzv79mv9w"; }; unpackPhase = '' @@ -19,7 +19,7 @@ mkDerivation rec { ''; nativeBuildInputs = [ autoPatchelfHook makeWrapper wrapQtAppsHook ]; - buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; + buildInputs = [ dbus getconf qtbase qtwebkit qtwebengine qtx11extras libX11 ]; propagatedBuildInputs = [ qtquickcontrols ]; installPhase = '' @@ -28,6 +28,7 @@ mkDerivation rec { rm -R \ $out/share/teamviewer/logfiles \ $out/share/teamviewer/config \ + $out/share/teamviewer/tv_bin/RTlib \ $out/share/teamviewer/tv_bin/xdg-utils \ $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} @@ -38,6 +39,27 @@ mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg-utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + declare in_script_dir="./opt/teamviewer/tv_bin/script" + + install -d "$out/share/dbus-1/services" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.service" "$out/share/dbus-1/services" + substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.service" \ + --replace '/opt/teamviewer/tv_bin/TeamViewer' \ + "$out/share/teamviewer/tv_bin/TeamViewer" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.Desktop.service" "$out/share/dbus-1/services" + substituteInPlace "$out/share/dbus-1/services/com.teamviewer.TeamViewer.Desktop.service" \ + --replace '/opt/teamviewer/tv_bin/TeamViewer_Desktop' \ + "$out/share/teamviewer/tv_bin/TeamViewer_Desktop" + + install -d "$out/share/dbus-1/system.d" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.Daemon.conf" "$out/share/dbus-1/system.d" + + install -d "$out/share/polkit-1/actions" + install -m 644 "$in_script_dir/com.teamviewer.TeamViewer.policy" "$out/share/polkit-1/actions" + substituteInPlace "$out/share/polkit-1/actions/com.teamviewer.TeamViewer.policy" \ + --replace '/opt/teamviewer/tv_bin/script/execscript' \ + "$out/share/teamviewer/tv_bin/script/execscript" + for i in 16 20 24 32 48 256; do size=$i"x"$i @@ -51,17 +73,23 @@ mkDerivation rec { --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ --replace '/var/run/' '/run/' + ''; - wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" - wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}" + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ getconf coreutils ]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libXrandr libX11 libXext libXdamage libXtst libSM libXfixes dbus ]}" + ]; - wrapQtApp $out/share/teamviewer/tv_bin/script/teamviewer - wrapQtApp $out/bin/teamviewer + postFixup = '' + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd ''${makeWrapperArgs[@]} + # tv_bin/script/teamviewer runs tvw_main which runs tv_bin/TeamViewer + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} + wrapProgram $out/share/teamviewer/tv_bin/teamviewer-config ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} + wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop ''${makeWrapperArgs[@]} ''${qtWrapperArgs[@]} ''; dontStrip = true; + dontWrapQtApps = true; preferLocalBuild = true; meta = with lib; { @@ -69,6 +97,6 @@ mkDerivation rec { license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jagajaga dasuxullebt ]; + maintainers = with maintainers; [ jagajaga dasuxullebt jraygauthier ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd7b710e3b14..e9bee718f8fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8959,7 +8959,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt515.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; From 404f0f62c50c3ac0ac403dc42aaf08c47ebcfdc0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Sep 2021 18:00:00 -0500 Subject: [PATCH 02/10] nodejs-16_x: 16.8.0 -> 16.9.0 https://github.com/nodejs/node/releases/tag/v16.9.0 (cherry picked from commit f60eca11eff3966f2b39a1c6e8acd1a17cd48da7) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 805e62be8d62..c2f1f02ee378 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.8.0"; - sha256 = "14k3njj382im3q4k6dhsxdk07gs81hw2k0nrixfvlw1964k04ydq"; + version = "16.9.0"; + sha256 = "0vv6igmnz4fkr4i8gczxxw2qgcvydkpy71w3lskah8zw1lh69rqs"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 24201b18485787f3a5eabd6549e44b68eab62888 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Sep 2021 04:20:00 +0000 Subject: [PATCH 03/10] nodejs-16_x: 16.9.0 -> 16.9.1 https://github.com/nodejs/node/releases/tag/v16.9.1 (cherry picked from commit 35f805cf9fcc5788aab8f59cfd963d62ffee8203) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index c2f1f02ee378..2b2b042ac680 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.9.0"; - sha256 = "0vv6igmnz4fkr4i8gczxxw2qgcvydkpy71w3lskah8zw1lh69rqs"; + version = "16.9.1"; + sha256 = "070k8i9a65r03xdchr200qixv053mim5irfvgg4pl3h57k2hxxcp"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From de72e6df139aef0991df79ff5f79bb5140bfc5e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Sep 2021 09:04:02 +0000 Subject: [PATCH 04/10] nodejs-16_x: 16.9.1 -> 16.10.0 (cherry picked from commit 76ba113d716004273d26ecf5a61e5f89cd7c41d6) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 2b2b042ac680..f89f98f63200 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.9.1"; - sha256 = "070k8i9a65r03xdchr200qixv053mim5irfvgg4pl3h57k2hxxcp"; + version = "16.10.0"; + sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From c4f4ea01f3e2ed58bd59e62f5d08b07b64ffe74f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 29 Sep 2021 03:07:06 +0000 Subject: [PATCH 05/10] nodejs: 14.17.6 -> 14.18.0 (cherry picked from commit f5a81c9e61902733bfcdbefbd8c9973cdfc44871) --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 1ec04407f899..cb8d8aac3632 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.6"; - sha256 = "0pmd0haav2ychhcsw44klx6wfn8c7j1rsw08rc8hcm5i3h5wsn7l"; + version = "14.18.0"; + sha256 = "0naqv0aglsqy51pyiz42xz7wx5pfsbyscpdl8rir6kmfl1c52j3b"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From cae668bd0647e891b9474ec755cfad2f4bc1db31 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Oct 2021 12:18:00 -0500 Subject: [PATCH 06/10] nodejs-16_x: 16.10.0 -> 16.11.0 https://github.com/nodejs/node/releases/tag/v16.11.0 (cherry picked from commit 545fca99f20d7109e6ffe50f985de50e7392ad52) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index f89f98f63200..89a35565064d 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.10.0"; - sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p"; + version = "16.11.0"; + sha256 = "1bk5f47hm409129w437h8qdvmqjdr11awblvnhkfsp911nyk3xnk"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 9a317d95134c5bb34d47112bb92ddd2fabad2917 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 03:25:26 +0000 Subject: [PATCH 07/10] nodejs-12_x: 12.22.6 -> 12.22.7 (cherry picked from commit 611da87f3fc5cc26d42aede17aca8b10b6d7f327) --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 7717dfa6c9cf..54f077e71821 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.6"; - sha256 = "0yhgkcp7lx5nglxsrybbjymx1fys3wkbbhkj6h6652gnp0b2y0n2"; + version = "12.22.7"; + sha256 = "0sszg3k5jd26hymqhs5328kvnxsb3x78sg4gpna9lrvh92s26snc"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 1084c0387c4b45e2355193018b580d247d200838 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 03:50:38 +0000 Subject: [PATCH 08/10] nodejs-16_x: 16.11.0 -> 16.11.1 (cherry picked from commit ed75efa8783d32390254b17a208e3f0ef6c0e4d5) --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 89a35565064d..698108a42b60 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.11.0"; - sha256 = "1bk5f47hm409129w437h8qdvmqjdr11awblvnhkfsp911nyk3xnk"; + version = "16.11.1"; + sha256 = "0y32mdv8zs35la2bny8d9rxjvj1vr8z079ji1g6ajc2yw96pyn37"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 6159be2511b4bec667060b637480da5c097261b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 13 Oct 2021 03:13:21 +0000 Subject: [PATCH 09/10] nodejs: 14.18.0 -> 14.18.1 (cherry picked from commit 574ab51aa96701a1a6cec7435c6945a181fe2d63) --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index cb8d8aac3632..0e0bde32b2f8 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.18.0"; - sha256 = "0naqv0aglsqy51pyiz42xz7wx5pfsbyscpdl8rir6kmfl1c52j3b"; + version = "14.18.1"; + sha256 = "1vc9rypkgr5i5y946jnyr9jjpydxvm74p1s17rg2zayzvlddg89z"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 564cb4d81d4f734dd068684adec5a60077397fe9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 6 Oct 2021 06:51:19 +0200 Subject: [PATCH 10/10] =?UTF-8?q?alt-ergo:=202.4.0=20=E2=86=92=202.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0abc796ce281eeb737039c12613734d33611658b) --- pkgs/applications/science/logic/alt-ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 963015b11d50..837f25e320f7 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,13 +2,13 @@ let pname = "alt-ergo"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = pname; rev = version; - sha256 = "1jm1yrvsg8iyfp9bb728zdx2i7yb6z7minjrfs27k5ncjqkjm65g"; + sha256 = "0hglj1p0753w2isds01h90knraxa42d2jghr35dpwf9g8a1sm9d3"; }; useDune2 = true;