From c218341c52e5847dde6abfeafb54219509364d55 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 10 Feb 2024 22:50:49 +0000 Subject: [PATCH] ripes: 2.2.6 -> 2.2.6-unstable-2024-01-02 Without the change the build fails on `master` as https://hydra.nixos.org/build/247694706: In file included from /build/source/external/VSRTL/interface/vsrtl_vcdfile.cpp:1: /build/source/external/VSRTL/interface/vsrtl_vcdfile.h:31:20: error: 'uint64_t' has not been declared 31 | void writeTime(uint64_t time); | ^~~~~~~~ As the fix was done in one of the external modules it seemed easier to pull unstable `master` version. Switched to `qt6` and checked if it starts. --- pkgs/applications/emulators/ripes/default.nix | 16 ++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index b3e58658b44f..e1438b1d0a80 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , pkg-config , qtbase @@ -8,19 +8,20 @@ , wrapQtAppsHook , cmake , python3 -, stdenv +, unstableGitUpdater }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ripes"; - version = "2.2.6"; + # Pulling unstable version as latest stable does not build against gcc-13. + version = "2.2.6-unstable-2024-01-02"; src = fetchFromGitHub { owner = "mortbopet"; repo = "Ripes"; - rev = "v${version}"; + rev = "0faf41b669a93a1944707cd7d111a5e9241425fe"; fetchSubmodules = true; - sha256 = "sha256-fRkab0G2zjK1VYzH21yhL7Cr0rS4I8ir8gwH9ALy60A="; + hash = "sha256-3+jibS1mGYBy9jmucytc7GvB1ZKRfh7aXtDty77hA3k="; }; nativeBuildInputs = [ @@ -49,11 +50,14 @@ mkDerivation rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A graphical processor simulator and assembly editor for the RISC-V ISA"; homepage = "https://github.com/mortbopet/Ripes"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "Ripes"; maintainers = with maintainers; [ rewine ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 869b115d5a1f..907b3c6cfc30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2802,7 +2802,7 @@ with pkgs; retrofe = callPackage ../applications/emulators/retrofe { }; - ripes = libsForQt5.callPackage ../applications/emulators/ripes { }; + ripes = qt6Packages.callPackage ../applications/emulators/ripes { }; rpcemu = callPackage ../applications/emulators/rpcemu { };