From 8e7fcdaa47cca6586ba5db028761d9663f850884 Mon Sep 17 00:00:00 2001 From: Samuel Silva Date: Sat, 13 Dec 2025 16:10:57 -0300 Subject: [PATCH 1/2] renode: dotnet sdk 6 -> 9 When we pass the `TargetFrameworks` in `dotnetFlags` we got some weird unexpected behavior, the `generateAssemblyInfo.sh` wasn't executed, AssemblyInfo is not generated and we hit [this](https://github.com/renode/renode/blob/master/src/Renode/Program.cs#L161) exception. But this `generateAssemblyInfo` script only replaces version and commit rev in a `.template` file to generate a `.cs` file. We can do this step via Nix and everything works correctly. Signed-off-by: Samuel Silva --- pkgs/by-name/re/renode/deps.json | 249 ++++++++++++++++++++--------- pkgs/by-name/re/renode/package.nix | 25 +-- 2 files changed, 185 insertions(+), 89 deletions(-) diff --git a/pkgs/by-name/re/renode/deps.json b/pkgs/by-name/re/renode/deps.json index c50fb3ed5d39..3ec3cdaf13f6 100644 --- a/pkgs/by-name/re/renode/deps.json +++ b/pkgs/by-name/re/renode/deps.json @@ -129,6 +129,11 @@ "version": "4.5.0", "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY=" }, + { + "pname": "Microsoft.CSharp", + "version": "4.6.0", + "hash": "sha256-16OdEKbPLxh+jLYS4cOiGRX/oU6nv3KMF4h5WnZAsHs=" + }, { "pname": "Microsoft.CSharp", "version": "4.7.0", @@ -139,11 +144,6 @@ "version": "1.0.0", "hash": "sha256-HX3iOXH75I1L7eNihCbMNDDpcotfZpfQUdqdRTGM6FY=" }, - { - "pname": "Microsoft.Extensions.ObjectPool", - "version": "5.0.10", - "hash": "sha256-tAjiU3w0hdPAGUitszxZ6jtEilRn977MY7N5eZMx0x0=" - }, { "pname": "Microsoft.Extensions.ObjectPool", "version": "6.0.16", @@ -244,11 +244,6 @@ "version": "4.4.0", "hash": "sha256-ZumsykAAIYKmVtP4QI5kZ0J10n2zcOZZ69PmAK0SEiE=" }, - { - "pname": "Microsoft.Win32.SystemEvents", - "version": "4.7.0", - "hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4=" - }, { "pname": "Microsoft.Win32.SystemEvents", "version": "5.0.0", @@ -286,13 +281,13 @@ }, { "pname": "NETStandard.Library", - "version": "2.0.0", - "hash": "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0=" + "version": "1.6.1", + "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=" }, { "pname": "NETStandard.Library", - "version": "2.0.3", - "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + "version": "2.0.0", + "hash": "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0=" }, { "pname": "Newtonsoft.Json", @@ -339,6 +334,11 @@ "version": "4.3.0", "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" }, + { + "pname": "runtime.any.System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" + }, { "pname": "runtime.any.System.IO", "version": "4.3.0", @@ -394,6 +394,11 @@ "version": "4.3.0", "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, + { + "pname": "runtime.any.System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" + }, { "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -414,6 +419,21 @@ "version": "4.3.0", "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, + { + "pname": "runtime.native.System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" + }, + { + "pname": "runtime.native.System.Net.Http", + "version": "4.3.0", + "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" + }, + { + "pname": "runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" + }, { "pname": "runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -429,6 +449,11 @@ "version": "4.3.0", "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" }, + { + "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", + "version": "4.3.0", + "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" + }, { "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", "version": "4.3.0", @@ -459,6 +484,11 @@ "version": "4.3.0", "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" }, + { + "pname": "runtime.unix.System.Console", + "version": "4.3.0", + "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + }, { "pname": "runtime.unix.System.Diagnostics.Debug", "version": "4.3.0", @@ -469,6 +499,16 @@ "version": "4.3.0", "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" }, + { + "pname": "runtime.unix.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" + }, + { + "pname": "runtime.unix.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" + }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", @@ -489,20 +529,20 @@ "version": "4.1.0", "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" }, + { + "pname": "System.AppContext", + "version": "4.3.0", + "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" + }, { "pname": "System.Buffers", "version": "4.3.0", "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.CodeDom", - "version": "6.0.0", - "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ=" + "version": "8.0.0", + "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338=" }, { "pname": "System.Collections", @@ -514,6 +554,11 @@ "version": "4.3.0", "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" }, + { + "pname": "System.Collections.Concurrent", + "version": "4.3.0", + "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" + }, { "pname": "System.Collections.Immutable", "version": "5.0.0", @@ -579,6 +624,11 @@ "version": "1.0.31", "hash": "sha256-w9ApcUJr7jYP4Vf5+efIIqoWmr5v9R56W4uC0n8KktQ=" }, + { + "pname": "System.Console", + "version": "4.3.0", + "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" + }, { "pname": "System.Diagnostics.Debug", "version": "4.0.11", @@ -589,6 +639,11 @@ "version": "4.3.0", "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.3.0", + "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" + }, { "pname": "System.Diagnostics.EventLog", "version": "6.0.0", @@ -619,11 +674,6 @@ "version": "4.7.0", "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk=" }, - { - "pname": "System.Drawing.Common", - "version": "5.0.0", - "hash": "sha256-8PgFBZ3Agd+UI9IMxr4fRIW8IA1hqCl15nqlLTJETzk=" - }, { "pname": "System.Drawing.Common", "version": "5.0.3", @@ -634,11 +684,6 @@ "version": "4.0.11", "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" }, - { - "pname": "System.Formats.Asn1", - "version": "5.0.0", - "hash": "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs=" - }, { "pname": "System.Formats.Asn1", "version": "6.0.0", @@ -654,6 +699,11 @@ "version": "4.3.0", "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" }, + { + "pname": "System.Globalization.Calendars", + "version": "4.3.0", + "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" + }, { "pname": "System.Globalization.Extensions", "version": "4.3.0", @@ -669,6 +719,16 @@ "version": "4.3.0", "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, + { + "pname": "System.IO.Compression", + "version": "4.3.0", + "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" + }, + { + "pname": "System.IO.Compression.ZipFile", + "version": "4.3.0", + "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" + }, { "pname": "System.IO.FileSystem", "version": "4.0.1", @@ -720,9 +780,24 @@ "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" }, { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" + "pname": "System.Net.Http", + "version": "4.3.0", + "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" + }, + { + "pname": "System.Net.NameResolution", + "version": "4.3.0", + "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" + }, + { + "pname": "System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" + }, + { + "pname": "System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, { "pname": "System.Numerics.Vectors", @@ -871,8 +946,8 @@ }, { "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "4.5.3", - "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak=" + "version": "4.5.2", + "hash": "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", @@ -909,11 +984,21 @@ "version": "4.3.0", "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, + { + "pname": "System.Runtime.InteropServices.RuntimeInformation", + "version": "4.0.0", + "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" + }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" }, + { + "pname": "System.Runtime.Numerics", + "version": "4.3.0", + "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" + }, { "pname": "System.Runtime.Serialization.Primitives", "version": "4.1.1", @@ -929,16 +1014,26 @@ "version": "4.7.0", "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, { "pname": "System.Security.AccessControl", "version": "6.0.0", "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, + { + "pname": "System.Security.Cryptography.Algorithms", + "version": "4.3.0", + "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.3.0", + "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" + }, { "pname": "System.Security.Cryptography.Cng", "version": "4.5.0", @@ -950,35 +1045,45 @@ "hash": "sha256-MvVSJhAojDIvrpuyFmcSVRSZPl3dRYOI9hSptbA+6QA=" }, { - "pname": "System.Security.Cryptography.Cng", - "version": "5.0.0", - "hash": "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo=" + "pname": "System.Security.Cryptography.Csp", + "version": "4.3.0", + "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" + }, + { + "pname": "System.Security.Cryptography.Encoding", + "version": "4.3.0", + "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" + }, + { + "pname": "System.Security.Cryptography.OpenSsl", + "version": "4.3.0", + "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" }, { "pname": "System.Security.Cryptography.Pkcs", "version": "4.7.0", "hash": "sha256-lZMmOxtg5d7Oyoof8p6awVALUsYQstc2mBNNrQr9m9c=" }, - { - "pname": "System.Security.Cryptography.Pkcs", - "version": "5.0.0", - "hash": "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE=" - }, { "pname": "System.Security.Cryptography.Pkcs", "version": "6.0.1", "hash": "sha256-OJ4NJ8E/8l86aR+Hsw+k/7II63Y/zPS+MgC+UfeCXHM=" }, + { + "pname": "System.Security.Cryptography.Primitives", + "version": "4.3.0", + "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" + }, + { + "pname": "System.Security.Cryptography.X509Certificates", + "version": "4.3.0", + "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + }, { "pname": "System.Security.Cryptography.Xml", "version": "4.7.0", "hash": "sha256-67k24CjNisMJUtnyWb08V/t7mBns+pxLyNhBG5YXiCE=" }, - { - "pname": "System.Security.Cryptography.Xml", - "version": "5.0.0", - "hash": "sha256-0LyU7KmpFRFZFCugAgDnp93Unw3rL4hFSqx6GNqov9o=" - }, { "pname": "System.Security.Cryptography.Xml", "version": "6.0.1", @@ -995,9 +1100,14 @@ "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40=" }, { - "pname": "System.Security.Permissions", - "version": "5.0.0", - "hash": "sha256-BI1Js3L4R32UkKOLMTAVpXzGlQ27m+oaYHSV3J+iQfc=" + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.3.0", + "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" }, { "pname": "System.Security.Principal.Windows", @@ -1009,11 +1119,6 @@ "version": "4.7.0", "hash": "sha256-rWBM2U8Kq3rEdaa1MPZSYOOkbtMGgWyB8iPrpIqmpqg=" }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, { "pname": "System.ServiceModel.Duplex", "version": "4.8.1", @@ -1119,11 +1224,6 @@ "version": "4.3.0", "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", @@ -1144,6 +1244,11 @@ "version": "4.3.0", "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" }, + { + "pname": "System.Threading.Timer", + "version": "4.3.0", + "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" + }, { "pname": "System.ValueTuple", "version": "4.5.0", @@ -1154,11 +1259,6 @@ "version": "4.7.0", "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU=" }, - { - "pname": "System.Windows.Extensions", - "version": "5.0.0", - "hash": "sha256-fzWnaRBCDuoq3hQsGIi0PvCEJN7yGaaJvlU6pq4052A=" - }, { "pname": "System.Xml.ReaderWriter", "version": "4.0.11", @@ -1174,6 +1274,11 @@ "version": "4.0.11", "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" }, + { + "pname": "System.Xml.XDocument", + "version": "4.3.0", + "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + }, { "pname": "System.Xml.XmlDocument", "version": "4.3.0", diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 85f4a4dd846d..cad261b20253 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -2,8 +2,7 @@ buildDotnetModule, cmake, dconf, - dotnet-runtime_8, - dotnet-sdk_6, + dotnetCorePackages, fetchFromGitHub, fetchpatch, gcc, @@ -23,13 +22,6 @@ let rev = "d3d69f8f17ed164ee23e46f0c06844a69bf4c004"; hash = "sha256-wR3heL58NOQLENwCzL4lPM4KuvT/ON7dlc/KUqrlRjg="; }; - assemblyVersion = - s: - let - part = lib.strings.splitString "-" s; - result = builtins.head part; - in - result; pythonLibs = with python3Packages; @@ -79,17 +71,18 @@ buildDotnetModule rec { projectFile = "Renode_NET.sln"; - dotnet-runtime = dotnet-runtime_8; - dotnet-sdk = dotnet-sdk_6; + dotnet-sdk = dotnetCorePackages.sdk_9_0; nugetDeps = ./deps.json; patches = [ ./renode-test.patch ]; + dotnetFlags = [ "-p:TargetFrameworks=net9.0" ]; + prePatch = '' - substituteInPlace tools/building/createAssemblyInfo.sh \ - --replace CURRENT_INFORMATIONAL_VERSION="`git rev-parse --short=8 HEAD`" \ - CURRENT_INFORMATIONAL_VERSION="${builtins.substring 0 8 src.rev}" + sed -i 's/AssemblyVersion("%VERSION%.*")/AssemblyVersion("${version}.0")/g' src/Renode/Properties/AssemblyInfo.template + sed -i 's/AssemblyInformationalVersion("%INFORMATIONAL_VERSION%")/AssemblyInformationalVersion("${src.rev}")/g' src/Renode/Properties/AssemblyInfo.template + mv src/Renode/Properties/AssemblyInfo.template src/Renode/Properties/AssemblyInfo.cs ''; postPatch = '' @@ -105,7 +98,6 @@ buildDotnetModule rec { patchShebangs build.sh tools/ # Fixes determinism build error - sed -i 's/AssemblyVersion("%VERSION%.*")/AssemblyVersion("${assemblyVersion version}")/g' src/Renode/Properties/AssemblyInfo.template sed -i 's/AssemblyVersion("1.0.*")/AssemblyVersion("1.0.0.0")/g' lib/AntShell/AntShell/Properties/AssemblyInfo.cs lib/CxxDemangler/CxxDemangler/Properties/AssemblyInfo.cs ''; @@ -117,7 +109,6 @@ buildDotnetModule rec { cmake gcc ]; - runtimeDeps = [ gtk3 mono @@ -169,7 +160,7 @@ buildDotnetModule rec { ln -s $out/lib/*.so src/Infrastructure/src/Emulator/Cores/bin/Release/lib ''; - dotnetInstallFlags = [ "-p:TargetFramework=net6.0" ]; + dotnetInstallFlags = [ "-p:TargetFramework=net9.0" ]; postInstall = '' mkdir -p $out/lib/renode From 88833d294eeaf9bda3cd29be1d6d00da12694906 Mon Sep 17 00:00:00 2001 From: Samuel Silva Date: Mon, 15 Dec 2025 10:12:22 -0300 Subject: [PATCH 2/2] renode-unstable: fix to work correctly with dotnet 9 Signed-off-by: Samuel Silva --- pkgs/by-name/re/renode-unstable/package.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 6a2f03fd70d5..a9f77aa6edf2 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -2,7 +2,17 @@ fetchFromGitHub, nix-update-script, renode, + lib, }: +let + normalizedVersion = + v: + let + parts = lib.splitString "-" v; + result = builtins.head parts; + in + result; +in renode.overrideAttrs (old: rec { pname = "renode-unstable"; version = "1.16.0-unstable-2025-08-08"; @@ -16,9 +26,9 @@ renode.overrideAttrs (old: rec { }; prePatch = '' - substituteInPlace tools/building/createAssemblyInfo.sh \ - --replace CURRENT_INFORMATIONAL_VERSION="`git rev-parse --short=8 HEAD`" \ - CURRENT_INFORMATIONAL_VERSION="${builtins.substring 0 8 src.rev}" + sed -i 's/AssemblyVersion("%VERSION%.*")/AssemblyVersion("${normalizedVersion version}.0")/g' src/Renode/Properties/AssemblyInfo.template + sed -i 's/AssemblyInformationalVersion("%INFORMATIONAL_VERSION%")/AssemblyInformationalVersion("${src.rev}")/g' src/Renode/Properties/AssemblyInfo.template + mv src/Renode/Properties/AssemblyInfo.template src/Renode/Properties/AssemblyInfo.cs ''; passthru = old.passthru // {