commit a15c1f1e66763e491103580a9f9d94c90cac6f43 parent 6eceaf096151553a230239b1491318cb3b7ba15d Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Sun, 29 Nov 2020 20:02:21 +0300 Up Diffstat:
9 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json @@ -170,15 +170,15 @@ "embox": { "branch": "master", "builtin": false, - "date": "2020-11-25T19:12:11Z", + "date": "2020-11-28T11:17:07Z", "description": "Modular and configurable OS for embedded applications", "homepage": "http://embox.github.io", "owner": "embox", "repo": "embox", - "rev": "175b680662f27a354a1b46043c53be2365523879", - "sha256": "113blgrhldqmrvdc6hmazz8cm1n49bklsldl20inrjwxlglmksd5", + "rev": "41ae5bb81454a2de9aab89eeb98c8412562bc7f0", + "sha256": "13g253l70fifpblmi7dsyk3xm584k7lb4cji4znk32zgsp87hhi5", "type": "tarball", - "url": "https://github.com/embox/embox/archive/175b680662f27a354a1b46043c53be2365523879.tar.gz", + "url": "https://github.com/embox/embox/archive/41ae5bb81454a2de9aab89eeb98c8412562bc7f0.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "foma": { @@ -306,15 +306,15 @@ "go-staticmaps": { "branch": "master", "builtin": false, - "date": "2020-11-25T07:45:29Z", + "date": "2020-11-28T12:44:46Z", "description": "A go (golang) library and command line tool to render static map images using OpenStreetMap tiles", "homepage": "https://github.com/flopp/go-staticmaps", "owner": "flopp", "repo": "go-staticmaps", - "rev": "05e22dfd0432f7f196a3e861f1222846c19f0247", - "sha256": "1m2dm8nriyz1xwwb0424l3abqzarcbd4scgzmwams2pgxbg6jnpq", + "rev": "32fe2092006f5202775424b0db29a9ed9110ddbf", + "sha256": "1zk1v6amjym04fz4n2n4418sx6p85n8nxqi3z5z70pjsh7q1f0xn", "type": "tarball", - "url": "https://github.com/flopp/go-staticmaps/archive/05e22dfd0432f7f196a3e861f1222846c19f0247.tar.gz", + "url": "https://github.com/flopp/go-staticmaps/archive/32fe2092006f5202775424b0db29a9ed9110ddbf.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "gpx-layer": { @@ -377,15 +377,15 @@ "branch": "master", "builtin": false, "changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes", - "date": "2020-11-24T20:11:32Z", + "date": "2020-11-28T19:34:25Z", "description": "GPS log file viewer and analyzer", "homepage": "https://www.gpxsee.org", "owner": "tumic0", "repo": "GPXSee", - "rev": "609e73256a379820434cf2736cc75daf6dd37582", - "sha256": "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8", + "rev": "8423fc1230380e6bb39b863faa1c7fbdce448198", + "sha256": "0mqfjf558kffngk8x8z4yhdafz1nkh6z3b89vhp30gvrfh7yp63y", "type": "tarball", - "url": "https://github.com/tumic0/GPXSee/archive/609e73256a379820434cf2736cc75daf6dd37582.tar.gz", + "url": "https://github.com/tumic0/GPXSee/archive/8423fc1230380e6bb39b863faa1c7fbdce448198.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-11-16T08:25:16Z", + "date": "2020-11-28T07:39:08Z", "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": "d17d1e46232f1e481be86bc5d9b6ecebcd4fd81b", - "sha256": "1k6jkgy49jbmlfkp92vzsy4nkylp5hpnk7mh89ddzl3bjzn4lyml", + "rev": "cb23db3f080965fd906508392e7c7a610d97b4b7", + "sha256": "0amp81gp87432zq3mxymk4jmbm3w1qxgk4klcirrg088w07r3077", "type": "tarball", - "url": "https://github.com/OpenOrienteering/mapper/archive/d17d1e46232f1e481be86bc5d9b6ecebcd4fd81b.tar.gz", + "url": "https://github.com/OpenOrienteering/mapper/archive/cb23db3f080965fd906508392e7c7a610d97b4b7.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "maprec": { @@ -926,15 +926,15 @@ "stardict-3": { "branch": "master", "builtin": false, - "date": "2020-11-23T07:15:10Z", + "date": "2020-11-29T06:47:31Z", "description": "Automatically exported from code.google.com/p/stardict-3", "homepage": "https://github.com/huzheng001/stardict-3", "owner": "huzheng001", "repo": "stardict-3", - "rev": "2e5601b7a56ba586a0aba64d779176f7b063a358", - "sha256": "0z4cxmx0bdnjm8a305740dv9ykf7m26l6nx2fi563rqn82h599yx", + "rev": "e51e6656e6b693554853d37a4b36b92fb39b9f82", + "sha256": "1giiaxgraqd34iaa9y2d1j5w57a71jm5fliv1vrj2zqsdbv6llfa", "type": "tarball", - "url": "https://github.com/huzheng001/stardict-3/archive/2e5601b7a56ba586a0aba64d779176f7b063a358.tar.gz", + "url": "https://github.com/huzheng001/stardict-3/archive/e51e6656e6b693554853d37a4b36b92fb39b9f82.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "supermercado": { diff --git a/pkgs/applications/openorienteering-mapper/add-nakarte-link.patch b/pkgs/applications/gis/openorienteering-mapper/add-nakarte-link.patch diff --git a/pkgs/applications/openorienteering-mapper/bin.nix b/pkgs/applications/gis/openorienteering-mapper/bin.nix diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix diff --git a/pkgs/applications/openorienteering-mapper/fix-qttranslations-path.patch b/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.patch diff --git a/pkgs/data/dicts/freedict/default.nix b/pkgs/data/dicts/freedict/default.nix @@ -13,7 +13,7 @@ }; fin-eng = callPackage ./base.nix { lang = "fin-eng"; - version = "2020.02.08"; - sha256 = "036ai6avh5xq5f0bi8rzykc44rrqir71xw40w44fwknfd814jjh7"; + version = "2020.10.04"; + sha256 = "0zyy01qp2d934s8l02zkb25iszvkj5dq3ac9rmygsxcigpzcg5dh"; }; } diff --git a/pkgs/data/dicts/wiktionary/default.nix b/pkgs/data/dicts/wiktionary/default.nix @@ -3,55 +3,55 @@ { en-ru = callPackage ./base.nix { lang = "en-ru"; - version = "2020-09-02"; - sha256 = "0vqnxb4cs81b5wkhmkwxsyg85mi23sym0dkmxxwky53aksrd14m6"; + version = "2020-11-25"; + sha256 = "0rznkaxfqx5ympb6k2nisa4r9siw7gvmzq208pr46ya0qsz5if7h"; }; de-ru = callPackage ./base.nix { lang = "de-ru"; - version = "2020-08-28"; - sha256 = "1pnq7ip4yvcdam2ayvwjqaggb0dfiqdby421q0awm9cfa1pgm6dc"; + version = "2020-11-27"; + sha256 = "1m40ac8mrvsb7ksm08c0nip1abnjy8jfaj5qad9pm18fpp68b494"; }; fi-ru = callPackage ./base.nix { lang = "fi-ru"; - version = "2020-08-31"; - sha256 = "0qxwnw8k97cyffdnh01295niqk6yz4db1gh8izl4mf7y6rapm2r3"; + version = "2020-11-23"; + sha256 = "0mac6gs437inn3b0q8prq3vm2qw0wnhbyhmlq2g40kxh033hjzc1"; }; ru-en = callPackage ./base.nix { lang = "ru-en"; - version = "2020-08-21"; - sha256 = "0hzpv0mw03yqz9f8ckx8qhvy6pyzsw6rm42ix36q6f19i1h4qj0g"; + version = "2020-11-21"; + sha256 = "1dw76ak0rcqpb508wqzfsv9xfmjipx07zb212fnj1nhyrvmw388y"; }; ru-de = callPackage ./base.nix { lang = "ru-de"; - version = "2020-08-21"; - sha256 = "0bixh9hky66v7w3xd724k4amzw8p7kgpy1xr7a31126l4mk1dzwl"; + version = "2020-11-21"; + sha256 = "1kw726vq5ghjb17a28m6bqp8jca2pqj5s72g1da00288wy3ccx02"; }; ru-uk = callPackage ./base.nix { lang = "ru-uk"; - version = "2020-08-21"; - sha256 = "02rl69iqnvplh1zkdnpq9x12y533c0kzd7869irg1qxw4cwr8pm2"; + version = "2020-11-21"; + sha256 = "0gx1pjyi24vk02kwmxygb252qgqnw2vqwjaasxlq2s7825nhr8rm"; }; ru-eo = callPackage ./base.nix { lang = "ru-eo"; - version = "2020-08-21"; - sha256 = "0qhwh8f9qfdgsqrvcpb5n3g20lh9w2k2paqhv4z3lmapsv1f1njb"; + version = "2020-11-21"; + sha256 = "0bfbygk8pflahjil7r4gfdcimp306wx4bbccz92hp2dvdy83sngg"; }; ru-fi = callPackage ./base.nix { lang = "ru-fi"; - version = "2020-08-21"; - sha256 = "063hyng3xj1gqjy9fyc7fffs33g0kpwr35y1gqa8kkmb2sfdhwka"; + version = "2020-11-21"; + sha256 = "0z6r2mgq9rzlr7rnfxch6h17nj6dj7wbpj2p4hyjd0awnvzc85s2"; }; ru-sv = callPackage ./base.nix { lang = "ru-sv"; - version = "2020-08-21"; - sha256 = "0bmd8wlrxs3a3gxwhr6cpxz7rprdy92lppg7rjxn8hixfyc69akj"; + version = "2020-11-21"; + sha256 = "0123a26xi37wfp5b012v6634mxfdjyxa110bfxsjcpm379slbcnb"; }; } diff --git a/pkgs/data/maps/gpxsee-poi/default.nix b/pkgs/data/maps/gpxsee-poi/default.nix @@ -2,9 +2,9 @@ { geocachingSu = fetchurl { - name = "geocaching_su-2020-11-25"; + name = "geocaching_su-2020-11-29"; url = "https://nakarte.me/geocachingSu/geocaching_su2.json"; - sha256 = "0vxpdh104nsgnqrmi3z13gxlpcckq2fshsk7mbv1qzmnzar9dqaa"; + sha256 = "15rmw6ajlnybrm55vrbfg1xg76ya42465nkikhy40bivy98w5zm2"; downloadToTemp = true; recursiveHash = true; postFetch = '' @@ -25,15 +25,15 @@ }; laavut = fetchurl { - name = "laavut-2020-10-18"; - url = "http://www.laavu.org/lataa.php?paikkakunta=kaikki"; - sha256 = "0cvsfxlnibx1s9fh6v0kk77n0yg497znyiwj1n4ih77w1q8jxpw0"; + name = "laavut-2020-11-16"; + url = "http://laavu.org/lataa.php?paikkakunta=kaikki"; + sha256 = "11b8ipd6whdiwb1vx6580b9syjgrcf573kr80zpwl5nx1k3rxm95"; downloadToTemp = true; recursiveHash = true; postFetch = "install -Dm644 $downloadedFile $out/Laavut-kodat.gpx"; meta = with lib; { - homepage = "http://www.laavu.org/"; + homepage = "http://laavu.org/"; description = "Laavut ja kodat kartalla"; maintainers = [ maintainers.sikmir ]; license = licenses.free; diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -31,10 +31,10 @@ lib.makeScope newScope ( mapsoft = callPackage ./applications/gis/mapsoft { }; mapsoft2 = callPackage ./applications/gis/mapsoft/2.nix { }; nnn-plugins = callPackage ./applications/nnn-plugins { }; - openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper { + openorienteering-mapper = libsForQt5.callPackage ./applications/gis/openorienteering-mapper { inherit sources; }; - openorienteering-mapper-bin = callPackage ./applications/openorienteering-mapper/bin.nix { }; + openorienteering-mapper-bin = callPackage ./applications/gis/openorienteering-mapper/bin.nix { }; qgis-bin = callPackage ./applications/gis/qgis/bin.nix { }; qgis-ltr-bin = qgis-bin.override { releaseType = "ltr"; }; qmapshack-bin = callPackage ./applications/gis/qmapshack/bin.nix { };