pyrox.dev
lol
graphene: 1.10.6 -> 1.10.8
https://github.com/ebassi/graphene/compare/1.10.6...1.10.8
+13
-59
pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
+13
-59
pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
···
1
-
From 57bed86429db9d871f1442c94f14e94e38972ca3 Mon Sep 17 00:00:00 2001
1
+
From d68fcb793d70032e978ecf8e0577eea955a741cf Mon Sep 17 00:00:00 2001
2
2
From: worldofpeace <worldofpeace@protonmail.ch>
3
-
Date: Thu, 16 May 2019 21:15:15 -0400
3
+
Date: Sun, 10 Apr 2022 12:02:10 +0800
4
4
Subject: [PATCH] meson: add options for tests installation dirs
5
5
6
6
---
7
7
meson_options.txt | 6 ++++++
8
-
tests/meson.build | 23 ++++++++++++++++-------
9
-
2 files changed, 22 insertions(+), 7 deletions(-)
8
+
tests/meson.build | 13 +++++++++++--
9
+
2 files changed, 17 insertions(+), 2 deletions(-)
10
10
11
11
diff --git a/meson_options.txt b/meson_options.txt
12
12
index b9a2fb5..4b8629f 100644
···
23
23
+ value: '',
24
24
+ description: 'Installation directory for binary files in tests')
25
25
diff --git a/tests/meson.build b/tests/meson.build
26
-
index 77281f5..7522456 100644
26
+
index 2b925e7..3276849 100644
27
27
--- a/tests/meson.build
28
28
+++ b/tests/meson.build
29
29
@@ -21,8 +21,17 @@ unit_tests = [
···
32
32
33
33
-installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path)
34
34
-installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path)
35
-
+test_suffix = join_paths('installed-tests', graphene_api_path)
35
+
+installed_test_suffix = join_paths('installed-tests', graphene_api_path)
36
36
+
37
-
+test_datadir = join_paths(get_option('installed_test_datadir'), test_suffix)
38
-
+if test_datadir == ''
39
-
+ test_datadir = join_paths(get_option('prefix'), get_option('datadir'), test_suffix)
37
+
+installed_test_datadir = join_paths(get_option('installed_test_datadir'), installed_test_suffix)
38
+
+if installed_test_datadir == ''
39
+
+ installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), installed_test_suffix)
40
40
+endif
41
41
+
42
-
+test_bindir = join_paths(get_option('installed_test_bindir'), test_suffix)
43
-
+if test_bindir == ''
44
-
+ test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), test_suffix)
42
+
+installed_test_bindir = join_paths(get_option('installed_test_bindir'), installed_test_suffix)
43
+
+if installed_test_bindir == ''
44
+
+ installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), installed_test_suffix)
45
45
+endif
46
46
47
47
# Make tests conditional on having mutest-1 installed system-wide, or
48
48
# available as a subproject
49
-
@@ -40,13 +49,13 @@ if mutest_dep.found()
50
-
output: wrapper,
51
-
command: [
52
-
gen_installed_test,
53
-
- '--testdir=@0@'.format(installed_test_bindir),
54
-
+ '--testdir=@0@'.format(test_bindir),
55
-
'--testname=@0@'.format(unit),
56
-
'--outdir=@OUTDIR@',
57
-
'--outfile=@0@'.format(wrapper),
58
-
],
59
-
install: get_option('installed_tests'),
60
-
- install_dir: installed_test_datadir,
61
-
+ install_dir: test_datadir,
62
-
)
63
-
64
-
test(unit,
65
-
@@ -55,7 +64,7 @@ if mutest_dep.found()
66
-
include_directories: graphene_inc,
67
-
c_args: common_cflags,
68
-
install: get_option('installed_tests'),
69
-
- install_dir: installed_test_bindir,
70
-
+ install_dir: test_bindir,
71
-
),
72
-
env: ['MUTEST_OUTPUT=tap'],
73
-
protocol: 'tap',
74
-
@@ -66,17 +75,18 @@ endif
75
-
if build_gir and host_system == 'linux' and not meson.is_cross_build()
76
-
foreach unit: ['introspection.py']
77
-
wrapper = '@0@.test'.format(unit)
78
-
+ install_data(unit, install_dir: test_bindir)
79
-
custom_target(wrapper,
80
-
output: wrapper,
81
-
command: [
82
-
gen_installed_test,
83
-
- '--testdir=@0@'.format(installed_test_bindir),
84
-
+ '--testdir=@0@'.format(test_bindir),
85
-
'--testname=@0@'.format(unit),
86
-
'--outdir=@OUTDIR@',
87
-
'--outfile=@0@'.format(wrapper),
88
-
],
89
-
install: get_option('installed_tests'),
90
-
- install_dir: installed_test_datadir,
91
-
+ install_dir: test_datadir,
92
-
)
93
-
94
-
test(unit,
95
49
--
96
-
2.31.1
50
+
2.35.1
97
51
+14
-3
pkgs/development/libraries/graphene/default.nix
+14
-3
pkgs/development/libraries/graphene/default.nix
···
1
-
{ lib, stdenv
1
+
{ stdenv
2
+
, lib
2
3
, fetchFromGitHub
4
+
, fetchpatch
3
5
, nix-update-script
4
6
, pkg-config
5
7
, meson
···
17
19
18
20
stdenv.mkDerivation rec {
19
21
pname = "graphene";
20
-
version = "1.10.6";
22
+
version = "1.10.8";
21
23
22
24
outputs = [ "out" ]
23
25
++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" "installedTests" ];
···
26
28
owner = "ebassi";
27
29
repo = pname;
28
30
rev = version;
29
-
sha256 = "v6YH3fRMTzhp7wmU8in9ukcavzHmOAW54EK9ZwQyFxc=";
31
+
sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI=";
30
32
};
31
33
32
34
patches = [
33
35
# Add option for changing installation path of installed tests.
34
36
./0001-meson-add-options-for-tests-installation-dirs.patch
37
+
38
+
# Disable flaky simd_operators_reciprocal test
39
+
# https://github.com/ebassi/graphene/issues/246
40
+
(fetchpatch {
41
+
url = "https://github.com/ebassi/graphene/commit/4fbdd07ea3bcd0964cca3966010bf71cb6fa8209.patch";
42
+
sha256 = "uFkkH0u4HuQ/ua1mfO7sJZ7MPrQdV/JON7mTYB4DW80=";
43
+
includes = [ "tests/simd.c" ];
44
+
revert = true;
45
+
})
35
46
];
36
47
37
48
depsBuildBuild = [