nur-packages

commit ecb29f26898b0b69bb3e7fbe237a714fd882e105
parent e1ecbf55fbfbf053730fe42a9559916e7eafee56
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sun,  5 Apr 2020 00:05:05 +0300

Up

Diffstat:
M
nix/sources.json
 | 
18
+++++++++---------
M
pkgs/applications/mapsoft/0002-fix-build.patch
 | 
16
----------------
M
pkgs/applications/mapsoft/2.nix
 | 
6
+++---

3 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/nix/sources.json b/nix/sources.json
@@ -212,10 +212,10 @@
         "homepage": "https://tumic0.github.io/GPXSee-maps",
         "owner": "tumic0",
         "repo": "GPXSee-maps",
-        "rev": "8c29b66ac823db87606d8640c32d3f9b7b543efd",
-        "sha256": "12lbksjr4ffxr1mx3fa10fijg9y3mby1adpw5hgpwk640dgk46rs",
+        "rev": "1d63d4f0e8301e6f9f1d552c19632b35ea20434a",
+        "sha256": "0ar1xl33s9k14mclg905daj8vsgxq68i03k43v8w812lfqxp7cx4",
         "type": "tarball",
-        "url": "https://github.com/tumic0/GPXSee-maps/archive/8c29b66ac823db87606d8640c32d3f9b7b543efd.tar.gz",
+        "url": "https://github.com/tumic0/GPXSee-maps/archive/1d63d4f0e8301e6f9f1d552c19632b35ea20434a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "gpxtools": {
@@ -303,10 +303,10 @@
         "homepage": "https://www.openorienteering.org/apps/mapper/",
         "owner": "OpenOrienteering",
         "repo": "mapper",
-        "rev": "ed58c13897e576695fe0857e871e5b3a9ca9cfa5",
-        "sha256": "1h5jv99n7qjf2cgdxrb3p64v2sgzyndrsv49q272lly9wx9g61c4",
+        "rev": "e8ff8d94a6f57771eec6b63326fe7eda6f43a775",
+        "sha256": "165wjk2nm69h4ghq6xqn2w3pyiixgrxmn4mvixy5nvwnhjsi1ckq",
         "type": "tarball",
-        "url": "https://github.com/OpenOrienteering/mapper/archive/ed58c13897e576695fe0857e871e5b3a9ca9cfa5.tar.gz",
+        "url": "https://github.com/OpenOrienteering/mapper/archive/e8ff8d94a6f57771eec6b63326fe7eda6f43a775.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "mapsoft": {
@@ -327,11 +327,11 @@
         "description": "Ежедневная сборка карт из данных OpenStreetMap для навигационных приборов и приложений Garmin",
         "homepage": "https://maptourist.org",
         "region": "szfo",
-        "sha256": "1mclfv7nckcmzhyfpnsdplvm48lkdz2lx3vqfkgwqv1h3kpbzjcz",
+        "sha256": "0r25rh9l5g248jwjd2kjx3zcs1v51lwmz0jzydwnng94sxr7ya7f",
         "type": "file",
-        "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-03-31.zip",
+        "url": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-szfo-RU_2020-04-03.zip",
         "url_template": "https://maptourist.org/osm-garmin/archive/OSM-MapTourist-<region>-RU_<version>.zip",
-        "version": "2020-03-31"
+        "version": "2020-04-03"
     },
     "mbtileserver": {
         "branch": "master",
diff --git a/pkgs/applications/mapsoft/0002-fix-build.patch b/pkgs/applications/mapsoft/0002-fix-build.patch
@@ -1,20 +1,4 @@
 Submodule modules contains modified content
-diff --git i/modules/Makefile.inc w/modules/Makefile.inc
-index 3ff6a7a..da19730 100644
---- i/modules/Makefile.inc
-+++ w/modules/Makefile.inc
-@@ -50,9 +50,9 @@ $(shell $(MODDIR)/get_deps $(MODDIR) . > Makefile.deps)
- # Building flags
- 
- override CXXFLAGS += $(shell [ "$(PKG_CONFIG)" == "" ] ||\
--                      PKG_CONFIG_PATH=$(MODDIR)/pc pkg-config --cflags '$(PKG_CONFIG)')
-+                      PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(MODDIR)/pc pkg-config --cflags '$(PKG_CONFIG)')
- override LDLIBS   += $(shell [ "$(PKG_CONFIG)" == "" ] ||\
--                      PKG_CONFIG_PATH=$(MODDIR)/pc pkg-config --libs '$(PKG_CONFIG)')
-+                      PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(MODDIR)/pc pkg-config --libs '$(PKG_CONFIG)')
- override CXXFLAGS += -std=gnu++11 -Werror=return-type -O2 -fPIC
- override CXXFLAGS += -I$(MODDIR)
- 
 diff --git i/modules/pc/libdb.pc w/modules/pc/libdb.pc
 index 6a40e95..682c932 100644
 --- i/modules/pc/libdb.pc
diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mapsoft2";
-  version = "2020-03-20";
+  version = "2020-04-04";
 
   src = fetchFromGitHub {
     owner = "slazav";
     repo = pname;
-    rev = "44ba9ac966ebf5b8f3cc21c4333b431a3ca9708a";
-    sha256 = "18d3c5ih0rfywkk9nrkiqr689rimyh86gzmbj1q72f1yz5ssc42v";
+    rev = "c5cc594f8508726537c070d9e9655706ee6540e6";
+    sha256 = "0qax2yrbb4506bj1m7ird9rbqjwdd3bvpcwf8mknd448hsbq1c05";
     fetchSubmodules = true;
   };