colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

graphia: 3.1 -> 3.2

Browse Source
This commit is contained in:
K900 2022-11-26 15:48:41 +03:00
parent 40d2157f92
commit 420fd2d25b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/science/misc/graphia/default.nix
View File

@ -2,6 +2,7 @@
, lib , lib
, cmake , cmake
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, wrapQtAppsHook , wrapQtAppsHook
, qtbase , qtbase
, qtquickcontrols2 , qtquickcontrols2
@ -10,13 +11,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "graphia"; pname = "graphia";
version = "3.1"; version = "3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "graphia-app"; owner = "graphia-app";
repo = "graphia"; repo = "graphia";
rev = version; rev = version;
sha256 = "sha256-mqoK5y2h0JSiE9VtwawCgc1+qETzuefLVUpgFPcNFnk="; sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg=";
}; };
patches = [ patches = [
@ -24,6 +25,12 @@ stdenv.mkDerivation rec {
# https://github.com/pytorch/pytorch/issues/70297 # https://github.com/pytorch/pytorch/issues/70297
# https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e
./breakpad-sigstksz.patch ./breakpad-sigstksz.patch
# FIXME: backport patch fixing build with Qt 5.15, remove for next release
(fetchpatch {
url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch";
hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/top-level/all-packages.nix
View File

@ -19078,11 +19078,7 @@ with pkgs;
ghcid = haskellPackages.ghcid.bin; ghcid = haskellPackages.ghcid.bin;
graphia = libsForQt514.callPackage ../applications/science/misc/graphia { graphia = libsForQt5.callPackage ../applications/science/misc/graphia { };
# Using gcc 10 because this fails to build with gcc 11
# Error similar to this https://github.com/RPCS3/rpcs3/issues/10291
stdenv = gcc10Stdenv;
};
graphinder = callPackage ../tools/security/graphinder { }; graphinder = callPackage ../tools/security/graphinder { };