graphia: 3.2 -> 4.2

The main change is the build fis against `gcc-13`
https://hydra.nixos.org/build/247540136:

    /build/source/source/thirdparty/breakpad/src/client/linux/handler/minidump_descriptor.h:115:3: error: 'uintptr_t' does not name a type
      115 |   uintptr_t address_within_principal_mapping() const {
          |   ^~~~~~~~~

Changes:
- https://github.com/graphia-app/graphia/releases/tag/4.0
- https://github.com/graphia-app/graphia/releases/tag/4.1
- https://github.com/graphia-app/graphia/releases/tag/4.2
This commit is contained in:
Sergei Trofimovich 2024-02-08 23:18:01 +00:00
parent a5d28c9bff
commit e006445420
2 changed files with 16 additions and 15 deletions

View File

@ -1,47 +1,47 @@
{ stdenv
, lib
, cmake
, git
, fetchFromGitHub
, fetchpatch
, wrapQtAppsHook
, qtbase
, qtquickcontrols2
, qtgraphicaleffects
, qtdeclarative
, qtsvg
, qtwebengine
}:
stdenv.mkDerivation rec {
pname = "graphia";
version = "3.2";
version = "4.2";
src = fetchFromGitHub {
owner = "graphia-app";
repo = "graphia";
rev = version;
sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg=";
sha256 = "sha256-8+tlQbTr6BGx+/gjviuNrQQWcxC/j6dJ+PxwB4fYmqQ=";
};
patches = [
# Fix for a breakpad incompatibility with glibc>2.33
# https://github.com/pytorch/pytorch/issues/70297
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
./breakpad-sigstksz.patch
# FIXME: backport patch fixing build with Qt 5.15, remove for next release
# Fix gcc-13 build:
(fetchpatch {
url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch";
hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM=";
name = "gcc-13.patch";
url = "https://github.com/graphia-app/graphia/commit/78fb55a4d73f96e9a182de433c7da60330bd5b5e.patch";
hash = "sha256-waI2ur3gOKMQvqB2Qnyz7oMOMConl3jLMVKKmOmTpJs=";
})
];
nativeBuildInputs = [
cmake
git # needs to define some hash as a version
wrapQtAppsHook
];
buildInputs = [
qtbase
qtquickcontrols2
qtgraphicaleffects
qtdeclarative
qtsvg
qtwebengine
];
meta = with lib; {
@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
description = "A visualisation tool for the creation and analysis of graphs.";
homepage = "https://graphia.app";
license = licenses.gpl3Only;
mainProgram = "Graphia";
maintainers = [ maintainers.bgamari ];
platforms = platforms.all;
};

View File

@ -21389,7 +21389,7 @@ with pkgs;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
graphinder = callPackage ../tools/security/graphinder { };