commit 437bb4fbf1a9a632c8ad464bbe8779cd5f2aa52e
parent 5d232dc96776ada6445dc4aa14873e4211614b2b
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sat, 25 Dec 2021 13:16:37 +0300
Up
Diffstat:
7 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -17,11 +17,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1639713555,
- "narHash": "sha256-w1TacWjnqhC19n+rheyOif3JxwvWMbyxfgqYCY0FLdQ=",
+ "lastModified": 1640328990,
+ "narHash": "sha256-KQbvJx4qO9bo04tfTZuISyY4vRC5k3ZB3lyLS21XWIw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "45a3f9d7725c7e21b252c223676cc56fb2ed5d6d",
+ "rev": "ab93217a2b74a1c36bc892c14f44ee5959c33f12",
"type": "github"
},
"original": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -24,7 +24,7 @@ let
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2021-12-18";
+ version = "2021-12-25";
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,67 +1,67 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "hash": "sha256-FEvNHz/lk0AFdRzNnFhXJn0vSmUq+J0HYPj1MT9nqLg="
+ "hash": "sha256-2TDiRd0eN6LGYdO6gvac7cOs9mVcioPh4B1Zn/fmbCo="
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "hash": "sha256-tY3TRNfOc+XzHOP+DmxfS/nr3H1Y8GW58MqiXT8M2lA="
+ "hash": "sha256-jWggVI8JmmE3Ay+wmp4xqucmiruAHBZMoZUOUE1UJPg="
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "hash": "sha256-slzJ2lKlDVX9vrLCQtKbq2du23zxnYArmM4P15edPSc="
+ "hash": "sha256-0L0EqEK4lXUoqC3pl1BWU4aN/kRT5s2tX5DBI15/vzs="
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "hash": "sha256-29qhAc5xeLThB5mmA8GAdpAY7CnwxADNp10UC3Juuoc="
+ "hash": "sha256-Tr6rZx5wHD+DMQAtHwfXsyoni29AqhSYcZzg4CMz1bg="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "hash": "sha256-wVmHfBHZeXrAaaXTU+8w+Lmr7IG/FHl8JFCsp9Y3FlU="
+ "hash": "sha256-vV1YZFQOTe5jCmLNbOe6hekjruk5QVb7B54gA2L6e8Y="
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
- "hash": "sha256-mXZlu+etB+j8A/UjnxDWyly393VBKbYEMpSrl9D3xbk="
+ "hash": "sha256-xL46N9SRB72fT1uZVoVvFSdS11GHEXWjSDFzjcaboKI="
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "hash": "sha256-RlGn51GE4C3x5qMiEa+9uGgPgteiI/AI38bXiKHxkKg="
+ "hash": "sha256-hlmkqK98AJr13eNMYsVCY8ECSToGzNAdg+FXOXLqCu4="
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "hash": "sha256-khehmtYXRVh8tZeH5D0/56Rk6tFh7iCNQ0UFVFeUmBE="
+ "hash": "sha256-HE9ApStv8qriTfJmX0Ssgi8mVBqQUnzIEr7CFAlGYgY="
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "hash": "sha256-XlYI7KeFcFkZjV1HsAPhYJYTXSRHcTAfaMpPtoQsGBM="
+ "hash": "sha256-f4EtpLZ5SZe67WMdulLx0LNYne51zmrvO8f7wLEUw0s="
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "hash": "sha256-yo11wVgmOqsnbMvIxlyuIYaxFpiCk1dUmxG4mafl9NE="
+ "hash": "sha256-m/vfHQZPiqSJXBF3cSXj5MAynNu3C7whhLs0xdQCUyM="
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "hash": "sha256-IzZq3/XPEDKTSgoXHBeFiJ4uTLAPe3eNaC0uLx75aBY="
+ "hash": "sha256-xmrheh7d0Pji8QsmC7lhhPIBlrifqt5Qw9WlZOBkp3Y="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "hash": "sha256-u4zy/iNk6CZBbQlRbuLFrxtOJ2rYp7OYe0kZbW39fpI="
+ "hash": "sha256-X6Eh87LU2LqdqFMPMTG0ioEWMRd3nVymluCeNXRsvEY="
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
- "hash": "sha256-Z9t8ZQiu9J85+5mwaWfFJQfYEE0MTfAC5v+tnJegsfY="
+ "hash": "sha256-pe5JbURl8qrDsGj+vAX3NHQtnC/eIYXlVONkS0qG2N8="
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "hash": "sha256-3Z3cchyJbAF9lZjCkptFlRuRFXGh4N1IDJzcM9N7H5c="
+ "hash": "sha256-EnyGfkegGKL9viPVFFwBBImCOAUUjyDHMNlx4TiwpcA="
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "hash": "sha256-1Xa1+pNGtFEs/JVNkP+0kGGh1gIAg4FrgIxr+2Rk5hQ="
+ "hash": "sha256-rGb8UBwml1whmhSpVQJeWIQFR/5YvWol0sIJj5khm5E="
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "hash": "sha256-1Awa9oZ4GGMqMGIg+jMutdJq983JxsaU5Fx2KlpD3l4="
+ "hash": "sha256-HvPiBbNVg33gZLjqdlZBXJsnNojZgJRjittP1szCh+0="
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -69,15 +69,15 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "hash": "sha256-eGpbGrg1KbmTjgbb3qkNVlFrR7fb5K+Oal1bcpUQUvM="
+ "hash": "sha256-PXLi1fOPf5rmKiJTO9yZqsHEwLf8raRlKxktKhL+5Sg="
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "hash": "sha256-MrGUpC7XlYa8zDfxCqDkeCrHhehwAkZ6CcZm2fHSzJU="
+ "hash": "sha256-FLu9K0yqgaYGl7gLqfHNHKEDKLFvn2PP9Oxld+QVr+I="
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "hash": "sha256-khGIuDkLOksd4zfHcb0WjI4ygQ3A7blpTbMPkRTXS/I="
+ "hash": "sha256-IELjCKXeGc3iV67of4aPCmcPLqTb1oiZl2d1Po48Q7M="
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -85,14 +85,14 @@
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
- "hash": "sha256-rUxDTrYdYXaVCnjJz+UB2aFnfpHAmflGlVANbhhmO3k="
+ "hash": "sha256-u9d6wicQWjRzxsGrXvIQOrysIDMBVLgjW3DeN1rLTAo="
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
- "hash": "sha256-hnF626VbuUiP95ph8F6Tghxp7B8NQJDDDVcD+HQhd3Y="
+ "hash": "sha256-OkoCbA1x25Wx0/qv2Uzo935tkbEqyodilGDz0hSUCcI="
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
- "hash": "sha256-LsvKrI83j/K3bFNowXcaVPGq2jA8qOrFxkMy4Y+e5mY="
+ "hash": "sha256-k+NO/wzn7BrZBc6J+1tKyuVUEqvdn2t3t82Gn6T42n0="
}
}
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
@@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "maptourist";
- version = "2021-12-18";
+ version = "2021-12-24";
src = fetchurl {
url = "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_${version}.zip";
- hash = "sha256-Ce6CL7N+US+CvlH7hmOqDLlxhbZjBS7mHtzeT+h52G4=";
+ hash = "sha256-02auL0XXGQ0HD5rCUx/i0FF3zIX3Y7h/iKnxOBxzDS0=";
};
sourceRoot = ".";
diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix
@@ -2,20 +2,20 @@
stdenv.mkDerivation rec {
pname = "routinodb";
- version = "211214";
+ version = "211224";
srcs = [
(fetchurl {
url = "https://download.geofabrik.de/europe/finland-${version}.osm.pbf";
- hash = "sha256-sn3C2lcavHazMnyeVXbkKkMhf8OOLY86WgSWJXAQ7bM=";
+ hash = "sha256-aZURNCHMoF0YMGWeBqA4jvopoLJFG3zRkTMEHknX/og=";
})
(fetchurl {
url = "https://download.geofabrik.de/europe/estonia-${version}.osm.pbf";
- hash = "sha256-qNAzGqn+DOo1GMSZ+sBpDINMNpRQkzT0p6MSPyHfTNM=";
+ hash = "sha256-qQSiCb+yt//+rKEFWEW3oYIfVSihotVUgyGdbfo+iTA=";
})
(fetchurl {
url = "https://download.geofabrik.de/russia/northwestern-fed-district-${version}.osm.pbf";
- hash = "sha256-rc+E3PY324DuIoPtP1auzkEoWxwlfgU3LDtjyUSLejo=";
+ hash = "sha256-tcZeBjONmIThUiQHLB/oXIVvfrgdDK60UK9gv8FzY/Y=";
})
];
diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "astronaut";
- version = "0.1.0-rc.2";
+ version = "0.1.0";
src = fetchFromSourcehut {
owner = "~adnano";
repo = pname;
rev = version;
- hash = "sha256-VI+JI7tqS2FHO9pIGAEGqV6oocYH9A/jDsjw9yYbx3k=";
+ hash = "sha256-42n7XB7hJcuB7vvWB2chUUWFyZQkRTsdUnqEloU22GU=";
};
nativeBuildInputs = [ scdoc ];
- vendorSha256 = "sha256-6zf+BdI/3iAlip1Uu2YbZ8dyfTYQlvPi/RmMm3x3BUs=";
+ vendorSha256 = "sha256-7SyawlfJ9toNVuFehGr5GQF6mNmS9E4kkNcqWllp8No=";
installPhase = ''
runHook preInstall
diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix
@@ -2,14 +2,14 @@
python3Packages.buildPythonApplication rec {
pname = "map-machine";
- version = "2021-12-06";
+ version = "2021-12-16";
disabled = python3Packages.pythonOlder "3.9";
src = fetchFromGitHub {
owner = "enzet";
repo = pname;
- rev = "182e856d87ee2923dbd1e93701397e120f5cfd9d";
- hash = "sha256-ohn1apZIWds4EATVJ2LE3JPJAQNotRPoJRWrRVzNezY=";
+ rev = "014e11b826d9aff2fa0e4a54b886654e42d70a7a";
+ hash = "sha256-Bfhe4E8drOsXatPRvrwXduTi8w6Gw00oaz17ZzfGry8=";
};
propagatedBuildInputs = with python3Packages; [