diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix

index 75e071dfff47d1877d162cf267672060f0e0c588..a0c5888cda360f14723a7b04aa13ec0b0ff89f9b 100644

--- a/pkgs/applications/mapsoft/2.nix

+++ b/pkgs/applications/mapsoft/2.nix

@@ -15,11 +15,13 @@ fetchSubmodules = true;

};

patches = [

(substituteAll {

```
 src = ./0002-fix-build.patch;
```

```
 db = db.dev;
```

```
 giflib = giflib;
```

})

(

```
 substituteAll {
```

```
   src = ./0002-fix-build.patch;
```

```
   db = db.dev;
```

```
   giflib = giflib;
```

```
 }
```

)

];

postPatch = ''

diff --git a/pkgs/applications/mapsoft/default.nix b/pkgs/applications/mapsoft/default.nix

index e38671fb123312d659e0b98736dfd88edc743b1f..3d8cce8c0d6cd4154b221fc413cf7b705c6dad12 100644

--- a/pkgs/applications/mapsoft/default.nix

+++ b/pkgs/applications/mapsoft/default.nix

@@ -1,8 +1,33 @@

-{ stdenv, perlPackages, python2Packages, gimp, sources

-, bc, fig2dev, imagemagick, m4, netpbm, pkgconfig, scons

-, boost, curl, giflib, gtkmm2, jansson, libjpeg, libpng

-, libshell, libtiff, libusb1, libxml2, libyaml, libzip

-, proj, shapelib, zlib, getopt }:

+{ stdenv

+, perlPackages

+, python2Packages

+, gimp

+, sources

+, bc

+, fig2dev

+, imagemagick

+, m4

+, netpbm

+, pkgconfig

+, scons

+, boost

+, curl

+, giflib

+, gtkmm2

+, jansson

+, libjpeg

+, libpng

+, libshell

+, libtiff

+, libusb1

+, libxml2

+, libyaml

+, libzip

+, proj

+, shapelib

+, zlib

+, getopt

+}:

stdenv.mkDerivation rec {

pname = "mapsoft";

diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix

index 42c7b549f2205d594ebc0bce47b02172f0aecce6..ce76c46e870f3b114645abe8fe5511c5326d285d 100644

--- a/pkgs/applications/openorienteering-mapper/default.nix

+++ b/pkgs/applications/openorienteering-mapper/default.nix

@@ -1,5 +1,20 @@

-{ stdenv, gdal, cmake, ninja, proj, clipper, zlib, qtbase, qttools, qtlocation

-, qtsensors, doxygen, cups, wrapQtAppsHook, qtimageformats, sources }:

+{ stdenv

+, gdal

+, cmake

+, ninja

+, proj

+, clipper

+, zlib

+, qtbase

+, qttools

+, qtlocation

+, qtsensors

+, doxygen

+, cups

+, wrapQtAppsHook

+, qtimageformats

+, sources

+}:

stdenv.mkDerivation rec {

pname = "OpenOrienteering-Mapper";

@@ -26,20 +41,22 @@ cmakeFlags = [

 # Building the manual and bundling licenses fails

 "-DLICENSING_PROVIDER:BOOL=OFF"

 "-DMapper_MANUAL_QTHELP:BOOL=OFF"

] ++ (stdenv.lib.optionals stdenv.isDarwin [

Usually enabled on Darwin

"-DCMAKE_FIND_FRAMEWORK=never"

FindGDAL is broken and always finds /Library/Framework unless this is

specified

"-DGDAL_INCLUDE_DIR=${gdal}/include"

"-DGDAL_CONFIG=${gdal}/bin/gdal-config"

"-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"

Don't bundle libraries

"-DMapper_PACKAGE_PROJ=0"

"-DMapper_PACKAGE_QT=0"

"-DMapper_PACKAGE_ASSISTANT=0"

"-DMapper_PACKAGE_GDAL=0"

]);

] ++ (

stdenv.lib.optionals stdenv.isDarwin [

```
 # Usually enabled on Darwin
```

```
 "-DCMAKE_FIND_FRAMEWORK=never"
```

 # FindGDAL is broken and always finds /Library/Framework unless this is

```
 # specified
```

```
 "-DGDAL_INCLUDE_DIR=${gdal}/include"
```

 "-DGDAL_CONFIG=${gdal}/bin/gdal-config"

 "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib"

```
 # Don't bundle libraries
```

```
 "-DMapper_PACKAGE_PROJ=0"
```

```
 "-DMapper_PACKAGE_QT=0"
```

```
 "-DMapper_PACKAGE_ASSISTANT=0"
```

```
 "-DMapper_PACKAGE_GDAL=0"
```

]

);

postInstall = stdenv.lib.optionalString stdenv.isDarwin ''

 # Fixes "This application failed to start because it could not find or load the Qt

diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix

index c14522850b7b9439d4294c1ccec8b1a84ca73a57..dce2bdf9d67982846d1d0dcc8dd1664ad9680586 100644

--- a/pkgs/applications/redict/default.nix

+++ b/pkgs/applications/redict/default.nix

@@ -1,5 +1,17 @@

-{ mkDerivation, lib, pkgconfig, qmake, qtbase, qtmultimedia, qtsvg, qttools

-, qtx11extras, libX11, libXext, libXtst, sources }:

+{ mkDerivation

+, lib

+, pkgconfig

+, qmake

+, qtbase

+, qtmultimedia

+, qtsvg

+, qttools

+, qtx11extras

+, libX11

+, libXext

+, libXtst

+, sources

+}:

mkDerivation rec {

pname = "redict";

diff --git a/pkgs/data/maps/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix

index 3d81bb688181389a61f20d5992764fefa09981b9..9f6a37ce63a8a4e2346c74aeb6d4b88d7095b912 100644

--- a/pkgs/data/maps/hiblovgpsmap/default.nix

+++ b/pkgs/data/maps/hiblovgpsmap/default.nix

@@ -7,7 +7,7 @@

src = fetchurl {

 url = "https://drive.google.com/uc?export=download&id=10aAOKY8U7TQvFvuWBkwTei9iP3-cUvoE";

 sha256 = "1079bn8rkdfsbqivxkm3zi327k2i4k5p20rr2jw7gacfsvdk4954";

name = "OV-Hib-Lov-${stdenv.lib.replaceStrings ["-"] [""] version}-1.02.zip";

name = "OV-Hib-Lov-${stdenv.lib.replaceStrings [ "-" ] [ "" ] version}-1.02.zip";

};

nativeBuildInputs = [ unzip ];

diff --git a/pkgs/default.nix b/pkgs/default.nix

index 57dcd6e34d05f753ae8e6600cc92f8e62cfb8966..4613358281c90e21ef0f95fe505486e21b5c8616 100644

--- a/pkgs/default.nix

+++ b/pkgs/default.nix

@@ -1,107 +1,108 @@

{ pkgs, sources }:

let

inherit (pkgs) lib newScope recurseIntoAttrs python3Packages libsForQt5;

-lib.makeScope newScope (self: with self; {

inherit sources;

+lib.makeScope newScope (

self: with self; {

inherit sources;

cambridge = callPackage ./data/dicts/cambridge { };

cfiles = callPackage ./tools/cfiles { };

cgpsmapper = callPackage ./tools/geo/cgpsmapper { };

cheetah3 = python3Packages.callPackage ./development/python-modules/cheetah3 {

inherit sources;

};

click = python3Packages.callPackage ./development/python-modules/click { };

csvquote = callPackage ./tools/text/csvquote { };

csvtools = callPackage ./tools/text/csvtools { };

datamaps = callPackage ./tools/geo/datamaps { };

docker-reg-tool = callPackage ./tools/docker-reg-tool { };

elevation = python3Packages.callPackage ./tools/geo/elevation {

inherit sources click;

};

embox = callPackage ./embox { };

gimgtools = callPackage ./tools/geo/gimgtools { };

gmaptool = callPackage ./tools/geo/gmaptool { };

goldendict-dark-theme =

callPackage ./data/themes/goldendict-themes/dark-theme.nix { };

gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer {

inherit sources;

};

gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations {

inherit sources;

};

gpxlab = libsForQt5.callPackage ./applications/gpxlab {

inherit sources;

};

gpxsee = libsForQt5.callPackage ./applications/gpxsee {

inherit sources;

};

gpxsee-maps = callPackage ./data/maps/gpxsee-maps { };

gpxtools = callPackage ./tools/geo/gpxtools { };

gt-bash-client = callPackage ./tools/dict/gt-bash-client { };

lsdreader = python3Packages.callPackage ./tools/dict/lsdreader {

inherit sources;

};

gt4gd = python3Packages.callPackage ./tools/dict/gt4gd {

inherit sources;

};

hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap { };

i18n-editor = callPackage ./tools/i18n-editor { };

ish = callPackage ./tools/networking/ish { };

libshell = callPackage ./development/libraries/libshell { };

macmillan = callPackage ./data/dicts/macmillan { };

mapsoft = callPackage ./applications/mapsoft { };

mapsoft2 = callPackage ./applications/mapsoft/2.nix { };

maptourist = callPackage ./data/maps/maptourist { };

mbtileserver = callPackage ./servers/mbtileserver { };

mercantile = python3Packages.callPackage ./development/python-modules/mercantile {

inherit sources;

};

morse-talk = python3Packages.callPackage ./tools/morse-talk {

inherit sources;

};

openmtbmap_openvelomap_linux = callPackage ./tools/geo/openmtbmap_openvelomap_linux { };

openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper {

inherit sources;

};

osm2mp = perlPackages.callPackage ./tools/geo/osm2mp {

inherit sources;

inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR;

};

ptunnel = callPackage ./tools/networking/ptunnel { };

pyephem = python3Packages.callPackage ./development/python-modules/pyephem {

inherit sources;

};

pymbtiles = python3Packages.callPackage ./development/python-modules/pymbtiles {

inherit sources;

};

qmapshack-onlinemaps = callPackage ./data/maps/qmapshack-onlinemaps { };

redict = libsForQt5.callPackage ./applications/redict {

inherit sources;

};

sendmap20 = callPackage ./tools/geo/sendmap20 { };

slazav-hr = callPackage ./data/maps/slazav/hr.nix { };

slazav-podm = callPackage ./data/maps/slazav/podm.nix { };

stardict-tools =

Needed for nixos-19.09

if pkgs ? libmysql

then callPackage ./tools/dict/stardict-tools {

```
 libmysqlclient = libmysql;
```

}

else callPackage ./tools/dict/stardict-tools { };

supermercado = python3Packages.callPackage ./tools/geo/supermercado {

inherit sources mercantile;

};

supload = callPackage ./tools/supload { };

tpkutils = python3Packages.callPackage ./tools/geo/tpkutils {

inherit sources mercantile pymbtiles;

};

webster = callPackage ./data/dicts/webster { };

cambridge = callPackage ./data/dicts/cambridge {};

cfiles = callPackage ./tools/cfiles {};

cgpsmapper = callPackage ./tools/geo/cgpsmapper {};

cheetah3 = python3Packages.callPackage ./development/python-modules/cheetah3 {

```
 inherit sources;
```

};

click = python3Packages.callPackage ./development/python-modules/click {};

csvquote = callPackage ./tools/text/csvquote {};

csvtools = callPackage ./tools/text/csvtools {};

datamaps = callPackage ./tools/geo/datamaps {};

docker-reg-tool = callPackage ./tools/docker-reg-tool {};

elevation = python3Packages.callPackage ./tools/geo/elevation {

```
 inherit sources click;
```

};

embox = callPackage ./embox {};

gimgtools = callPackage ./tools/geo/gimgtools {};

gmaptool = callPackage ./tools/geo/gmaptool {};

goldendict-dark-theme =

 callPackage ./data/themes/goldendict-themes/dark-theme.nix {};

gpx-layer = perlPackages.callPackage ./tools/geo/gpx-layer {

```
 inherit sources;
```

};

gpxelevations = python3Packages.callPackage ./development/python-modules/gpxelevations {

```
 inherit sources;
```

};

gpxlab = libsForQt5.callPackage ./applications/gpxlab {

```
 inherit sources;
```

};

gpxsee = libsForQt5.callPackage ./applications/gpxsee {

```
 inherit sources;
```

};

gpxsee-maps = callPackage ./data/maps/gpxsee-maps {};

gpxtools = callPackage ./tools/geo/gpxtools {};

gt-bash-client = callPackage ./tools/dict/gt-bash-client {};

lsdreader = python3Packages.callPackage ./tools/dict/lsdreader {

```
 inherit sources;
```

};

gt4gd = python3Packages.callPackage ./tools/dict/gt4gd {

```
 inherit sources;
```

};

hiblovgpsmap = callPackage ./data/maps/hiblovgpsmap {};

i18n-editor = callPackage ./tools/i18n-editor {};

ish = callPackage ./tools/networking/ish {};

libshell = callPackage ./development/libraries/libshell {};

macmillan = callPackage ./data/dicts/macmillan {};

mapsoft = callPackage ./applications/mapsoft {};

mapsoft2 = callPackage ./applications/mapsoft/2.nix {};

maptourist = callPackage ./data/maps/maptourist {};

mbtileserver = callPackage ./servers/mbtileserver {};

mercantile = python3Packages.callPackage ./development/python-modules/mercantile {

```
 inherit sources;
```

};

morse-talk = python3Packages.callPackage ./tools/morse-talk {

```
 inherit sources;
```

};

openmtbmap_openvelomap_linux = callPackage ./tools/geo/openmtbmap_openvelomap_linux {};

openorienteering-mapper = libsForQt5.callPackage ./applications/openorienteering-mapper {

```
 inherit sources;
```

};

osm2mp = perlPackages.callPackage ./tools/geo/osm2mp {

```
 inherit sources;
```

 inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR;

};

ptunnel = callPackage ./tools/networking/ptunnel {};

pyephem = python3Packages.callPackage ./development/python-modules/pyephem {

```
 inherit sources;
```

};

pymbtiles = python3Packages.callPackage ./development/python-modules/pymbtiles {

```
 inherit sources;
```

};

qmapshack-onlinemaps = callPackage ./data/maps/qmapshack-onlinemaps {};

redict = libsForQt5.callPackage ./applications/redict {

```
 inherit sources;
```

};

sendmap20 = callPackage ./tools/geo/sendmap20 {};

slazav-hr = callPackage ./data/maps/slazav/hr.nix {};

slazav-podm = callPackage ./data/maps/slazav/podm.nix {};

stardict-tools =

```
 # Needed for nixos-19.09
```

```
 if pkgs ? libmysql
```

 then callPackage ./tools/dict/stardict-tools {

```
   libmysqlclient = libmysql;
```

```
 }
```

 else callPackage ./tools/dict/stardict-tools {};

supermercado = python3Packages.callPackage ./tools/geo/supermercado {

```
 inherit sources mercantile;
```

};

supload = callPackage ./tools/supload {};

tpkutils = python3Packages.callPackage ./tools/geo/tpkutils {

```
 inherit sources mercantile pymbtiles;
```

};

webster = callPackage ./data/dicts/webster {};

perlPackages = (callPackage ./perl-packages.nix {

}) // pkgs.perlPackages // {

recurseForDerivations = false;

};

-})

perlPackages = (

```
 callPackage ./perl-packages.nix {}
```

) // pkgs.perlPackages // {

```
 recurseForDerivations = false;
```

};

}

diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix

index b8e08bc77cce04a781dffabbec316a64ec38e6ab..ab89437567932ac393b9bae928f6b8a2796d0f9c 100644

--- a/pkgs/development/libraries/libshell/default.nix

+++ b/pkgs/development/libraries/libshell/default.nix

@@ -1,5 +1,12 @@

-{ stdenv, bash, dash, help2man, ncurses, sources

-, withDoc ? false, scdoc }:

+{ stdenv

+, bash

+, dash

+, help2man

+, ncurses

+, sources

+, withDoc ? false

+, scdoc

+}:

stdenv.mkDerivation rec {

pname = "libshell";

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix

index 4c86b6824a22309c21a66cca584545193bad1be9..9c3d51f63af6ee0d36a46b6fffe24109465a4b13 100644

--- a/pkgs/development/python-modules/click/default.nix

+++ b/pkgs/development/python-modules/click/default.nix

@@ -9,10 +9,12 @@ inherit pname version;

 sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";

};

patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll {

src = ./fix-paths.patch;

locale = "${locale}/bin/locale";

});

patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (

substituteAll {

```
 src = ./fix-paths.patch;
```

```
 locale = "${locale}/bin/locale";
```

}

);

buildInputs = [ pytest ];

diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix

index e4661c763eba829c801c0193aee082f91640432a..a84e85d7797f33e5840e330415d4cdec7f08500e 100644

--- a/pkgs/embox/default.nix

+++ b/pkgs/embox/default.nix

@@ -1,5 +1,14 @@

-{ stdenv, fetchurl, writers, sources

-, cpio, gcc-arm-embedded, python, qemu, unzip, which }:

+{ stdenv

+, fetchurl

+, writers

+, sources

+, cpio

+, gcc-arm-embedded

+, python

+, qemu

+, unzip

+, which

+}:

stdenv.mkDerivation rec {

pname = "embox";

diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix

index e4086d631c9bd179b1b0c845109995e25510fdaa..af475b361d27241d49370e44186153c486ae3e61 100644

--- a/pkgs/tools/dict/stardict-tools/default.nix

+++ b/pkgs/tools/dict/stardict-tools/default.nix

@@ -1,5 +1,14 @@

-{ stdenv, autoconf, automake, libtool, pkg-config,

gtk3, libmysqlclient, libxml2, pcre, sources }:

+{ stdenv

+, autoconf

+, automake

+, libtool

+, pkg-config

+, gtk3

+, libmysqlclient

+, libxml2

+, pcre

+, sources

+}:

stdenv.mkDerivation rec {

pname = "stardict-tools";

diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix

index 05af0964294d236982a7da697342819aa2e6e4ab..21c951b7af2dda81e5147278be7337f0d790a40d 100644

--- a/pkgs/tools/geo/elevation/default.nix

+++ b/pkgs/tools/geo/elevation/default.nix

@@ -1,6 +1,18 @@

-{ lib, buildPythonApplication, fasteners, future, appdirs, click

-, gnumake, curl, unzip, gzip, gdal

-, pytest, pytest-mock, sources }:

+{ lib

+, buildPythonApplication

+, fasteners

+, future

+, appdirs

+, click

+, gnumake

+, curl

+, unzip

+, gzip

+, gdal

+, pytest

+, pytest-mock

+, sources

+}:

buildPythonApplication rec {

pname = "elevation";

diff --git a/pkgs/tools/geo/osm2mp/default.nix b/pkgs/tools/geo/osm2mp/default.nix

index 81770a709cf2a845807038d69e3232e117f19960..e09620f62c96fb11a21119abf5396a4f1fc420b2 100644

--- a/pkgs/tools/geo/osm2mp/default.nix

+++ b/pkgs/tools/geo/osm2mp/default.nix

@@ -1,7 +1,21 @@

-{ lib, buildPerlPackage, sources, ConfigStd, EncodeLocale

-, FileSlurp, GeoOpenstreetmapParser, JSON, ListMoreUtils

-, LWPProtocolHttps, MatchSimple, MathPolygon, MathPolygonTree

-, TemplateToolkit, TextUnidecode, TreeR, YAML }:

+{ lib

+, buildPerlPackage

+, sources

+, ConfigStd

+, EncodeLocale

+, FileSlurp

+, GeoOpenstreetmapParser

+, JSON

+, ListMoreUtils

+, LWPProtocolHttps

+, MatchSimple

+, MathPolygon

+, MathPolygonTree

+, TemplateToolkit

+, TextUnidecode

+, TreeR

+, YAML

+}:

buildPerlPackage rec {

pname = "osm2mp";

diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix

index abb58b64e268e10466aedfb01c2789b400d51120..fd3839f12f90231c4b381a5814f43973972d5169 100644

--- a/pkgs/tools/geo/supermercado/default.nix

+++ b/pkgs/tools/geo/supermercado/default.nix

@@ -1,5 +1,13 @@

-{ lib, fetchpatch, buildPythonApplication

-, click-plugins, rasterio, mercantile, numpy, pytest, sources }:

+{ lib

+, fetchpatch

+, buildPythonApplication

+, click-plugins

+, rasterio

+, mercantile

+, numpy

+, pytest

+, sources

+}:

buildPythonApplication rec {

pname = "supermercado";

@@ -8,10 +16,12 @@ src = sources.supermercado;

patches = [

 # Replace np subtract operator https://github.com/mapbox/supermercado/pull/27

(fetchpatch {

 url = "https://github.com/mapbox/supermercado/commit/3a70bccad64557920121e81aded869d44581230c.patch";

 sha256 = "0zbzk1ac59q974yp1f7gz5hpvr2z54hjygynxi0a6vn1ii30mnwr";

})

(

```
 fetchpatch {
```

   url = "https://github.com/mapbox/supermercado/commit/3a70bccad64557920121e81aded869d44581230c.patch";

   sha256 = "0zbzk1ac59q974yp1f7gz5hpvr2z54hjygynxi0a6vn1ii30mnwr";

```
 }
```

)

];

propagatedBuildInputs = [ click-plugins rasterio mercantile numpy ];

Proxy Information

Original URL: gemini://git.sikmir.ru/nur-packages/commits/df1e27a2471e710f1996278ad148e863d9e7ec73.patch
Status Code: Success (20)
Meta: application/octet-stream
Capsule Response Time: 168.982978 milliseconds
Gemini-to-HTML Time: 5.373556 milliseconds

This content has been proxied by September (3851b).

Usually enabled on Darwin

FindGDAL is broken and always finds /Library/Framework unless this is

specified

Don't bundle libraries

Needed for nixos-19.09