commit df1e27a2471e710f1996278ad148e863d9e7ec73
parent f7f6a546267b18f07728f6e9d91bf44f8a065fee
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 17 Mar 2020 20:16:30 +0300
Fix format
Diffstat:
13 files changed, 273 insertions(+), 153 deletions(-)
diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix
@@ -15,11 +15,13 @@ stdenv.mkDerivation rec {
};
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
@@ -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
@@ -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 @@ stdenv.mkDerivation rec {
# 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
@@ -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
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
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
@@ -1,107 +1,108 @@
{ pkgs, sources }:
-
let
inherit (pkgs) lib newScope recurseIntoAttrs python3Packages libsForQt5;
-
in
-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 {
+lib.makeScope newScope (
+ self: with self; {
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;
- };
-})
+ 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;
+ };
+ }
+)
diff --git 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
@@ -9,10 +9,12 @@ buildPythonPackage rec {
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 @@ buildPythonApplication rec {
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 ];
