nur-packages

commit f1de4b50d3b326a2a53a3a9e749d37adead38ba7
parent 597973b159898443fbad484af01cc8d9a28526e1
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Wed,  2 Jun 2021 01:23:21 +0300

Up

Diffstat:
M
pkgs/suckless/sfm/config.patch
 | 
32
++++++++++++++++----------------
M
pkgs/suckless/sfm/default.nix
 | 
6
+++---
M
pkgs/tools/geo/go-staticmaps/default.nix
 | 
6
+++---
M
pkgs/tools/geo/go-staticmaps/extra-tileproviders.patch
 | 
6
+++---

4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/pkgs/suckless/sfm/config.patch b/pkgs/suckless/sfm/config.patch
@@ -1,17 +1,17 @@
 diff --git i/config.def.h w/config.def.h
-index cc848c8..1005815 100644
+index 01ebd48..1725f9e 100644
 --- i/config.def.h
 +++ w/config.def.h
-@@ -34,6 +34,8 @@ static const char *mupdf[]        = { "mupdf", "-I", NULL };
- static const char *libreoffice[]  = { "libreoffice", NULL };
- static const char *gimp[]         = { "gimp", NULL };
- static const char *r2[]           = { "r2", "-c", "vv", NULL };
-+static const char *gpxsee[]       = { "gpxsee", NULL };
-+static const char *oomapper[]     = { "Mapper", NULL };
+@@ -38,6 +38,8 @@ static const char *mupdf[]        = { "mupdf", "-I" };
+ static const char *libreoffice[]  = { "libreoffice" };
+ static const char *gimp[]         = { "gimp" };
+ static const char *r2[]           = { "r2", "-c", "vv" };
++static const char *gpxsee[]       = { "gpxsee" };
++static const char *oomapper[]     = { "Mapper" };
  
  /* extensions*/
  static const char *images[]    = { "bmp", "jpg", "jpeg", "png", "gif", "xpm" };
-@@ -46,6 +48,9 @@ static const char *videos[]    = { "avi", "flv", "wav", "webm", "wma", "wmv",
+@@ -50,6 +52,9 @@ static const char *videos[]    = { "avi", "flv", "wav", "webm", "wma", "wmv",
  				   "mp4", "mpeg", "mpg" };
  static const char *documents[] = { "odt", "doc", "docx", "xls", "xlsx", "odp",
  				   "ods", "pptx", "odg" };
@@ -20,14 +20,14 @@ index cc848c8..1005815 100644
 +static const char *omaps[]     = { "omap", "xmap", "ocd" };
  
  static Rule rules[] = {
- 	{videos,    LEN(videos),    mpv},
-@@ -55,6 +60,9 @@ static Rule rules[] = {
- 	{documents, LEN(documents), libreoffice},
- 	{arts,      LEN(arts),      gimp},
- 	{obj,       LEN(obj),       r2},
-+	{gpsdata,   LEN(gpsdata),   gpxsee},
-+	{maps,      LEN(maps),      gpxsee},
-+	{omaps,     LEN(omaps),     oomapper},
+ 	{videos,    LEN(videos),    mpv,         LEN(mpv)         },
+@@ -59,6 +64,9 @@ static Rule rules[] = {
+ 	{documents, LEN(documents), libreoffice, LEN(libreoffice) },
+ 	{arts,      LEN(arts),      gimp,        LEN(gimp)        },
+ 	{obj,       LEN(obj),       r2,          LEN(r2)          },
++	{gpsdata,   LEN(gpsdata),   gpxsee,      LEN(gpxsee)      },
++	{maps,      LEN(maps),      gpxsee,      LEN(gpxsee)      },
++	{omaps,     LEN(omaps),     oomapper,    LEN(oomapper)    },
  };
  
  /* normal keys */
diff --git a/pkgs/suckless/sfm/default.nix b/pkgs/suckless/sfm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sfm";
-  version = "2021-05-22";
+  version = "0.1";
 
   src = fetchFromGitHub {
     owner = "afify";
     repo = pname;
-    rev = "7b0060575657e47ca9edadfd4ebc01e73f8fb72e";
-    hash = "sha256-B8RZ9GnjR1ZxVk6ut7KBEYPUXiewpYgqzUUN0G1bx+o=";
+    rev = "v${version}";
+    hash = "sha256-i4WzYaJKityIt+LPWCbd6UsPBaYoaS397l5BInOXQQA=";
   };
 
   patches = [ ./config.patch ];
diff --git a/pkgs/tools/geo/go-staticmaps/default.nix b/pkgs/tools/geo/go-staticmaps/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-staticmaps";
-  version = "2021-04-12";
+  version = "2021-04-25";
 
   src = fetchFromGitHub {
     owner = "flopp";
     repo = pname;
-    rev = "9eef5d84e2f2fd705ebb1cd0c0601cf2301ad9ca";
-    hash = "sha256-HH7HjVdv9yTpE7on6PDXqiUSGQzSqyh5/+psFm53+WQ=";
+    rev = "2e6e19a99c28a6e68b24e2f2fbcc084da8aee8ac";
+    hash = "sha256-yTnlX55+B4Qh+Zcq7PdAK3nIB36iHvZOo+l4z/ECO6Y=";
   };
 
   patches = [ ./extra-tileproviders.patch ];
diff --git a/pkgs/tools/geo/go-staticmaps/extra-tileproviders.patch b/pkgs/tools/geo/go-staticmaps/extra-tileproviders.patch
@@ -1,5 +1,5 @@
 diff --git i/tile_provider.go w/tile_provider.go
-index a4b7f9b..62a56b6 100644
+index be2c487..7adac9c 100644
 --- i/tile_provider.go
 +++ w/tile_provider.go
 @@ -143,6 +143,28 @@ func NewTileProviderArcgisWorldImagery() *TileProvider {
@@ -31,10 +31,10 @@ index a4b7f9b..62a56b6 100644
  // GetTileProviders returns a map of all available TileProviders
  func GetTileProviders() map[string]*TileProvider {
  	m := make(map[string]*TileProvider)
-@@ -161,6 +183,8 @@ func GetTileProviders() map[string]*TileProvider {
- 		NewTileProviderCartoLight(),
+@@ -162,6 +184,8 @@ func GetTileProviders() map[string]*TileProvider {
  		NewTileProviderCartoDark(),
  		NewTileProviderArcgisWorldImagery(),
+ 		NewTileProviderWikimedia(),
 +		NewTileProviderOpenTopoMapRu(),
 +		NewTileProviderInkatlas(),
  	}