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