commit e818832ccd79b8334b32de1c992cc986c2d94186
parent 2c2edc9fa4ffaa65af93af6132f2240a5508f8b6
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 28 Apr 2023 22:30:48 +0400
Up
Diffstat:
7 files changed, 83 insertions(+), 55 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1681633309,
- "narHash": "sha256-HvEzKU/ZWGyIt2G+AIEKmMt/ED3P+Tgjw3/BkArti0o=",
+ "lastModified": 1682566018,
+ "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "cb578ff7040066fd1b3f6f087bca796ddbf598b5",
+ "rev": "8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -32,7 +32,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2023-04-15";
+ version = "2023-04-22";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,19 +1,19 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-oPOZSFSiHejcUe3v9Gi6HehF31dUPWxEC9W6t49fpnQ="
+ "hash": "sha256-08/1n0+gFjXPpvcQEuLvxKuwdQ8004S2TJGHiOPLBM8="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-PftLHGctNbXxjNkYNL7BD7TPsMXK3afzWpzV8qgEQZw="
+ "hash": "sha256-Zy2WyBGFCooDmp187S0ghio4e55TbqH+ivIx5/3H7/Q="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-eiyfv7aGeMEbwDFspqrYb8RZQlKrM8TFncQ/tnK62So="
+ "hash": "sha256-0OyKM6WJYgQCZp5bkrhL5iUyu+z3yr/iNN5h03UEE2U="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-AP4fGHpPrxx8zpdOeeUNzwKoqxH7ejQLbGqK8dfKWz0="
+ "hash": "sha256-yoQsZnk8BV9RB9R6nw7wf5UaJYCoMj2J6T56jJbB4aI="
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
@@ -21,35 +21,35 @@
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-NwYxY94ZEH/RuDO7IfKGaYHO4xmEM4zKbPyOU+nK4Vg="
+ "hash": "sha256-/K5VcmW13M8fewC5s2QwqvnY1Jqw5cymy3dZHb7d1p0="
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
- "hash": "sha256-ghrgXJ6ViWIj7ri2iDsFf+kzB/U9XrWWDqM05mQF99s="
+ "hash": "sha256-uO8c6/7SH6uDaOTjzydY5VJTs8f61rZ8QcDQazVGUq0="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-zcttpncaO2JijlhcKFZt7MgTCqtUPETHWCLXJ3AOnX4="
+ "hash": "sha256-dprcgfmgG9sNB2X0DmG+SfzwMVMyU28DritVGpvHGLQ="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-l6ib+jmvZ7BVauCHGNlzWZx7dg1yryaIqnvcnPq7OAc="
+ "hash": "sha256-tUaJry7ofjU4iyZzLcemR93faUSLOGym7S3rlRLjYpk="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-LZT22XbsSJYlPRxK8Ht1bRtTO5LAnNWQgrYVqjx4llk="
+ "hash": "sha256-e8rl9t/XHekB5tyMU+10e7hvo2APOPmAGXnG6TLSogs="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-sCUTX6XFI2oqlMTOE02dhQDcUHcnhkgqnDX7WbBH6C0="
+ "hash": "sha256-mt6SdT+0aW5pcYZL/WgJbgyM51LKczf+V8+msCo28bQ="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-yJp+VGwrd1WjmCkP57Cc6rpZGYlnA7B9uO6zMA6jd3g="
+ "hash": "sha256-YL5HDjGVgrv1mFIhJPY5N6/lrDW4W1DRGpJuTL9/C+0="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-X79ECHzcKkbgfUHYwzKh0muuebnuSdMtFtf/4Qasa7Q="
+ "hash": "sha256-z94EbO2CzrdZQYEDDcxCw9MJI4T8oVe1at8ZCLcjyQM="
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
@@ -57,27 +57,27 @@
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-oP+7l1TnJc/GG3vTRc7ssm40jB+9C7eNbhZgtZAQZpY="
+ "hash": "sha256-wBBSQMIAAzXCcZ215/YV5DOimTDQHfYYrCaGjG4PRZY="
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
- "hash": "sha256-QR1GqksGOcQrS7hfgrbkw0mzyVnzV14ss9aR0LvDFco="
+ "hash": "sha256-CgZa8MqziqB3KVqQbo7a2S3AdSMvF/scZ1PA1UAHmAI="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-8sv9uH1/7ESvJ/ZTeXDou/fWqSe2+QDQLntCLopJW4o="
+ "hash": "sha256-J6DbWekb8mtMG8kqpF0gaXJ7mMBLapNxJlgEvN7Lwn8="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-GV+98gnBCbugwXk4hTbS9Pxia7BPxvXN3bx+bMqlM+g="
+ "hash": "sha256-Tw8U21fil5jXZSandWNYiaInptcwT2sj/4aOMmVK3Rw="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-CZBHm+8nqmEF+4qTm0AvzxOeEafUBRsbUZVOSNfxUQM="
+ "hash": "sha256-0uC/HOKgcJwAdhKGx/dQwtzeQy3SViSmhanewJCBYao="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-KwHEOtPaHAvojOgaypEpDDD+O5luwCf4tteGekedjTw="
+ "hash": "sha256-OpQkzpLkwftmDG0x5kETVOIeTbIXryHb2lZQJbDgGpA="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -93,15 +93,15 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-9VLGHmNSaAQ7hgUZn4CXOO3bTObjV18A9vHrskBOU1E="
+ "hash": "sha256-Kb3Z+HJGEdZfx5d+7CtuiEdwHomP+WWB6bk73eS4k68="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-CpFrcPb8eH4gdboDRMVRPnDTKpOi7G9caLaLCAwPIgk="
+ "hash": "sha256-xFM2l+q6vsE0X6k08ng/VZF+YgclUcNYsoU5GXb2kSU="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-Wg6kqe/yucFKC2xQdJBWrkJetHkGJvzRmwXN78TJdIg="
+ "hash": "sha256-56MQqF/0qpCU4+6GqG9tNXJYqWeqpXE9FmlnGfIo4x8="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -117,11 +117,11 @@
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-mLx4bb9Zd59uGtOicVWDIWIV1tSJNenAK5XKMpHHJvo="
+ "hash": "sha256-F+h/rNH1clIR/6TBaPlkeEbe9HHk2r4L7ZkjCA0PCwo="
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
- "hash": "sha256-xRg4BnHyARrTjtKuot59l+I0C7Qq+fDcnfhA/37vu7k="
+ "hash": "sha256-vBKcjqZbbGChMwg6/DkjoaHPMVE8XoYkwO8FEY1WQaA="
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
@@ -129,10 +129,10 @@
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-/0nHmJpltQNZs/9MvsISzFzsps2YrR7UB19WztkDSUA="
+ "hash": "sha256-bV4nvmJSF/lFDI9DmNgGxPVZ8s132fZ2u7aNPyXl6eM="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-NPLeDcs1LRS5LNIJZA9CVlcq7IlkCkW/TkJdduzILDM="
+ "hash": "sha256-ResKoyYwzTNsIV6SwtWUMlWgsy82HGiflo5K3aGsPDM="
}
}
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -247,8 +247,9 @@ lib.makeScope newScope (
### GNSS
+ gnsstk = callPackage ./gnss/gnsstk { };
+ gnsstk-apps = callPackage ./gnss/gnsstk-apps { };
gps-sdr-sim = callPackage ./gnss/gps-sdr-sim { };
- gpstk = callPackage ./gnss/gpstk { };
rtklib = callPackage ./gnss/rtklib { };
visualgps = libsForQt5.callPackage ./gnss/visualgps { };
diff --git a/pkgs/gnss/gnsstk-apps/default.nix b/pkgs/gnss/gnsstk-apps/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, cmake, gnsstk }:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "gnsstk-apps";
+ version = "14.0.0";
+
+ src = fetchFromGitHub {
+ owner = "SGL-UT";
+ repo = "gnsstk-apps";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-cq2ZAT3nj7TnB82Rhf72zxBP+k6iSQRFUh99y8YtOTA=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ gnsstk ];
+
+ cmakeFlags = [ "-DBUILD_EXT=ON" ];
+
+ meta = with lib; {
+ description = "GNSSTk applications suite";
+ inherit (finalAttrs.src.meta) homepage;
+ license = licenses.lgpl3Plus;
+ maintainers = [ maintainers.sikmir ];
+ platforms = platforms.unix;
+ };
+})
diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "gnsstk";
+ version = "14.0.0";
+
+ src = fetchFromGitHub {
+ owner = "SGL-UT";
+ repo = "gnsstk";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-IRwhFlO9j9pAG7ZhXZz+v3nfMoSlbtm1kwrQABAIV4Y=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [ "-DBUILD_EXT=ON" ];
+
+ meta = with lib; {
+ description = "GNSSTk libraries";
+ inherit (finalAttrs.src.meta) homepage;
+ license = licenses.lgpl3Plus;
+ maintainers = [ maintainers.sikmir ];
+ platforms = platforms.unix;
+ };
+})
diff --git a/pkgs/gnss/gpstk/default.nix b/pkgs/gnss/gpstk/default.nix
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "gpstk";
- version = "8.0.0";
-
- src = fetchFromGitHub {
- owner = "SGL-UT";
- repo = "GPSTk";
- rev = "v${finalAttrs.version}";
- hash = "sha256-kauRkx7KjVFdjl3JPiCxeuuVGVJ69e87RZQhepRrsWY=";
- };
-
- nativeBuildInputs = [ cmake ];
-
- cmakeFlags = [ "-DBUILD_EXT=ON" ];
-
- meta = with lib; {
- description = "Toolkit for developing GPS applications";
- inherit (finalAttrs.src.meta) homepage;
- license = licenses.lgpl3Plus;
- maintainers = [ maintainers.sikmir ];
- platforms = platforms.unix;
- };
-})
