commit 8d3463dd7a9365aadf6b9fc4ca00e966797b3dc9 parent e63b8d76489d3f737821ef50516fd3bfcf8e10b3 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Thu, 23 Jul 2020 23:44:36 +0300 Cleanup Diffstat:
92 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/modules/home-manager/programs/aerc.nix b/modules/home-manager/programs/aerc.nix @@ -30,7 +30,7 @@ let ''; in { - meta.maintainers = with maintainers; [ sikmir ]; + meta.maintainers = maintainers.sikmir; options.programs.aerc = { enable = mkEnableOption "aerc is an email client for your terminal"; diff --git a/modules/home-manager/programs/goldendict.nix b/modules/home-manager/programs/goldendict.nix @@ -5,7 +5,7 @@ let cfg = config.programs.goldendict; in { - meta.maintainers = with maintainers; [ sikmir ]; + meta.maintainers = maintainers.sikmir; options.programs.goldendict = { enable = mkEnableOption "A feature-rich dictionary lookup program"; diff --git a/modules/home-manager/programs/gpxsee.nix b/modules/home-manager/programs/gpxsee.nix @@ -15,7 +15,7 @@ let styleDir = "${appDataLocation}/style"; in { - meta.maintainers = with maintainers; [ sikmir ]; + meta.maintainers = maintainers.sikmir; options.programs.gpxsee = { enable = mkEnableOption "GPS log file viewer and analyzer"; diff --git a/modules/home-manager/programs/josm.nix b/modules/home-manager/programs/josm.nix @@ -5,7 +5,7 @@ let cfg = config.programs.josm; in { - meta.maintainers = with maintainers; [ sikmir ]; + meta.maintainers = maintainers.sikmir; options.programs.josm = { enable = mkEnableOption "An extensible editor for OpenStreetMap"; diff --git a/modules/home-manager/programs/nnn.nix b/modules/home-manager/programs/nnn.nix @@ -5,7 +5,7 @@ let cfg = config.programs.nnn; in { - meta.maintainers = with maintainers; [ sikmir ]; + meta.maintainers = maintainers.sikmir; options.programs.nnn = { enable = mkEnableOption "The missing terminal file manager for X"; diff --git a/modules/home-manager/programs/qmapshack.nix b/modules/home-manager/programs/qmapshack.nix @@ -5,7 +5,7 @@ let cfg = config.programs.qmapshack; in { - meta.maintainers = with maintainers; [ sikmir ]; + meta.maintainers = maintainers.sikmir; options.programs.qmapshack = { enable = mkEnableOption "Consumer grade GIS software"; diff --git a/modules/home-manager/programs/slack-term.nix b/modules/home-manager/programs/slack-term.nix @@ -5,7 +5,7 @@ let cfg = config.programs.slack-term; in { - meta.maintainers = with maintainers; [ sikmir ]; + meta.maintainers = maintainers.sikmir; options.programs.slack-term = { enable = mkEnableOption "Slack client for your terminal"; diff --git a/pkgs/applications/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix @@ -48,7 +48,7 @@ mkDerivation { meta = with lib; { inherit (sources.gpxlab) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix @@ -48,7 +48,7 @@ mkDerivation { meta = with lib; { inherit (sources.gpxsee) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/keeweb/default.nix b/pkgs/applications/keeweb/default.nix @@ -31,7 +31,7 @@ let description = "Free cross-platform password manager compatible with KeePass"; homepage = "https://keeweb.info/"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "x86_64-linux" "x86_64-darwin" ]; skip.ci = true; }; diff --git a/pkgs/applications/librewolf/default.nix b/pkgs/applications/librewolf/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { description = "A fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf-community.gitlab.io/"; license = licenses.mpl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "x86_64-darwin" ]; skip.ci = true; }; diff --git a/pkgs/applications/macpass/default.nix b/pkgs/applications/macpass/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "A native OS X KeePass client"; homepage = "https://macpassapp.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "x86_64-darwin" ]; skip.ci = true; }; diff --git a/pkgs/applications/mapsoft/2.nix b/pkgs/applications/mapsoft/2.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { description = "A collection of tools and libraries for working with maps and geo-data"; homepage = "http://slazav.github.io/mapsoft2"; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/applications/mapsoft/default.nix b/pkgs/applications/mapsoft/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.mapsoft) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/applications/nnn-plugins/default.nix b/pkgs/applications/nnn-plugins/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://github.com/jarun/nnn/tree/master/plugins"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; skip.ci = true; }; } diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix @@ -84,7 +84,7 @@ mkDerivation { meta = with lib; { inherit (sources.mapper) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix @@ -48,8 +48,8 @@ mkDerivation { meta = with lib; { inherit (sources.redict) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/visualgps/default.nix b/pkgs/applications/visualgps/default.nix @@ -33,7 +33,7 @@ mkDerivation { description = "A QT application (GUI) that makes use of the VisualGPS/NMEAParser project"; homepage = "https://github.com/VisualGPS/VisualGPSqt"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/wireguard-statusbar/default.nix b/pkgs/applications/wireguard-statusbar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "macOS menubar icon for WireGuard/wg-quick"; homepage = "https://github.com/aequitas/macos-menubar-wireguard"; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "x86_64-darwin" ]; skip.ci = true; }; diff --git a/pkgs/data/dicts/huzheng/base.nix b/pkgs/data/dicts/huzheng/base.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit description; homepage = "http://download.huzheng.org/bigdict/"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/dicts/wiktionary/base.nix b/pkgs/data/dicts/wiktionary/base.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { description = "Wiktionary dictionaries for StarDict (${lang})"; homepage = "http://libredict.org/en/info_${lang}.html"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/firmwares/gpsmap64/default.nix b/pkgs/data/firmwares/gpsmap64/default.nix @@ -18,7 +18,7 @@ fetchurl { meta = with lib; { homepage = "https://www8.garmin.com/support/download_details.jsp?id=6805"; description = "GPSMAP 64 (WebUpdater)"; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; license = licenses.free; platforms = platforms.all; skip.ci = true; diff --git a/pkgs/data/maps/freizeitkarte-osm/default.nix b/pkgs/data/maps/freizeitkarte-osm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Freizeitkarte map with DEM (Digital Elevation Model) and hillshading"; homepage = "https://freizeitkarte-osm.de/"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/gpxsee-dem/default.nix b/pkgs/data/maps/gpxsee-dem/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { description = "Digital Elevation Data"; homepage = "http://www.viewfinderpanoramas.org/"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.gpxsee-maps) description homepage; license = licenses.unlicense; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/gpxsee-poi/default.nix b/pkgs/data/maps/gpxsee-poi/default.nix @@ -17,7 +17,7 @@ meta = with lib; { homepage = "https://geocaching.su/"; description = "Geocaches"; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; license = licenses.free; platforms = platforms.all; skip.ci = true; @@ -37,7 +37,7 @@ meta = with lib; { homepage = "http://www.laavu.org/"; description = "Laavut ja kodat kartalla"; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; license = licenses.free; platforms = platforms.all; skip.ci = true; @@ -57,7 +57,7 @@ meta = with lib; { homepage = "http://www.laavu.org/autiotuvat/"; description = "Autiotuvat kartalla"; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; license = licenses.free; platforms = platforms.all; skip.ci = true; @@ -80,7 +80,7 @@ meta = with lib; { homepage = "https://westra.ru/passes/"; description = "Mountain passes (Westra)"; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; license = licenses.free; platforms = platforms.all; skip.ci = true; @@ -105,7 +105,7 @@ meta = with lib; { homepage = "https://strelki.extremum.org/s/p/47p"; description = "Стрелки-47"; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; license = licenses.free; platforms = platforms.all; skip.ci = true; @@ -126,7 +126,7 @@ meta = with lib; { homepage = "http://nashipohody.ru"; description = "Карта Достопримечательностей"; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; license = licenses.free; platforms = platforms.all; skip.ci = true; diff --git a/pkgs/data/maps/hiblovgpsmap/default.nix b/pkgs/data/maps/hiblovgpsmap/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Detailed map of Khibins and Lovozero for GPS"; homepage = "https://vk.com/hiblovgpsmap"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.maptourist) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.mtk-suomi) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "OpenTopoMap Garmin Edition"; homepage = "http://garmin.opentopomap.org/"; license = licenses.cc-by-nc-sa-40; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/qmapshack-dem/default.nix b/pkgs/data/maps/qmapshack-dem/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { description = "Digital Elevation Data"; homepage = "http://www.viewfinderpanoramas.org/"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/qmapshack-onlinemaps/default.nix b/pkgs/data/maps/qmapshack-onlinemaps/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { description = "Onlinekarten einbinden"; homepage = "http://www.mtb-touring.net/qms/onlinekarten-einbinden/"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/qmapshack-routinodb/default.nix b/pkgs/data/maps/qmapshack-routinodb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "Routino Database"; homepage = "https://download.geofabrik.de/index.html"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.map-hr) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.map-podm) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/themes/goldendict-themes/dark-theme.nix b/pkgs/data/themes/goldendict-themes/dark-theme.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { description = "GoldenDict Dark Theme"; homepage = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.qtpbfimageplugin-styles) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/development/libraries/foma/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.foma) description homepage; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "GeographicLib offers a C++ interfaces to a small (but important!) set of geographic transformations"; homepage = "http://geographiclib.sourceforge.io/"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/development/libraries/gpxlib/default.nix b/pkgs/development/libraries/gpxlib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.gpxlib) description homepage; license = licenses.lgpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.hfst) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgarmin/default.nix b/pkgs/development/libraries/libgarmin/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "Garmin IMG format library"; homepage = "http://libgarmin.sourceforge.net/"; license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.libshell) description homepage; license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonPackage { meta = with lib; { inherit (sources.cheetah3) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.gpxelevations) description homepage; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage { meta = with lib; { inherit (sources.jsonseq) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage { meta = with lib; { inherit (sources.mercantile) description homepage; license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage { meta = with lib; { inherit (sources.mikatools) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pyephem/default.nix b/pkgs/development/python-modules/pyephem/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage { meta = with lib; { inherit (sources.pyephem) description homepage; license = licenses.lgpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage { meta = with lib; { inherit (sources.pymbtiles) description homepage; license = licenses.isc; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/python-hfst/default.nix b/pkgs/development/python-modules/python-hfst/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage { description = "Python bindings for HFST"; homepage = "https://github.com/hfst/python/wiki"; license = hfst.meta.license; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/gef/default.nix b/pkgs/development/tools/gef/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation { inherit (sources.gef) description homepage; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; }; } diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix @@ -66,8 +66,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.embox) description homepage; license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; skip.ci = true; }; } diff --git a/pkgs/servers/geminid/default.nix b/pkgs/servers/geminid/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.geminid) description homepage; license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/glauth/default.nix b/pkgs/servers/glauth/default.nix @@ -24,7 +24,7 @@ buildGoModule { meta = with lib; { inherit (sources.glauth) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix @@ -13,7 +13,7 @@ buildGoModule { meta = with lib; { inherit (sources.mbtileserver) description homepage; license = licenses.isc; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/servers/nakarte/default.nix @@ -26,7 +26,7 @@ mkYarnPackage { meta = with stdenv.lib; { inherit (sources.nakarte) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; broken = true; # error while evaluating 'importJSON', only on NUR CI }; diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix @@ -13,7 +13,7 @@ buildGoModule { meta = with lib; { inherit (sources.pg-tileserv) description homepage; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/servers/shavit/default.nix b/pkgs/servers/shavit/default.nix @@ -16,7 +16,7 @@ buildGoModule { description = "Gemini server"; homepage = "https://git.sr.ht/~yotam/shavit"; license = licenses.agpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/audio/musig/default.nix b/pkgs/tools/audio/musig/default.nix @@ -22,7 +22,7 @@ buildGoModule { meta = with lib; { inherit (sources.musig) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/tools/cfiles/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.cfiles) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/dict/gt-bash-client/default.nix b/pkgs/tools/dict/gt-bash-client/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.gt-bash-client) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/tools/dict/gt4gd/default.nix b/pkgs/tools/dict/gt4gd/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.gt4gd) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/dict/lsdreader/default.nix b/pkgs/tools/dict/lsdreader/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.lsdreader) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/dict/odict/default.nix b/pkgs/tools/dict/odict/default.nix @@ -13,7 +13,7 @@ buildGoModule { meta = with lib; { inherit (sources.odict) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.stardict-3) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/docker-reg-tool/default.nix b/pkgs/tools/docker-reg-tool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.docker-reg-tool) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; }; } diff --git a/pkgs/tools/geo/cgpsmapper/default.nix b/pkgs/tools/geo/cgpsmapper/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "GIS converter into GARMIN compatible format maps"; homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "i686-linux" "x86_64-linux" ]; skip.ci = true; }; diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.datamaps) description homepage; license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.elevation) description homepage; license = licenses.asl20; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/gimgtools/default.nix b/pkgs/tools/geo/gimgtools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.gimgtools) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/gmaptool/default.nix b/pkgs/tools/geo/gmaptool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Program for splitting and merging maps in Garmin format"; homepage = "https://www.gmaptool.eu"; license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "i686-linux" "x86_64-linux" ]; skip.ci = true; }; diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix @@ -27,7 +27,7 @@ buildPerlPackage { meta = with stdenv.lib; { inherit (sources.gpx-layer) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/gpxtools/default.nix b/pkgs/tools/geo/gpxtools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.gpxtools) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/imgdecode/default.nix b/pkgs/tools/geo/imgdecode/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "IMG Decoder"; homepage = "https://sourceforge.net/projects/garmin-img/"; license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/tools/geo/ocad2img/default.nix @@ -42,7 +42,7 @@ buildPerlPackage { description = "Converter from OCAD map format to Garmin format"; homepage = "http://news.worldofo.com/2009/10/11/howto-convert-any-orienteering-map-to-a-garmin-map/"; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/tools/geo/ocad2mp/default.nix b/pkgs/tools/geo/ocad2mp/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { description = "Converter from OCAD map format to Polish format"; homepage = "https://sourceforge.net/projects/ocad2mp/"; license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/openmtbmap/default.nix b/pkgs/tools/geo/openmtbmap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.openmtbmap) description homepage; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.all; skip.ci = true; }; diff --git a/pkgs/tools/geo/osm2mp/default.nix b/pkgs/tools/geo/osm2mp/default.nix @@ -69,7 +69,7 @@ buildPerlPackage { meta = with stdenv.lib; { inherit (sources.osm2mp) description homepage; license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/sendmap20/default.nix b/pkgs/tools/geo/sendmap20/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Software for uploading maps to your GPS"; homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "i686-linux" "x86_64-linux" ]; skip.ci = true; }; diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.supermercado) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/tilesets-cli/default.nix b/pkgs/tools/geo/tilesets-cli/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.tilesets-cli) description homepage; license = licenses.bsd2; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.tpkutils) description homepage; license = licenses.isc; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/i18n-editor/default.nix b/pkgs/tools/i18n-editor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "GUI for editing your i18n translation files"; homepage = "https://github.com/jcbvm/i18n-editor"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; skip.ci = true; }; diff --git a/pkgs/tools/morse-talk/default.nix b/pkgs/tools/morse-talk/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication { meta = with lib; { inherit (sources.morse-talk) description homepage; license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/ish/default.nix b/pkgs/tools/networking/ish/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "ICMP Shell"; homepage = "http://icmpshell.sourceforge.net"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/tools/networking/ptunnel/default.nix b/pkgs/tools/networking/ptunnel/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { description = "A tool for reliably tunneling TCP connections over ICMP echo request and reply packets"; homepage = "https://www.cs.uit.no/~daniels/PingTunnel"; license = licenses.bsd3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = stdenv.isDarwin; }; diff --git a/pkgs/tools/supload/default.nix b/pkgs/tools/supload/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.supload) description homepage; license = licenses.gpl3; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.csvquote) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (sources.csvtools) description homepage; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux ++ darwin; + maintainers = maintainers.sikmir; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/fx/default.nix b/pkgs/tools/text/fx/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { description = "Command-line tool and terminal JSON viewer"; homepage = "https://github.com/antonmedv/fx"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = [ "x86_64-linux" "x86_64-darwin" ]; skip.ci = true; }; diff --git a/pkgs/tools/xfractint/default.nix b/pkgs/tools/xfractint/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Fractal generator"; homepage = "https://fractint.org/"; license = licenses.free; - maintainers = with maintainers; [ sikmir ]; + maintainers = maintainers.sikmir; platforms = platforms.linux; skip.ci = true; };