From 364796f33bb42de9b70b7471c1f14186a604c5e1 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 3 Aug 2024 16:31:42 -0300
Subject: [PATCH 1/2] renode: move to linux-dotnet build

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 pkgs/by-name/re/renode-unstable/package.nix |  8 ++---
 pkgs/by-name/re/renode/package.nix          | 36 ++++++++++++---------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index db387982336e..176c0d262bad 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -8,8 +8,8 @@ renode.overrideAttrs (finalAttrs: _: {
   version = "1.15.1+20240716gita55a3d050";
 
   src = fetchurl {
-    url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz";
-    hash = "sha256-cYK/PNXy+G6Cg6oY1U13MX03d2r0hwKVMp9f3LqpTd0=";
+    url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
+    hash = "sha256-W7RDun+Pq6s9Yt6GbFCQEsipNOvS9nUEPSVorsZqp80=";
   };
 
   passthru.updateScript =
@@ -23,9 +23,9 @@ renode.overrideAttrs (finalAttrs: _: {
       latestVersion=$(
         curl -sS https://builds.renode.io \
           | pup 'a text{}' \
-          | egrep 'renode-${versionRegex}\.linux-portable\.tar\.gz' \
+          | egrep 'renode-${versionRegex}\.linux-dotnet\.tar\.gz' \
           | head -n1 \
-          | sed -e 's,renode-\(.*\)\.linux-portable\.tar\.gz,\1,g'
+          | sed -e 's,renode-\(.*\)\.linux-dotnet\.tar\.gz,\1,g'
       )
 
       update-source-version ${finalAttrs.pname} "$latestVersion" \
diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix
index 8b1774e776ea..2a3cd46c2723 100644
--- a/pkgs/by-name/re/renode/package.nix
+++ b/pkgs/by-name/re/renode/package.nix
@@ -7,9 +7,10 @@
 , nix-update-script
 , glibcLocales
 , python3Packages
-, gtk-sharp-2_0
-, gtk2-x11
-, screen
+, dotnetCorePackages
+, gtk-sharp-3_0
+, gtk3-x11
+, dconf
 }:
 
 let
@@ -18,6 +19,13 @@ let
     psutil
     pyyaml
     requests
+    tkinter
+
+    # from tools/csv2resd/requirements.txt
+    construct
+
+    # from tools/execution_tracer/requirements.txt
+    pyelftools
 
     (robotframework.overrideDerivation (oldAttrs: {
       src = fetchFromGitHub {
@@ -34,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
   version = "1.15.1";
 
   src = fetchurl {
-    url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-portable.tar.gz";
-    hash = "sha256-W+JtyaXcYZD+iaVEFX6eatxV3/Vr4aZrsCLm1Aj+ISs=";
+    url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
+    hash = "sha256-NrbdkHxZ5g4dhmkhOIWTSxuY3GA1h1FM5JkWVPuQjjc=";
   };
 
   nativeBuildInputs = [
@@ -44,9 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   propagatedBuildInputs = [
-    gtk2-x11
-    gtk-sharp-2_0
-    screen
+    gtk-sharp-3_0
   ];
 
   strictDeps = true;
@@ -58,17 +64,18 @@ stdenv.mkDerivation (finalAttrs: {
 
     mv * $out/libexec/renode
     mv .renode-root $out/libexec/renode
-    chmod +x $out/libexec/renode/*.so
 
     makeWrapper "$out/libexec/renode/renode" "$out/bin/renode" \
-      --prefix PATH : "$out/libexec/renode" \
-      --suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \
+      --prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
+      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
+      --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
+      --prefix PYTHONPATH : "${pythonLibs}" \
       --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
-
     makeWrapper "$out/libexec/renode/renode-test" "$out/bin/renode-test" \
-      --prefix PATH : "$out/libexec/renode" \
+      --prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
+      --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
+      --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
       --prefix PYTHONPATH : "${pythonLibs}" \
-      --suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \
       --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
 
     substituteInPlace "$out/libexec/renode/renode-test" \
@@ -82,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Virtual development framework for complex embedded systems";
     homepage = "https://renode.io";
-    changelog = "https://github.com/renode/renode/blob/v${finalAttrs.version}/CHANGELOG.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ otavio ];
     platforms = [ "x86_64-linux" ];

From 20e15d1eacfc9bd09cf810760ba83480c2b01368 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 3 Aug 2024 16:37:09 -0300
Subject: [PATCH 2/2] renode-unstable: 1.15.1+20240716gita55a3d050 ->
 1.15.1+20240801git19eb5fb22

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 pkgs/by-name/re/renode-unstable/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index 176c0d262bad..1510d352767a 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -5,11 +5,11 @@
 
 renode.overrideAttrs (finalAttrs: _: {
   pname = "renode-unstable";
-  version = "1.15.1+20240716gita55a3d050";
+  version = "1.15.1+20240801git19eb5fb22";
 
   src = fetchurl {
     url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
-    hash = "sha256-W7RDun+Pq6s9Yt6GbFCQEsipNOvS9nUEPSVorsZqp80=";
+    hash = "sha256-dIyMQtFXvHivlzC+Y3TrWsN81/cETKTaucZY5r/x5rU=";
   };
 
   passthru.updateScript =