nur-packages

commit 26f150e463f52e301da6b016ed9dcee5a2bf27e8
parent 8e6cde0dc22c1c35437fd89931078038a9ab92e5
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Thu, 26 Oct 2023 23:45:52 +0400

Up

Diffstat:
M
pkgs/data/dicts/tatoeba/default.nix
 | 
4
++++
M
pkgs/data/dicts/tatoeba/tatoeba.json
 | 
20
++++++++++++++++++++
M
pkgs/osm/osmium-surplus/default.nix
 | 
13
+++----------

3 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -1,8 +1,11 @@
 { lib, stdenvNoCC, fetchurl, dict, jq, moreutils, stardict-tools, tatoebatools }:
 let
   langs = [
+    "bel eng"
+    "bel rus"
     "deu eng"
     "deu rus"
+    "eng bel"
     "eng deu"
     "eng epo"
     "eng fin"
@@ -16,6 +19,7 @@ let
     "fin rus"
     "hye eng"
     "hye rus"
+    "rus bel"
     "rus deu"
     "rus eng"
     "rus epo"
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,4 +1,8 @@
 {
+  "bel_sentences_detailed": {
+    "url": "https://downloads.tatoeba.org/exports/per_language/bel/bel_sentences_detailed.tsv.bz2",
+    "hash": "sha256-w234v/nm6QH3tINnKyvHLQfA5DlTdcGyepFkaTdYy0I="
+  },
   "deu_sentences_detailed": {
     "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
     "hash": "sha256-7IVcDW0y/zrXc8Lhkgy8ou9qkUR7hPxgOjnrynogD80="
@@ -31,6 +35,14 @@
     "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
     "hash": "sha256-9q8ceqMrTAl2479JxMWiTfA1ov25UenlWkxk/r4ATTk="
   },
+  "bel-eng_links": {
+    "url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
+    "hash": "sha256-xZ0DYJhxCIuqk6HMOPw1+T8iBsBPHa0TRyLJfKu9nMA="
+  },
+  "bel-rus_links": {
+    "url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-rus_links.tsv.bz2",
+    "hash": "sha256-s+H5xKlJYa2jAajlJWFqEs+n1/ufjh2GLpOmdY12TiE="
+  },
   "deu-eng_links": {
     "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
     "hash": "sha256-vvXa0vzX+IzOAN/lJHHeYgHuia8g0+D9/Nbns7cG4ZE="
@@ -43,6 +55,10 @@
     "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
     "hash": "sha256-AaSfXkQNcCZjWVPZ3FPfnvimgFnniSJPlyC8ruKDe3Q="
   },
+  "eng-bel_links": {
+    "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
+    "hash": "sha256-7RlhzJLctEFCCbnI3vw9OpPh+sI3DvlTV1uEvVlkAGs="
+  },
   "eng-deu_links": {
     "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
     "hash": "sha256-9p5s2ru2IPPPaGQITrBYKSbP+PI1dZebVsDxvF3uOG4="
@@ -91,6 +107,10 @@
     "url": "https://downloads.tatoeba.org/exports/per_language/hye/hye-rus_links.tsv.bz2",
     "hash": "sha256-mIrFERFWe/j6e9dMVvh5DirgEtBU5gBj4tmBiwXhpoA="
   },
+  "rus-bel_links": {
+    "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
+    "hash": "sha256-v1iH9uJ8DDVFvbOfjdsggJZds/HqDfH2veKKCaG/fAI="
+  },
   "rus-deu_links": {
     "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
     "hash": "sha256-1hJXUnggv9I4rr/Ge0zLTXhfWLxUIqD5Pvvuofdbnss="
diff --git a/pkgs/osm/osmium-surplus/default.nix b/pkgs/osm/osmium-surplus/default.nix
@@ -15,22 +15,15 @@
 
 stdenv.mkDerivation {
   pname = "osmium-surplus";
-  version = "2022-08-28";
+  version = "2023-08-27";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "osmium-surplus";
-    rev = "e977028727ed9c836cefad3a271040dbe5b2bf7d";
-    hash = "sha256-Cl7Umi/hn+Kbd5YDV89EmpsL6vm+n5Snt3ceiH4clUY=";
+    rev = "0500e8583da3634a2304513dc33cba27f080c7af";
+    hash = "sha256-NFOui9wWUSHSsyKh5UxOXQMUNgfVln1hSXJo9yb4cnY=";
   };
 
-  postPatch = lib.optionalString stdenv.isDarwin ''
-    # broken on darwin
-    substituteInPlace src/CMakeLists.txt \
-      --replace "exec(osp-find-multipolygon-problems" "#" \
-      --replace "exec(osp-find-relation-problems" "#"
-  '';
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [