commit a4e2df275ebc27e014d54cfe440b2d14cf2299ad
parent 0307e76dc2e4f705a1fe1c3eb325d5c1eeacf836
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 16 Nov 2020 10:18:17 +0300
Up
Diffstat:
5 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -114,15 +114,15 @@
"embox": {
"branch": "master",
"builtin": false,
- "date": "2020-11-12T10:56:59Z",
+ "date": "2020-11-15T16:12:55Z",
"description": "Modular and configurable OS for embedded applications",
"homepage": "http://embox.github.io",
"owner": "embox",
"repo": "embox",
- "rev": "56f5c90745645c3dfe55324354cab41bb451cac2",
- "sha256": "1avf0a22qkj67w6hglk6hlfh5h9n3k06g97dzrvhng0d1hhk4ng0",
+ "rev": "d1478a7919e643a6672277287b041b4c771123a1",
+ "sha256": "1d7pjw7rvnrn0ppywkns7c68q82a7bf25jc6ycvc5kyrzydp3k3y",
"type": "tarball",
- "url": "https://github.com/embox/embox/archive/56f5c90745645c3dfe55324354cab41bb451cac2.tar.gz",
+ "url": "https://github.com/embox/embox/archive/d1478a7919e643a6672277287b041b4c771123a1.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"foma": {
@@ -250,15 +250,15 @@
"go-staticmaps": {
"branch": "master",
"builtin": false,
- "date": "2020-10-17T07:48:34Z",
+ "date": "2020-11-14T15:21:59Z",
"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": "112a0c57b9e3bb9cb2333434c86966e49e1c531f",
- "sha256": "1x980pnsdj6h8hlfsjlwij9rnqcyygbzn41s0a6gdharmq8cnr18",
+ "rev": "717fee3c304c381f2c363a743adebe968c3b5660",
+ "sha256": "04np6ckr9hy947j25bcwliv5gpg78fzqcka008rk6w13gwpmdx72",
"type": "tarball",
- "url": "https://github.com/flopp/go-staticmaps/archive/112a0c57b9e3bb9cb2333434c86966e49e1c531f.tar.gz",
+ "url": "https://github.com/flopp/go-staticmaps/archive/717fee3c304c381f2c363a743adebe968c3b5660.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gpx-layer": {
@@ -321,15 +321,15 @@
"branch": "master",
"builtin": false,
"changelog": "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes",
- "date": "2020-11-11T22:15:12Z",
+ "date": "2020-11-15T19:10:08Z",
"description": "GPS log file viewer and analyzer",
"homepage": "https://www.gpxsee.org",
"owner": "tumic0",
"repo": "GPXSee",
- "rev": "ed9ebfffac6c7c2202741cff25e4762b7178ff83",
- "sha256": "1r3icp5fqcbwpg57qzl1gr8lcjhnwdhhmz2r61b4mqg8vg0qy9pr",
+ "rev": "3635a7dfdcac0e9810d4347711b3dbd03c661aee",
+ "sha256": "1827mbmf0rpicv9iaz6fa29qm9agkndw7d78n73fkx8rj815xvnj",
"type": "tarball",
- "url": "https://github.com/tumic0/GPXSee/archive/ed9ebfffac6c7c2202741cff25e4762b7178ff83.tar.gz",
+ "url": "https://github.com/tumic0/GPXSee/archive/3635a7dfdcac0e9810d4347711b3dbd03c661aee.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gpxsee-maps": {
@@ -362,15 +362,15 @@
"gpxtrackposter": {
"branch": "master",
"builtin": false,
- "date": "2020-11-01T16:06:27Z",
+ "date": "2020-11-14T10:31:45Z",
"description": "Create a visually appealing poster from your GPX tracks",
"homepage": "https://github.com/flopp/GpxTrackPoster",
"owner": "flopp",
"repo": "GpxTrackPoster",
- "rev": "e0703c5c161c5ed87b6c414d9de19bc04308d3a8",
- "sha256": "1w08fwqlw7hlcb9i26387v0qqs759yqnzvqx1q0rbfyg59dhgr33",
+ "rev": "57aa34feb43f8b76ef40d1500067e532d2ff439a",
+ "sha256": "1pfs32hlaaagh7vhhfw64z723fq38h1b8lkr6b5ip2zwvjwb4v27",
"type": "tarball",
- "url": "https://github.com/flopp/GpxTrackPoster/archive/e0703c5c161c5ed87b6c414d9de19bc04308d3a8.tar.gz",
+ "url": "https://github.com/flopp/GpxTrackPoster/archive/57aa34feb43f8b76ef40d1500067e532d2ff439a.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"gt-bash-client": {
@@ -474,15 +474,15 @@
"klogg": {
"branch": "master",
"builtin": false,
- "date": "2020-11-07T20:44:46Z",
+ "date": "2020-11-15T17:13:25Z",
"description": "A fast, advanced log explorer based on glogg project",
"homepage": "https://klogg.filimonov.dev/",
"owner": "variar",
"repo": "klogg",
- "rev": "d8ee6b3c9fa33bac527799795bc89d1e3f8a8c2a",
- "sha256": "1apmk6cski0z5fkimj728jnnj39p7hl3wa4ab5rw5mcv5sjij77k",
+ "rev": "4f7708421e50b3c5554e056351ead354e9a53098",
+ "sha256": "14mpaq1hh7m051ija0w34p2w4rs51bq706ajih1360h2rmfsbmcl",
"type": "tarball",
- "url": "https://github.com/variar/klogg/archive/d8ee6b3c9fa33bac527799795bc89d1e3f8a8c2a.tar.gz",
+ "url": "https://github.com/variar/klogg/archive/4f7708421e50b3c5554e056351ead354e9a53098.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"libshell": {
@@ -574,11 +574,11 @@
"description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin",
"homepage": "https://maptourist.org",
"region": "szfo",
- "sha256": "1n56xaz4v87aaahfdl653ckw381fbf7jx3m2ri531c8sha5m3idg",
+ "sha256": "1k1ckwbrr670aq6a4sg5rlqhd8xy2qwl6jyhvk71ald23rn797vy",
"type": "file",
- "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-11-12.zip",
+ "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-11-15.zip",
"url_template": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-<region>-RU_<version>.zip",
- "version": "2020-11-12"
+ "version": "2020-11-15"
},
"mercantile": {
"branch": "master",
@@ -677,15 +677,15 @@
"nnn": {
"branch": "master",
"builtin": false,
- "date": "2020-11-12T02:47:14Z",
+ "date": "2020-11-15T15:01:31Z",
"description": "n³ The missing terminal file manager for X",
"homepage": "https://github.com/jarun/nnn",
"owner": "jarun",
"repo": "nnn",
- "rev": "1c4bc318f50f259c368f15e37dbf4b5246eade77",
- "sha256": "0fkn9xp5z1wfpgg9p87kgc6i20znziqqrns7jpx7jzaf5s3kl8y2",
+ "rev": "b528bc734bdfc219afbdd3d9b38e53a1627dbae9",
+ "sha256": "0nqh3r02h2ncsqf3dq93y4k0jm9l90kdyjgm1ww01a1v5dh12bl8",
"type": "tarball",
- "url": "https://github.com/jarun/nnn/archive/1c4bc318f50f259c368f15e37dbf4b5246eade77.tar.gz",
+ "url": "https://github.com/jarun/nnn/archive/b528bc734bdfc219afbdd3d9b38e53a1627dbae9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"odict": {
diff --git a/pkgs/applications/gis/mapsoft/2.nix b/pkgs/applications/gis/mapsoft/2.nix
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "mapsoft2";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "slazav";
repo = pname;
rev = "${version}-alt1";
- sha256 = "1jal7k2wm7b3mjkd8r68bp0bh8gqyzlwbdkyhxpx5gm8mqv2fnxx";
+ sha256 = "092n7hivdn4qk3bdinxszxgs2r79smxnkwgjw867yrh1h89n0bnd";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
inherit (sources.gpxsee) description homepage changelog;
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = [ "x86_64-darwin" ];
skip.ci = true;
diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix
@@ -45,7 +45,7 @@ mkDerivation {
meta = with lib; {
inherit (sources.gpxsee) description homepage changelog;
- license = licenses.gpl3;
+ license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
};
diff --git a/pkgs/tools/geo/gpxtrackposter/default.nix b/pkgs/tools/geo/gpxtrackposter/default.nix
@@ -32,11 +32,19 @@ python3Packages.buildPythonApplication {
timezonefinder
];
- checkInputs = with python3Packages; [ pytestCheckHook ];
+ checkInputs = with python3Packages; [
+ pytestCheckHook
+ (pytest-mock.overrideAttrs (old: rec {
+ pname = "pytest-mock";
+ version = "3.3.1";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "10mv262aq0y70g7q9689vkalaayx73l8kylzgpkr7a7455rx7mm4";
+ };
+ }))
+ ];
- postInstall = ''
- rm -fr $out/requirements*.txt
- '';
+ postInstall = "rm -fr $out/requirements*.txt";
meta = with lib; {
inherit (sources.gpxtrackposter) description homepage;
