tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
geogram: 1.8.6 -> 1.9.2
Petr Zahradnik
1 year ago
ced568bf
1fbdba42
+33
-19
1 changed file
expand all
collapse all
unified
split
pkgs
by-name
ge
geogram
package.nix
+33
-19
pkgs/by-name/ge/geogram/package.nix
···
1
1
{
2
2
lib,
3
3
stdenv,
4
4
-
fetchurl,
5
4
fetchFromGitHub,
6
6
-
7
5
cmake,
8
6
doxygen,
9
7
zlib,
10
8
python3Packages,
9
9
+
nix-update-script,
10
10
+
fetchpatch2,
11
11
}:
12
12
13
13
let
14
14
+
exploragram = fetchFromGitHub {
15
15
+
owner = "BrunoLevy";
16
16
+
repo = "exploragram";
17
17
+
rev = "3190f685653f8aa75b7c4604d008c59a999f1bb6";
18
18
+
hash = "sha256-9ePCOyQWSxu12PtHFSxfoDcvTtxvYR3T68sU3cAfZiE=";
19
19
+
};
14
20
testdata = fetchFromGitHub {
15
21
owner = "BrunoLevy";
16
22
repo = "geogram.data";
17
17
-
rev = "43dd49054a78d9b3fb8ef729f48ab47a272c718c";
18
18
-
hash = "sha256-F2Lyt4nEOczVYLz6WLny+YrsxNwREBGPkProN8NHFN4=";
23
23
+
rev = "ceab6179189d23713b902b6f26ea2ff36aea1515";
24
24
+
hash = "sha256-zUmYI6+0IdDkglLzzWHS8ZKmc5O6aJ2X4IwRBouRIxI=";
19
25
};
20
26
in
21
27
stdenv.mkDerivation rec {
22
28
pname = "geogram";
23
23
-
version = "1.8.6";
29
29
+
version = "1.9.2";
24
30
25
25
-
src = fetchurl {
26
26
-
url = "https://github.com/BrunoLevy/geogram/releases/download/v${version}/geogram_${version}.tar.gz";
27
27
-
hash = "sha256-Xqha5HVqD2Ao0z++RKcQdMZUmtMb5eZ1DMJEVrfNUzE=";
31
31
+
src = fetchFromGitHub {
32
32
+
owner = "BrunoLevy";
33
33
+
repo = "geogram";
34
34
+
tag = "v${version}";
35
35
+
hash = "sha256-v7ChuE9F/z1MD5OUMiGXZWiGqjMauIka4sNXVDe/yYU=";
36
36
+
fetchSubmodules = true;
28
37
};
29
38
30
39
outputs = [
···
65
74
zlib
66
75
];
67
76
77
77
+
# exploragram library is not listed as submodule and must be copied manually
78
78
+
prePatch = ''
79
79
+
cp -r ${exploragram} ./src/lib/exploragram/ && chmod 755 ./src/lib/exploragram/
80
80
+
'';
81
81
+
68
82
patches = [
69
83
# This patch replaces the bundled (outdated) zlib with our zlib
70
84
# Should be harmless, but if there are issues this patch can also be removed
71
85
# Also check https://github.com/BrunoLevy/geogram/issues/49 for progress
72
86
./replace-bundled-zlib.patch
87
87
+
88
88
+
# fixes https://github.com/BrunoLevy/geogram/issues/203, remove when 1.9.3 is released
89
89
+
(fetchpatch2 {
90
90
+
url = "https://github.com/BrunoLevy/geogram/commit/2e1b6fba499ddc55b2150a1f610cf9f8d4934c39.patch";
91
91
+
hash = "sha256-t6Pocf3VT8HpKOSh1UKKa0QHpsZyFqlAng6ltiAfKA8=";
92
92
+
})
73
93
];
74
94
75
95
postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
···
90
110
checkPhase =
91
111
let
92
112
skippedTests = [
93
93
-
# Failing tests as of version 1.8.3
94
94
-
"FileConvert"
95
95
-
"Reconstruct"
96
96
-
"Remesh"
97
97
-
98
113
# Skip slow RVD test
99
114
"RVD"
100
115
101
101
-
# Flaky as of 1.8.5 (SIGSEGV, possibly a use-after-free)
102
102
-
"Delaunay"
116
116
+
# Needs unfree library geogramplus with extended precision
117
117
+
# see https://github.com/BrunoLevy/geogram/wiki/GeogramPlus
118
118
+
"CSGplus"
103
119
];
104
120
in
105
121
''
···
115
131
runHook postCheck
116
132
'';
117
133
134
134
+
passthru.updateScript = nix-update-script { };
135
135
+
118
136
meta = with lib; {
119
137
description = "Programming Library with Geometric Algorithms";
120
138
longDescription = ''
···
124
142
'';
125
143
homepage = "https://github.com/BrunoLevy/geogram";
126
144
license = licenses.bsd3;
127
127
-
128
128
-
# Broken on aarch64-linux as of version 1.8.3
129
129
-
# See https://github.com/BrunoLevy/geogram/issues/74
130
130
-
broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
131
145
132
146
platforms = [
133
147
"x86_64-linux"