commit 95c35620a132748d4955918fbb1b834d86af6a71
parent b07e5185f3db4f37fadc83bc8d39e27b38ec7de4
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 5 Jan 2025 12:00:07 +0400
Up
Diffstat:
6 files changed, 236 insertions(+), 120 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1735685343,
- "narHash": "sha256-h1CpBzdJDNtSUb5QMyfFHKHocTTky+4McgQEBQBM+xA=",
+ "lastModified": 1735915915,
+ "narHash": "sha256-Q4HuFAvoKAIiTRZTUxJ0ZXeTC7lLfC9/dggGHNXNlCw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "81934660d6e9ea54d2f0cdee821e8533b10c221a",
+ "rev": "a27871180d30ebee8aa6b11bf7fef8a52f024733",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -45,7 +45,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2024-12-28";
+ version = "2025-01-04";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -5,35 +5,35 @@
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-6+5D6zHEN78HP8dVgSeqfoXZKnR72GNvMtYyWH+ZJ6g="
+ "hash": "sha256-Y0WJDRkMlvulS783vlTDJ4+bMimngYwtoFRAnWRrYT4="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-ILVSu8Yeyzs+kZSJXgXoMD5r66oxUrYoLMntwCVxPVE="
+ "hash": "sha256-OVO5/HlZvnizem9yPmqfXqFOy+7E971LYxGGHN3FHHw="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-Kh4Xqgrwkm5VIQNUyvlhkBScqXdxA/oMJmSvQkZtFcg="
+ "hash": "sha256-FZ1OiS3Iuq8jqQl2Svc5ny/Cng9GIj1Ox7CzawQwGsY="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-59lcHMLRo5deEjrGJtiDpu5xrMI69bBCTsqopkLXAxs="
+ "hash": "sha256-2+lpW6VxRfdFtDZuWUIvL37uRthXNDbgFM4UA23QSmc="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
- "hash": "sha256-krR9NUP6HKM+SYrdsuP5Ep3tXIFrAetmg4AXpbtnFeE="
+ "hash": "sha256-/h5g/jFnXOQnrc37SPJ9hwh/JmJhCQl9dlfukjjM3bo="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-7VL34lq1BlhL4lkvbLWlOAEqKl8UFmoX3e6TSHClO5A="
+ "hash": "sha256-YzH8er1wC36TMM6vJN2bwguqB9ScAtJZFxZY0eGVmI0="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-DSajvlPQqXPQ0/i8YfUxaNWKXK8ISqQQ40mg7Tx0umI="
+ "hash": "sha256-DfhbfVJbcj5TI/OG1Vuob2H2WW6vIT0BjdhuEuaK0GI="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-sxZ6TVRwxZkrwzcgtje/YeiTuSEgHISa0+wdCld/lnM="
+ "hash": "sha256-ySmaEtYmUDT2VrRnC2l/UhnJsQOLyjrIel+Z8P7i5SY="
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
@@ -45,15 +45,15 @@
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-2O9krWziOGvJxVJbAuLPl7mYGMnkW+lPzFBuCH53Fuc="
+ "hash": "sha256-zSJPCMFVN+A62yJa+WITqR0MEN2CP+nb7yxWvf7+MVU="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-amNn/Fgp7SA7jYNGtvK+erRBCULCbOeLQ8s3WJvJGKw="
+ "hash": "sha256-MLD7k6vmFP1TQKBc8kdSLCZeyDtD6dvo5QUBs/bHCjQ="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-zBVgblVVAV/beSYFx6mrTSxu9TG4nrtgfLwU4HNgvj8="
+ "hash": "sha256-Zub8tUI4R3Sr2MD6wEnO5tdMkC9vKa8bmHUnleuT/2s="
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
@@ -61,39 +61,39 @@
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-Ogmv/dxc5Xuk0nFwBa/B3m1/xvKubDKpNnIVbg+RWmU="
+ "hash": "sha256-I5c6glcipx735l3gbWzbp9ILNxqzoDnQ9XL45M9ig1c="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-AEk76CQWncnbw6IBuhuJ8bTFs0TaMIpPHFUMIyDqpyY="
+ "hash": "sha256-lCW+1WvirbiMPYGMKEmW9uJ0EKr4i6hWctzhkzPJR6I="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
- "hash": "sha256-pY+Fcy8iIjyWhD/eMwVpg7P0G6hFY1nV42lYAAVmQ6A="
+ "hash": "sha256-/dg8vgKUl69Cx4GbXm5OUy1c15XGFSZGvR/JuztnsyE="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-Ych/hf4OqLH0edSYo50gzBotNONbGASLKwbw7j209MI="
+ "hash": "sha256-Ds11swO65bKJ/P7L/+o6ucs+WGDpUkMQYHQCjSlzWmk="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-G5roVSqnwBJfkIci15Y8GTMZCiQUs9gsXuhOvcR7T5Y="
+ "hash": "sha256-FSYTnvaMILdSPyJorQ+trqXyD6sfg1iZ7mPC7quFFVY="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-NUmx9b8/YZiT8GgwdrdcAHUmAlyEXYQET5nv5ANER7c="
+ "hash": "sha256-zPF8RJ9rPCMSq4DjTKcjJR2irB/ttoOZ8I4nnRJqBCw="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-snITECH/BH7MQH9+wM3YZbuG0ip7CpsKDjXR9ZeWEkc="
+ "hash": "sha256-Q0cgUuv5Y9AnOy6zMECeB1QcDeccSV39PsBvlPJYlAg="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-OSUVDyB7zV4FG1dKimBxQ4drMKpSJsslZDV97zsKkPk="
+ "hash": "sha256-uDEPuJgjOBWdmYtX2BWTD8C7ojb6rcZ+uUf/cCAplZU="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-TzNIxSrnKr3ST7Gm3UdANZFBR9HUgaYi82sGL9KVoAE="
+ "hash": "sha256-1v6v2/7ekPa5dp+jXnOOp0UdNi4gyFw5d/MDeJl3Xn0="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -101,11 +101,11 @@
},
"hye-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-eng_links.tsv.bz2",
- "hash": "sha256-QMMDre+mrXqOAUjAts8Rxh4fpgKt3Sn7i6Zag2TfjYI="
+ "hash": "sha256-GhXbT74zFKRcMeH71Wq08gZ0uzFM9uRL2UK2vlpSjDE="
},
"hye-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
- "hash": "sha256-CeB6QeRtFInTlki06JL7MieOBZvWi76vOcRYwLIhm6Y="
+ "hash": "sha256-omWXYqMlsBxpNZ7sX9vv1bj6PLX6yEI7G5RJpQiEuas="
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
@@ -113,15 +113,15 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-OVnmFWYQzxkkPO998pavp91aQl3fgCumTwKCD5T1jz8="
+ "hash": "sha256-L5PSAJYz2iyGHQY8SlkT21YsdWB3vbDj9VSIntQMGqg="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-aWcDYO9/JuzGBAp0tvM9hQJyMtKX8dQaT+0Am4nENEc="
+ "hash": "sha256-YksxEIVfcmURY0ltrLjY/JJvk4CYqCfShrMra4nxQqw="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-Z+ib4sKk4zUhzTJQFM+B++Ap1l0eNzHUgw1RMogPYo8="
+ "hash": "sha256-g3NCNbTWuK7XCDlUofJV60Iro65niHWvlc/QM12AjgA="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -129,7 +129,7 @@
},
"rus-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-hye_links.tsv.bz2",
- "hash": "sha256-Qirb7t1kYeKkViSiqm/Iranb9cZiC1smtLum1B2uHnE="
+ "hash": "sha256-29TFC7ci6CEAtc8uKculh3yivl7RouTKyaruGhs8sPI="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
@@ -137,11 +137,11 @@
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-ceOCQJDFy/5majT5BtWgXD5x5nB6BkysAA/7P5ndO4k="
+ "hash": "sha256-uiSq/0a0/jj/fqO8Su5kWxl/8ysxClNkSgK/zMjPSZc="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-AEXXufveAEiiI/vQXhsEyK5Dn4ghS4wdFtOznDMhstA="
+ "hash": "sha256-gPXmV+3ooFJPTgV8+4SG1FKYJYXS7SKGoB+mDVIwflU="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
@@ -149,10 +149,10 @@
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-uHPjaupfroGqpiG4lmC3zRY/iz9it4luX7wZK7DZTAA="
+ "hash": "sha256-oUyLwKyuB6rmkpLy4rZ1T3pCKe3ZdddrLnacl7vFUl4="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-Lf7hMACgH6A7ZZeLxKkAStkaCl7sde1YHKHtAWkIjc4="
+ "hash": "sha256-RRa9qybDW0Ce9Vy7+63NDpZmxbChho/8WNvPs69pCgs="
}
}
diff --git a/pkgs/geospatial/mapsoft/0002-fix-build.patch b/pkgs/geospatial/mapsoft/0002-fix-build.patch
@@ -1,5 +1,5 @@
diff --git i/docs/man/ms2render.htm w/docs/man/ms2render.htm
-index 652acc2..b5750c3 100644
+index 62972dc..0195402 100644
--- i/docs/man/ms2render.htm
+++ w/docs/man/ms2render.htm
@@ -493,7 +493,7 @@
@@ -21,7 +21,7 @@ index 652acc2..b5750c3 100644
</dd>
<dt id="obj_scale-arg"><b>--obj_scale <arg></b></dt>
diff --git i/docs/man/ms2view.htm w/docs/man/ms2view.htm
-index f178b4a..1fed011 100644
+index 243de0a..7138440 100644
--- i/docs/man/ms2view.htm
+++ w/docs/man/ms2view.htm
@@ -475,7 +475,7 @@
@@ -47,7 +47,7 @@ index 5469cac..c165c1a 100644
Some tips about viewer structure can be also find there.
B<$HOME/.mapsoft2/mapsoft2.css> -- user-specific file.
diff --git i/docs/man/ms2vmap.htm w/docs/man/ms2vmap.htm
-index 8bbeac9..f6ddd9a 100644
+index 901374e..6dce51b 100644
--- i/docs/man/ms2vmap.htm
+++ w/docs/man/ms2vmap.htm
@@ -64,7 +64,7 @@ ms2vmap <file> ... -o <out file> [<options>]</code></pre>
@@ -60,7 +60,7 @@ index 8bbeac9..f6ddd9a 100644
</dd>
<dt id="D---define-arg"><b>-D, --define <arg></b></dt>
diff --git i/docs/man/ms2vmapdb.htm w/docs/man/ms2vmapdb.htm
-index 8bd5943..c990a0f 100644
+index 2b06fe4..2018bc6 100644
--- i/docs/man/ms2vmapdb.htm
+++ w/docs/man/ms2vmapdb.htm
@@ -238,7 +238,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre>
@@ -90,7 +90,7 @@ index 8bd5943..c990a0f 100644
</dd>
<dt id="D---define-arg2"><b>-D, --define <arg></b></dt>
-@@ -646,7 +646,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre>
+@@ -652,7 +652,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre>
<dt id="t---types-arg3"><b>-t, --types <arg></b></dt>
<dd>
@@ -114,7 +114,7 @@ index ab16dae..272b454 100644
if (getenv("HOME")) {
AddSep("Maps");
diff --git i/modules/mapview/mapview.cpp w/modules/mapview/mapview.cpp
-index 6d461fb..5bd5367 100644
+index 997c127..43928bf 100644
--- i/modules/mapview/mapview.cpp
+++ w/modules/mapview/mapview.cpp
@@ -367,7 +367,7 @@ Mapview::load_css(){
@@ -127,7 +127,7 @@ index 6d461fb..5bd5367 100644
css_provider->load_from_path(css_glo)){
auto screen = get_screen();
diff --git i/modules/vmap2/vmap2gobj.cpp w/modules/vmap2/vmap2gobj.cpp
-index d6123a7..5c6198a 100644
+index 4b48cf8..724e444 100644
--- i/modules/vmap2/vmap2gobj.cpp
+++ w/modules/vmap2/vmap2gobj.cpp
@@ -22,7 +22,7 @@ using namespace std;
@@ -135,11 +135,11 @@ index d6123a7..5c6198a 100644
ms2opt_add_vmap2_render(GetOptSet & opts){
const char *g = "VMAP2_RENDER";
- opts.add("config", 1,'c',g, "Configuration file for vector map rendering. Default: /usr/share/mapsoft2/render.cfg");
-+ opts.add("config", 1,'c',g, "Configuration file for vector map rendering. Default: @out/share/mapsoft2/render.cfg");
++ opts.add("config", 1,'c',g, "Configuration file for vector map rendering. Default: @out@/share/mapsoft2/render.cfg");
opts.add("define", 1,0,g, "Definitions for vector map rendering (json object)");
opts.add("obj_scale", 1,0,g, "Rescaling factor for all objects, default 1.0.");
opts.add("vmap_minsc", 1,0,g, "Minimum map scale (calculated from the 'natural' "
-@@ -92,7 +92,7 @@ GObjVMap2::GObjVMap2(VMap2 & map, const Opt &o): GObjMulti(false), map(map) {
+@@ -110,7 +110,7 @@ GObjVMap2::GObjVMap2(VMap2 & map, const Opt &o): GObjMulti(false), map(map) {
read_words_defs defs(o.get("define", Opt()));
int depth = 0;
@@ -168,114 +168,221 @@ index 6688736..ec77637 100644
read_words_defs defs(o.get("define", Opt()));
load(file, defs);
diff --git i/vmap_data/scripts/vmaps.sh w/vmap_data/scripts/vmaps.sh
-index 989677f..af8fbd1 100644
+index 460533a..7591f33 100644
--- i/vmap_data/scripts/vmaps.sh
+++ w/vmap_data/scripts/vmaps.sh
-@@ -20,12 +20,12 @@ GRID=0; # draw grid
+@@ -16,8 +16,8 @@ MAP_ATTR="mapsoft"
+ VMAP_DIR=vmap; # Source folder
+ VMAP_EXT=vmap; # Extension/format of vector maps (could be vmap2, vmap, or even mp)
- CMAP=conf/cmap.png; # Colormap
- CMAP_SRC= # nomenclatere name used for colormap source
-REND_CFG=/usr/share/mapsoft2/render.cfg; # Render configuration
-TYPEINFO=/usr/share/mapsoft2/types.cfg # Type information
--HTM_TEMPL=/usr/share/mapsoft2/map_templ.htm; # template for htm page
+REND_CFG=@out@/share/mapsoft2/render.cfg; # Render configuration
+TYPEINFO=@out@/share/mapsoft2/types.cfg # Type information
-+HTM_TEMPL=@out@/share/mapsoft2/map_templ.htm; # template for htm page
-
- # index files (one set per BRD2_DIR/*.gpx)
--TYPSRC=/usr/share/mapsoft2/typ.txt # typ file source for garmin IMG
-+TYPSRC=@out@/share/mapsoft2/typ.txt # typ file source for garmin IMG
- EXTRA_TRACKS=; # extra tracks to be added to index image
- JPEG_SCALE=0.2; # scale for jpeg preview images
- INDEX_SCALE=0.05; # scale for index image (in addition to jpeg_scale)
+
+ ############################################################
+ ## Image rendering
+@@ -46,7 +46,7 @@ TLIST="";
+ ############################################################
+ ## IMG rendering (see vmaps_img script)
+ IMG_DIR=OUT; # img files (if empty, img files are not rendered)
+-TYPSRC=/usr/share/mapsoft2/typ.txt; # typ file source for garmin IMG
++TYPSRC=@out@/share/mapsoft2/typ.txt; # typ file source for garmin IMG
+ GMT=gmt; # gmt program
+ CGPSM=cgpsmapper-static # cgpsmapper program
+ IMGMAP=""; # combined img file
+diff --git i/vmap_data/scripts/vmaps_diff w/vmap_data/scripts/vmaps_diff
+index 136155e..0aa1ed0 100755
+--- i/vmap_data/scripts/vmaps_diff
++++ w/vmap_data/scripts/vmaps_diff
+@@ -4,7 +4,7 @@
+ # Render difference between two git revitions of a file
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_get_fig w/vmap_data/scripts/vmaps_get_fig
-index fca52c1..e0bce0c 100755
+index 0ba7b7f..5048bcb 100755
--- i/vmap_data/scripts/vmaps_get_fig
+++ w/vmap_data/scripts/vmaps_get_fig
@@ -9,7 +9,7 @@
##################################################
# read global configuration and functions
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_img w/vmap_data/scripts/vmaps_img
+index 1e0599c..84413bb 100755
+--- i/vmap_data/scripts/vmaps_img
++++ w/vmap_data/scripts/vmaps_img
+@@ -9,7 +9,7 @@
+ ##################################################
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
# read local configuration
- . ./vmaps.conf
+ . ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_in w/vmap_data/scripts/vmaps_in
-index 07f8ec0..a6679f9 100755
+index 4381dd7..cf9d9d9 100755
--- i/vmap_data/scripts/vmaps_in
+++ w/vmap_data/scripts/vmaps_in
@@ -9,7 +9,7 @@
##################################################
# read global configuration and functions
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
# local configuration
- . ./vmaps.conf
-diff --git i/vmap_data/scripts/vmaps_mbtiles w/vmap_data/scripts/vmaps_mbtiles
-index d751d1c..2ab5945 100755
---- i/vmap_data/scripts/vmaps_mbtiles
-+++ w/vmap_data/scripts/vmaps_mbtiles
-@@ -8,7 +8,7 @@
- # see https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_index w/vmap_data/scripts/vmaps_index
+index ae225ec..e59c592 100755
+--- i/vmap_data/scripts/vmaps_index
++++ w/vmap_data/scripts/vmaps_index
+@@ -4,7 +4,7 @@
+ ##################################################
# read global configuration and functions
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
# read local configuration
- . ./vmaps.conf
+ . ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_out w/vmap_data/scripts/vmaps_out
-index bd1d183..1a47f3a 100755
+index d1d7903..d4d5318 100755
--- i/vmap_data/scripts/vmaps_out
+++ w/vmap_data/scripts/vmaps_out
-@@ -12,7 +12,7 @@
+@@ -18,7 +18,7 @@
+ ##################################################
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_pack_img w/vmap_data/scripts/vmaps_pack_img
+index a91fc99..a692600 100755
+--- i/vmap_data/scripts/vmaps_pack_img
++++ w/vmap_data/scripts/vmaps_pack_img
+@@ -5,7 +5,7 @@
+ ##################################################
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_pack_mbtiles w/vmap_data/scripts/vmaps_pack_mbtiles
+index b73121e..da52332 100755
+--- i/vmap_data/scripts/vmaps_pack_mbtiles
++++ w/vmap_data/scripts/vmaps_pack_mbtiles
+@@ -7,7 +7,7 @@
+ # see https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_pack_sqlitedb w/vmap_data/scripts/vmaps_pack_sqlitedb
+index 3dfd676..9b4887b 100755
+--- i/vmap_data/scripts/vmaps_pack_sqlitedb
++++ w/vmap_data/scripts/vmaps_pack_sqlitedb
+@@ -7,7 +7,7 @@
+ # see: https://osmand.net/docs/technical/osmand-file-formats/osmand-sqlite/
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_png w/vmap_data/scripts/vmaps_png
+index 5fbf71c..f726bdb 100755
+--- i/vmap_data/scripts/vmaps_png
++++ w/vmap_data/scripts/vmaps_png
+@@ -9,7 +9,7 @@
##################################################
# read global configuration and functions
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
# read local configuration
- . ./vmaps.conf
+ . ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_preview w/vmap_data/scripts/vmaps_preview
-index 757dacc..4a7612c 100755
+index 1ed94bc..be42a26 100755
--- i/vmap_data/scripts/vmaps_preview
+++ w/vmap_data/scripts/vmaps_preview
@@ -3,7 +3,7 @@
##################################################
# read global configuration and functions
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
# read local configuration
- . ./vmaps.conf
-diff --git i/vmap_data/scripts/vmaps_sqlitedb w/vmap_data/scripts/vmaps_sqlitedb
-index 70a3d6b..e683232 100755
---- i/vmap_data/scripts/vmaps_sqlitedb
-+++ w/vmap_data/scripts/vmaps_sqlitedb
-@@ -6,7 +6,7 @@
- # Tile format: x-y-z.png, z/x-y.png
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_rend_mbtiles w/vmap_data/scripts/vmaps_rend_mbtiles
+index a8ffee0..4809371 100755
+--- i/vmap_data/scripts/vmaps_rend_mbtiles
++++ w/vmap_data/scripts/vmaps_rend_mbtiles
+@@ -9,7 +9,7 @@
+ ##################################################
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_tiles w/vmap_data/scripts/vmaps_tiles
+index fc45eab..3a06f66 100755
+--- i/vmap_data/scripts/vmaps_tiles
++++ w/vmap_data/scripts/vmaps_tiles
+@@ -9,7 +9,7 @@
+ ##################################################
+
+ # read global configuration and functions
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
+
+ # read local configuration
+ . ./vmaps.conf ||:
+diff --git i/vmap_data/scripts/vmaps_tlist w/vmap_data/scripts/vmaps_tlist
+index 6aff657..1b7df8c 100755
+--- i/vmap_data/scripts/vmaps_tlist
++++ w/vmap_data/scripts/vmaps_tlist
+@@ -3,7 +3,7 @@
+ # Create list of tiles
# read global configuration and functions
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
# read local configuration
- . ./vmaps.conf
+ . ./vmaps.conf ||:
diff --git i/vmap_data/scripts/vmaps_wp_update w/vmap_data/scripts/vmaps_wp_update
-index 667057e..5ac21d7 100755
+index 24df3c1..5252dd0 100755
--- i/vmap_data/scripts/vmaps_wp_update
+++ w/vmap_data/scripts/vmaps_wp_update
-@@ -12,7 +12,7 @@
+@@ -25,7 +25,7 @@
##################################################
# read global configuration and functions
--. vmaps.sh
-+. @out@/bin/vmaps.sh
+-. vmaps.sh ||:
++. @out@/bin/vmaps.sh ||:
# read local configuration
- . ./vmaps.conf
+ . ./vmaps.conf ||:
diff --git a/pkgs/geospatial/mapsoft/0003-notests.patch b/pkgs/geospatial/mapsoft/0003-notests.patch
@@ -0,0 +1,13 @@
+diff --git i/programs/Makefile w/programs/Makefile
+index d8f2824..22f7430 100644
+--- i/programs/Makefile
++++ w/programs/Makefile
+@@ -17,7 +17,7 @@ bindir ?= $(prefix)/bin
+ datadir ?= $(prefix)/share
+
+ all:
+- sh -e -c 'for i in $(PROGRAMS); do make -C $$i; done'
++ sh -e -c 'for i in $(PROGRAMS); do make -C $$i notests; done'
+
+ install:
+ sh -e -c 'for i in $(PROGRAMS); do install -D -m755 $$i/$$i $(bindir)/$$i; done'
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
@@ -3,9 +3,7 @@
stdenv,
fetchFromGitHub,
substituteAll,
- copyDesktopItems,
desktopToDarwinBundle,
- makeDesktopItem,
db,
fig2dev,
giflib,
@@ -25,23 +23,24 @@
pkg-config,
proj,
shapelib,
+ sqlite,
unzip,
wrapGAppsHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "mapsoft2";
- version = "2.8-alt1";
+ version = "2.9-alt1";
src = fetchFromGitHub {
owner = "slazav";
repo = "mapsoft2";
tag = finalAttrs.version;
- hash = "sha256-bMF/20MXMnxTIROfHFLW3711GWqQTv72jbRpWtow4eA=";
+ hash = "sha256-zwjYT/ou8cQxSka+J93ojiLkdAPV9ryz/QPQBvvRTdg=";
fetchSubmodules = true;
};
- patches = [ ./0002-fix-build.patch ];
+ patches = [ ./0002-fix-build.patch ] ++ lib.optional (!finalAttrs.doCheck) ./0003-notests.patch;
postPatch =
let
@@ -56,42 +55,34 @@ stdenv.mkDerivation (finalAttrs: {
"modules/vmap2/vmap2gobj.cpp"
"modules/vmap2/vmap2types.cpp"
"vmap_data/scripts/vmaps.sh"
+ "vmap_data/scripts/vmaps_diff"
"vmap_data/scripts/vmaps_get_fig"
+ "vmap_data/scripts/vmaps_img"
"vmap_data/scripts/vmaps_in"
- "vmap_data/scripts/vmaps_mbtiles"
+ "vmap_data/scripts/vmaps_index"
"vmap_data/scripts/vmaps_out"
+ "vmap_data/scripts/vmaps_pack_img"
+ "vmap_data/scripts/vmaps_pack_mbtiles"
+ "vmap_data/scripts/vmaps_pack_sqlitedb"
+ "vmap_data/scripts/vmaps_png"
"vmap_data/scripts/vmaps_preview"
- "vmap_data/scripts/vmaps_sqlitedb"
+ "vmap_data/scripts/vmaps_rend_mbtiles"
+ "vmap_data/scripts/vmaps_tiles"
+ "vmap_data/scripts/vmaps_tlist"
"vmap_data/scripts/vmaps_wp_update"
];
in
''
${lib.concatStringsSep "\n" (map (file: ''substituteInPlace ${file} --subst-var out'') srcFiles)}
- substituteInPlace modules/getopt/Makefile --replace-fail "SCRIPT_TESTS := getopt" ""
substituteInPlace modules/opt/Makefile --replace-fail "SIMPLE_TESTS := opt" ""
substituteInPlace modules/tmpdir/Makefile --replace-fail "SCRIPT_TESTS := tmpdir" ""
substituteInPlace modules/get_deps --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
+ substituteInPlace modules/image_cnt/image_cnt.cpp --replace-fail "(pow," "pow("
patchShebangs .
'';
- desktopItems = [
- (makeDesktopItem {
- name = "ms2view";
- exec = "ms2view";
- comment = "Viewer for geodata and raster maps";
- desktopName = "ms2view";
- genericName = "Mapsoft2 viewer";
- categories = [
- "Geography"
- "Geoscience"
- "Science"
- ];
- })
- ];
-
nativeBuildInputs = [
- copyDesktopItems
fig2dev
imagemagick
perlPackages.perl
@@ -115,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
libzip
proj
shapelib
+ sqlite
] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
env = {
@@ -123,8 +115,12 @@ stdenv.mkDerivation (finalAttrs: {
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
};
+ enableParallelBuilding = true;
+
makeFlags = [ "prefix=$(out)" ];
+ doCheck = true;
+
dontWrapGApps = true;
postFixup = ''
