diff options
| author | kirillrdy <kirillrdy@gmail.com> | 2024-02-26 16:36:40 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-26 16:36:40 +1100 |
| commit | e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b (patch) | |
| tree | 1b8c90b48b3ae9ae6cc42568b2c8d0028f19b158 | |
| parent | a6d0d38f447f4e6562349847d000372aee65d87d (diff) | |
| parent | c218341c52e5847dde6abfeafb54219509364d55 (diff) | |
| download | nixlib-e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b.tar nixlib-e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b.tar.gz nixlib-e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b.tar.bz2 nixlib-e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b.tar.lz nixlib-e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b.tar.xz nixlib-e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b.tar.zst nixlib-e3474e1d1e53b70e2b2af73ea26d6340e82f6b8b.zip | |
Merge pull request #287889 from trofi/ripes-gcc-13-fix-update
ripes: 2.2.6 -> 2.2.6-unstable-2024-01-02
| -rw-r--r-- | pkgs/applications/emulators/ripes/default.nix | 16 | ||||
| -rw-r--r-- | 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 a4b477b4a2f8..295b6a1a589d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2804,7 +2804,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 { }; |