MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #332064 from otavio/renode-fix

Browse source 
renode: move to linux-dotnet build, renode-unstable: 1.15.1+20240627git66a08265a -> 1.15.1+20240801git19eb5fb22
This commit is contained in:
Thiago Kenji Okada 2024-08-06 22:19:41 +01:00 committed by GitHub
commit 06aa9d05cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/by-name/re/renode-unstable/package.nix
View file

@ -5,11 +5,11 @@
renode.overrideAttrs (finalAttrs: _: { renode.overrideAttrs (finalAttrs: _: {
pname = "renode-unstable"; pname = "renode-unstable";
version = "1.15.1+20240716gita55a3d050"; version = "1.15.1+20240801git19eb5fb22";
src = fetchurl { src = fetchurl {
url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-cYK/PNXy+G6Cg6oY1U13MX03d2r0hwKVMp9f3LqpTd0="; hash = "sha256-dIyMQtFXvHivlzC+Y3TrWsN81/cETKTaucZY5r/x5rU=";
}; };
passthru.updateScript = passthru.updateScript =
@ -23,9 +23,9 @@ renode.overrideAttrs (finalAttrs: _: {
latestVersion=$( latestVersion=$(
curl -sS https://builds.renode.io \ curl -sS https://builds.renode.io \
| pup 'a text{}' \ | pup 'a text{}' \
| egrep 'renode-${versionRegex}\.linux-portable\.tar\.gz' \ | egrep 'renode-${versionRegex}\.linux-dotnet\.tar\.gz' \
| head -n1 \ | 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" \ update-source-version ${finalAttrs.pname} "$latestVersion" \

40
pkgs/by-name/re/renode/package.nix
View file

@ -7,9 +7,10 @@
, nix-update-script , nix-update-script
, glibcLocales , glibcLocales
, python3Packages , python3Packages
, gtk-sharp-2_0 , dotnetCorePackages
, gtk2-x11 , gtk-sharp-3_0
, screen , gtk3-x11
, dconf
}: }:
let let
@ -18,6 +19,13 @@ let
psutil psutil
pyyaml pyyaml
requests requests
tkinter
# from tools/csv2resd/requirements.txt
construct
# from tools/execution_tracer/requirements.txt
pyelftools
(robotframework.overrideDerivation (oldAttrs: { (robotframework.overrideDerivation (oldAttrs: {
src = fetchFromGitHub { src = fetchFromGitHub {
@ -34,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
version = "1.15.1"; version = "1.15.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-portable.tar.gz"; url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
hash = "sha256-W+JtyaXcYZD+iaVEFX6eatxV3/Vr4aZrsCLm1Aj+ISs="; hash = "sha256-NrbdkHxZ5g4dhmkhOIWTSxuY3GA1h1FM5JkWVPuQjjc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,9 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gtk2-x11 gtk-sharp-3_0
gtk-sharp-2_0
screen
]; ];
strictDeps = true; strictDeps = true;
@ -58,17 +64,18 @@ stdenv.mkDerivation (finalAttrs: {
mv * $out/libexec/renode mv * $out/libexec/renode
mv .renode-root $out/libexec/renode mv .renode-root $out/libexec/renode
chmod +x $out/libexec/renode/*.so
makeWrapper "$out/libexec/renode/renode" "$out/bin/renode" \ makeWrapper "$out/libexec/renode/renode" "$out/bin/renode" \
--prefix PATH : "$out/libexec/renode" \ --prefix PATH : "$out/libexec/renode:${lib.makeBinPath [ dotnetCorePackages.runtime_8_0 ]}" \
--suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \ --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \
--prefix PYTHONPATH : "${pythonLibs}" \
makeWrapper "$out/libexec/renode/renode-test" "$out/bin/renode-test" \ --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
--prefix PATH : "$out/libexec/renode" \ makeWrapper "$out/libexec/renode/renode-test" "$out/bin/renode-test" \
--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}" \ --prefix PYTHONPATH : "${pythonLibs}" \
--suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \
--set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive"
substituteInPlace "$out/libexec/renode/renode-test" \ substituteInPlace "$out/libexec/renode/renode-test" \
@ -82,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
meta = { meta = {
description = "Virtual development framework for complex embedded systems"; description = "Virtual development framework for complex embedded systems";
homepage = "https://renode.io"; homepage = "https://renode.io";
changelog = "https://github.com/renode/renode/blob/v${finalAttrs.version}/CHANGELOG.rst";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ otavio ]; maintainers = with lib.maintainers; [ otavio ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];