commit e924fdc46d96e10a30736db1b0c2520fb21b487d
parent 7099fe1ffe7688b6e7cb1bbb48b2e1f55bdf366b
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 28 Dec 2020 16:40:06 +0300
Up
Diffstat:
7 files changed, 86 insertions(+), 60 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -142,15 +142,15 @@
"elevation": {
"branch": "master",
"builtin": false,
- "date": "2020-11-18T14:56:35Z",
+ "date": "2020-12-27T22:12:39Z",
"description": "Python script to download global terrain digital elevation models, SRTM 30m DEM and SRTM 90m DEM",
"homepage": "http://elevation.bopen.eu",
"owner": "bopen",
"repo": "elevation",
- "rev": "1930e479d0fceee86351f33226ab0cac411492e2",
- "sha256": "0ylywznl8bla8vaf7kqcaszh5jvrpdl0pa20pps5r0238nqb88fv",
+ "rev": "6819b2931f5de412bd6b18bd07f1674f71fa35e5",
+ "sha256": "16sywbifg0xb0fx1sscqsrbrj0phc91p4vvlsaj2h5mswd5x3bfj",
"type": "tarball",
- "url": "https://github.com/bopen/elevation/archive/1930e479d0fceee86351f33226ab0cac411492e2.tar.gz",
+ "url": "https://github.com/bopen/elevation/archive/6819b2931f5de412bd6b18bd07f1674f71fa35e5.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"elevation-server": {
@@ -170,15 +170,15 @@
"embox": {
"branch": "master",
"builtin": false,
- "date": "2020-12-26T10:51:40Z",
+ "date": "2020-12-28T09:57:43Z",
"description": "Modular and configurable OS for embedded applications",
"homepage": "http://embox.github.io",
"owner": "embox",
"repo": "embox",
- "rev": "ad5db3cb9cfb98795d7a88d871fcc1cc9c273c91",
- "sha256": "1l2sidv1n4ln6k7wpfy4yxs61lvhbj4zsl9067rhgzb45yvkssbm",
+ "rev": "44e12595d87032daa6276e24e3728ecd8ec27c1a",
+ "sha256": "1cl3f19dx5cm1gj54c30bq386wg4cd279nn9nmv6rb6yfldyxqh2",
"type": "tarball",
- "url": "https://github.com/embox/embox/archive/ad5db3cb9cfb98795d7a88d871fcc1cc9c273c91.tar.gz",
+ "url": "https://github.com/embox/embox/archive/44e12595d87032daa6276e24e3728ecd8ec27c1a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"foma": {
@@ -239,27 +239,27 @@
},
"geofabrik-estonia": {
"builtin": false,
- "sha256": "0xhjcvii2pq8dhg0ar3ppazm8b8mpf9a96qadqzv22l1wkq3fjf5",
+ "sha256": "1ihna8j77miznn5i2v508nmx1ljw03r4illjrwqp9p3x167hh1bc",
"type": "file",
- "url": "https://download.geofabrik.de/europe/estonia-201221.osm.pbf",
+ "url": "https://download.geofabrik.de/europe/estonia-201226.osm.pbf",
"url_template": "https://download.geofabrik.de/europe/estonia-<version>.osm.pbf",
- "version": "201221"
+ "version": "201226"
},
"geofabrik-finland": {
"builtin": false,
- "sha256": "00912cwyb52bvgl297si8x0jz8dwv8z91naabbijcgjb4jvx9dkh",
+ "sha256": "18cfksbx8yjzw6g82s88jg0a94179nv2pv3lndfb13jkqks7k048",
"type": "file",
- "url": "https://download.geofabrik.de/europe/finland-201221.osm.pbf",
+ "url": "https://download.geofabrik.de/europe/finland-201226.osm.pbf",
"url_template": "https://download.geofabrik.de/europe/finland-<version>.osm.pbf",
- "version": "201221"
+ "version": "201226"
},
"geofabrik-russia-nwfd": {
"builtin": false,
- "sha256": "12ack4y6bh3knkqqsdgdrbmm99bpd9fz5v5r8pajdii6pb1i989f",
+ "sha256": "1z9j3jncm2fp8i084fa7d9x74r4f40wdc89sis47qwglpcs9ks4k",
"type": "file",
- "url": "https://download.geofabrik.de/russia/northwestern-fed-district-201221.osm.pbf",
+ "url": "https://download.geofabrik.de/russia/northwestern-fed-district-201226.osm.pbf",
"url_template": "https://download.geofabrik.de/russia/northwestern-fed-district-<version>.osm.pbf",
- "version": "201221"
+ "version": "201226"
},
"gimgtools": {
"branch": "master",
@@ -377,15 +377,15 @@
"branch": "master",
"builtin": false,
"changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes",
- "date": "2020-12-27T01:48:47Z",
+ "date": "2020-12-28T10:19:44Z",
"description": "GPS log file viewer and analyzer",
"homepage": "https://www.gpxsee.org",
"owner": "tumic0",
"repo": "GPXSee",
- "rev": "73aab4484818e6242a32d166dbbda2f873c18aaa",
- "sha256": "0cwhzdf17r3p83hi1paqrw9r8kfik8nb80a6pgh6rwkcxv2s2vif",
+ "rev": "26cbbee1351c43539f5040a260d1cda4763b43b0",
+ "sha256": "0m12dg9jy5s1d7jgpqy3a9qj0mr30w6bymgg0xsfc44q9i1l3vh9",
"type": "tarball",
- "url": "https://github.com/tumic0/GPXSee/archive/73aab4484818e6242a32d166dbbda2f873c18aaa.tar.gz",
+ "url": "https://github.com/tumic0/GPXSee/archive/26cbbee1351c43539f5040a260d1cda4763b43b0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gpxsee-maps": {
@@ -629,15 +629,15 @@
"mapper": {
"branch": "master",
"builtin": false,
- "date": "2020-12-27T15:14:46Z",
+ "date": "2020-12-28T05:35:12Z",
"description": "OpenOrienteering Mapper is a software for creating maps for the orienteering sport",
"homepage": "https://www.openorienteering.org/apps/mapper/",
"owner": "OpenOrienteering",
"repo": "mapper",
- "rev": "a645fc2e0a09f8d6ad482880ddf6e04b9af2f3cd",
- "sha256": "1xf7d13m45hmb0pwas6xy8y2pj1dv06iy065p0132gik8w4khx6n",
+ "rev": "36d6fb179fe2ffdf0cb63ac39bbe25f215a524f5",
+ "sha256": "1vpa6yk33zlx95brrssba3wjlb2d45s6z7il11glkhs575by25sc",
"type": "tarball",
- "url": "https://github.com/OpenOrienteering/mapper/archive/a645fc2e0a09f8d6ad482880ddf6e04b9af2f3cd.tar.gz",
+ "url": "https://github.com/OpenOrienteering/mapper/archive/36d6fb179fe2ffdf0cb63ac39bbe25f215a524f5.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"maprec": {
@@ -739,11 +739,11 @@
"builtin": false,
"description": "Maanmittauslaitoksen peruskartan tasoiset ja näköiset ilmaiset maastokartat",
"homepage": "https://kartat.hylly.org/",
- "sha256": "13azgwh1j802w8zr08q9f5r3zw92wnn5b9hpqawpgcgkkxm5sl9a",
+ "sha256": "07rfp4mgglazm93q1p217f3f14js4ddifg1060zn61l5rcmwsm3b",
"type": "file",
- "url": "https://kartat-dl.hylly.org/2020-11-24/mtk_suomi.img",
+ "url": "https://kartat-dl.hylly.org/2020-12-26/mtk_suomi.img",
"url_template": "https://kartat-dl.hylly.org/<version>/mtk_suomi.img",
- "version": "2020-11-24"
+ "version": "2020-12-26"
},
"musig": {
"branch": "master",
@@ -776,15 +776,15 @@
"nnn": {
"branch": "master",
"builtin": false,
- "date": "2020-12-18T14:12:51Z",
+ "date": "2020-12-28T01:47:11Z",
"description": "n³ The missing terminal file manager for X",
"homepage": "https://github.com/jarun/nnn",
"owner": "jarun",
"repo": "nnn",
- "rev": "66a8b69426984ada9c9a3e1a8fd7d1d356e2ac49",
- "sha256": "1nw5k6dln5mni8a3ff0fv5nqgxkarifb16wray63xav4827dmvac",
+ "rev": "057c88a1e9e74c3b136239d3a8508b72c31a2d5f",
+ "sha256": "1j43wqwfrmlyxfvb9l94spxgm3hxq7lcx5jin2rnf4iz7wb343a8",
"type": "tarball",
- "url": "https://github.com/jarun/nnn/archive/66a8b69426984ada9c9a3e1a8fd7d1d356e2ac49.tar.gz",
+ "url": "https://github.com/jarun/nnn/archive/057c88a1e9e74c3b136239d3a8508b72c31a2d5f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"odict": {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
@@ -7,6 +7,7 @@ let
"eng deu"
"eng fin"
"eng rus"
+ "eng ukr"
"epo eng"
"epo rus"
"fin eng"
@@ -15,12 +16,15 @@ let
"rus eng"
"rus epo"
"rus fin"
+ "rus ukr"
+ "ukr eng"
+ "ukr rus"
];
tatoeba = builtins.fromJSON (builtins.readFile ./tatoeba.json);
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
- version = "2020-12-19";
+ version = "2020-12-26";
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,59 +1,67 @@
{
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
- "sha256": "09a9v2dwz1a48hflcdwiy1y2mm9icxh31ynx94jyql2pggv86kf6"
+ "sha256": "1hag9xn7q1nfh9kzmf9cz0a7dxd5865yzny0rq20bsaqh5mlsz0s"
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
- "sha256": "193y4hnaa4sngbwhyhmb55bcih980890m7x570rprnaa64iv8yrc"
+ "sha256": "1nl4k54ylmcqh976k23pyxb2dl485fs0bmmlzifijaacha0x9c3j"
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
- "sha256": "1vl5h4x5ndc2w6h50r3z3cjxyy73l0y5djiw5h4h7w43nbfn8pg4"
+ "sha256": "0s081wm46030hnd08kl668i446y122qxidgs9zbvw20z03a8954v"
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
- "sha256": "0a86qwkafn8rxj5syyvjgllaqxy3545ir6741z2k8jcsmqvp2n6v"
+ "sha256": "0bp4lm56x1ajvl3vdikd4613az4ic7rx6sczdmjhix4qywgb6bhg"
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
- "sha256": "1yqbchxjahwywc45d7z99yx1jr8k8yqllv0s11niphlglkp98qwb"
+ "sha256": "1s4ccfqm2s4mmpy8cni9cxvbzyg6z4rm9jqk1mgjgqdxlcq5v1pk"
+ },
+ "ukr_sentences_detailed": {
+ "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
+ "sha256": "0lly4kgw1awxpqzljp5mijqazi7aikhrfyjrl8zanvc33nsnkd0x"
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
- "sha256": "0mrrmxr4m3yg2icmrzlx5rrbjk0pvasqc5qhcvjibazwnjnrb5v3"
+ "sha256": "1gmafjghyyh3yi7ya3dxhx7lj672pf0qd2wi8rbgdnwjghh4wa7v"
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
- "sha256": "0wggsqw7iiliv4vhds45yk38i0vm7bsjkdvgrbghplp5fpkxkraw"
+ "sha256": "1is63a316pkx9igqhq6zfqbzr853jzb77q4xkvafpfxz4cpqbrj4"
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
- "sha256": "14s77ka3v6w0zmdz52pghi5xli7kbkd924iwgkgsh1kal6qgg8jg"
+ "sha256": "12caxi1h4489m0sqs82gsfqd9l4y3d0rqnjin0mgaq7i4j3z8dzs"
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
- "sha256": "1r6ng4x2pb3n45ckxw7ck76w9r0k7mqs8242w5sdxgdh9737ih7d"
+ "sha256": "112v8hdzabvp16crcng9i11w4lfkdanw74zhqnpf4ywvlq35wgk9"
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
- "sha256": "0jr8f9mmg356brfzyjdsfqb4kxfjpyapanzxpywkal13w27hv43k"
+ "sha256": "1ybnzmlzj9rffkfjk4xsfxs2yrscakjyjl1q14pdsm40xxvj64ad"
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
- "sha256": "1jdi1wxk8l91j7sb8fbdwyyjcj2d5py0yqnimvic1lv0sfji8cbn"
+ "sha256": "1yhdmld70czyw90m1cjpx465r5x4gq88hjckzhvvs2f30x6cwbwa"
+ },
+ "eng-ukr_links": {
+ "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
+ "sha256": "15k1yylk74pmcllqkkg05jw2wd4wrrng1xx6q0xn9ns3m4x781kb"
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
- "sha256": "0hwnypk1in2d7g2jxrvd33j812fmzhq7iqf3hsp36ayycjz13bjg"
+ "sha256": "0s8lav32yisdawb8ahmqg799hk8vymj840f8ck7xcbvcwp92m6i4"
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
- "sha256": "1agzw48sd86y55h4diij13vzmi049h5jzxgp44ijv4akk0b0qjvk"
+ "sha256": "1nl8i5m2hmql0r3kxh0xq42399s04bl092wiil480aa50iq7qsbx"
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
- "sha256": "0hrkcsd23s8j82zw81h2pawz45dqk4r1j7wk8sppmwn10fnljb7i"
+ "sha256": "021vsj07i5ala4b2061ggmf8md282bw3ck0yhj96hngv5g1ya8iy"
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -61,18 +69,30 @@
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
- "sha256": "0gjvgp1k95xv7i244d66y02yhmb3dpvkh1sz428k7q0hvlzajcvp"
+ "sha256": "1j75h743ly2223k84h7swdqlghp8l355n4xs08q9nk2hx08l0mm4"
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
- "sha256": "0gy4fnf9l0avlgcfn9b832hwkgpx28faqmafim6p9q0zjnbw58b1"
+ "sha256": "0rwdydhqd0blx569cfpwcvbpadwig7mv69sid1a2h6n6qsyi35zj"
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
- "sha256": "1hdakkjqhmcqngnxfm3wgsc17cj21c03m9k8iqyjcy6n7jwc7s8k"
+ "sha256": "0ardib488fh0124scqqy7p91gikjkiprhnz66vj1hpy5jj1ji14q"
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
"sha256": "0qx2fvysxxdgazqn2g0jf4n3i2rkz42ih54cw4lnw5ah26qwq0ks"
+ },
+ "rus-ukr_links": {
+ "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
+ "sha256": "1zkwxabqghxl6nkc8pz0yqmw6bd2p4l8v985zwhq83kysm3jkd99"
+ },
+ "ukr-eng_links": {
+ "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
+ "sha256": "0vf1vwj6fc4nm9h0ghkxbpb7v1b04m1x81zjkrnv464l5l0sg0s8"
+ },
+ "ukr-rus_links": {
+ "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
+ "sha256": "0wapkwk7y1qq7bs4yzk4fsdkn01wvg2jnabk1wdbhjffsj177mml"
}
}
diff --git a/pkgs/data/misc/poi/default.nix b/pkgs/data/misc/poi/default.nix
@@ -2,9 +2,9 @@
{
geocachingSu = fetchurl {
- name = "geocaching_su-2020-12-20";
+ name = "geocaching_su-2020-12-28";
url = "https://nakarte.me/geocachingSu/geocaching_su2.json";
- sha256 = "09zwndp7aglwblmgwdi0mq4kwz7x0g9gahwypx14j7ik883azzbw";
+ sha256 = "0mdvkrlhkyigy1iznnd6c1xa1qxg1yv0np7ljfmkry4x8ysgnc3p";
downloadToTemp = true;
recursiveHash = true;
postFetch = ''
@@ -61,9 +61,9 @@
};
westra = fetchurl {
- name = "westra-2020-12-16";
+ name = "westra-2020-12-28";
url = "https://nakarte.me/westraPasses/westra_passes.json";
- sha256 = "1k8snxg95jfcmjqzx81s0r751pmx5pakq5kd2lq01zrvss725mpz";
+ sha256 = "1hszh54q22dbhrz9rldrg59yxsivhw4hfdrjf7y74y2nv4770l26";
downloadToTemp = true;
recursiveHash = true;
postFetch = ''
diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/servers/nakarte/default.nix
@@ -17,8 +17,8 @@ mkYarnPackage {
buildPhase = "yarn build";
installPhase = ''
- install -dm755 $out/share/nginx
- mv deps/nakarte/build $out/share/nginx/html
+ install -dm755 $out
+ cp -r deps/nakarte/build/* $out
'';
distPhase = "true";
diff --git a/pkgs/servers/quark/default.nix b/pkgs/servers/quark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchgit, patches ? [] }:
stdenv.mkDerivation {
pname = "quark";
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
sha256 = "0308pfbyvbl5gfpl9lq62siz4kf7ki2zkk47p3b9r3j33dlpiszl";
};
+ inherit patches;
+
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/gurl/default.nix b/pkgs/tools/networking/gurl/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "gurl-unstable";
- version = "2020-09-19";
+ version = "2020-12-28";
src = fetchFromGitHub {
owner = "MasterQ32";
repo = "gurl";
- rev = "e5a61b2db685a53cdbdfb1c6ac160e938683d4ec";
- sha256 = "1y738ip0b6ck0ibybibqw8dlx37mrqamygvm81jv9wqp1sxsi7gb";
+ rev = "13e2999a8c86a84ed9b3054f1f7ef9613387b778";
+ sha256 = "0yyxgl9kj25frz1m2wwvbrpl83r7w1pkqp52zfm2qhrv6qzjqic7";
fetchSubmodules = true;
};
