nur-packages

My NUR packages
git clone git://git.sikmir.ru/nur-packages
Log | Files | Refs | README | LICENSE

commit dc549e7fa6c7512c294232591f37145644f5f935
parent 5c43b46ef1fe9cf6514a50efa0f9f018eb9e0b18
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Mon, 20 May 2024 01:34:28 +0400

Use nixfmt-rfc-style formatter

Diffstat:
Mci.nix | 45++++++++++++++++++++++++---------------------
Mdefault.nix | 9++++-----
Mflake.nix | 59++++++++++++++++++++++++++++++++++-------------------------
Mmodules/home-manager/programs/goldendict.nix | 13+++++++------
Mmodules/home-manager/programs/gpxsee.nix | 99+++++++++++++++++++++++++++++++++----------------------------------------------
Mmodules/home-manager/programs/josm.nix | 65++++++++++++++++++++++++++++++++---------------------------------
Mmodules/home-manager/programs/merkaartor.nix | 71+++++++++++++++++++++++++++++++++++------------------------------------
Mmodules/home-manager/programs/openorienteering-mapper.nix | 49+++++++++++++++++++++++--------------------------
Mmodules/home-manager/programs/qmapshack.nix | 91++++++++++++++++++++++++++++++++++---------------------------------------------
Mmodules/home-manager/programs/slack-term.nix | 7++++++-
Mmodules/home-manager/programs/vis.nix | 7++++++-
Mmodules/nixos/default.nix | 4+---
Mmodules/nixos/services/mbtileserver.nix | 7++++++-
Moverlay.nix | 13+++++++------
Mpkgs/applications/goldencheetah/bin.nix | 48+++++++++++++++++++++++++++++++-----------------
Mpkgs/applications/misc/klogg/bin.nix | 55+++++++++++++++++++++++++++++++++++++------------------
Mpkgs/applications/misc/klogg/default.nix | 34+++++++++++++++++++++-------------
Mpkgs/applications/synwrite/default.nix | 35++++++++++++++++++++++++-----------
Mpkgs/build-support/fetchfromgh/default.nix | 28+++++++++++++++++++++-------
Mpkgs/build-support/fetchgdrive/default.nix | 12++++--------
Mpkgs/build-support/fetchwebarchive/default.nix | 18++++++++++--------
Mpkgs/build-support/fetchymaps/default.nix | 10++--------
Mpkgs/darwin/amethyst/default.nix | 7++++++-
Mpkgs/darwin/cudatext/bin.nix | 48++++++++++++++++++++++++++++++++++--------------
Mpkgs/darwin/darktable/bin.nix | 14+++++++++++---
Mpkgs/darwin/finch/default.nix | 60++++++++++++++++++++++++++++++++++++------------------------
Mpkgs/darwin/macpass/default.nix | 7++++++-
Mpkgs/darwin/macsvg/default.nix | 22++++++++++++++++++----
Mpkgs/darwin/marta/default.nix | 13+++++++++++--
Mpkgs/darwin/pinentry-touchid/default.nix | 8+++++++-
Mpkgs/darwin/podman-desktop/bin.nix | 32++++++++++++++++++++++----------
Mpkgs/darwin/qtcreator/bin.nix | 20++++++++++++++++----
Mpkgs/darwin/qutebrowser/bin.nix | 20++++++++++++++++----
Mpkgs/darwin/sequel-ace/default.nix | 7++++++-
Mpkgs/darwin/zed/default.nix | 7++++++-
Mpkgs/data/dicts/dadako/base.nix | 12+++++++++++-
Mpkgs/data/dicts/freedict/base.nix | 9++++++++-
Mpkgs/data/dicts/huzheng/base.nix | 11++++++++++-
Mpkgs/data/dicts/it-sanasto/default.nix | 15+++++++++++++--
Mpkgs/data/dicts/komputeko/default.nix | 15+++++++++++++--
Mpkgs/data/dicts/libredict/default.nix | 21++++++++++++---------
Mpkgs/data/dicts/tatoeba/default.nix | 40++++++++++++++++++++++++++++------------
Mpkgs/data/maps/dem/default.nix | 19++++++++++++++++---
Mpkgs/data/maps/freizeitkarte-osm/default.nix | 8+++++++-
Mpkgs/data/maps/gpxsee-maps/default.nix | 23++++++++++++-----------
Mpkgs/data/maps/maptourist/default.nix | 7++++++-
Mpkgs/data/maps/meridian/base.nix | 10+++++++++-
Mpkgs/data/maps/mtk-suomi/default.nix | 6+++++-
Mpkgs/data/maps/opentopomap/default.nix | 17+++++++++++++++--
Mpkgs/data/maps/qmapshack-onlinemaps/default.nix | 6+++++-
Mpkgs/data/maps/slazav/hr.nix | 22+++++++++++++++++++---
Mpkgs/data/maps/slazav/podm-bin.nix | 6+++++-
Mpkgs/data/maps/slazav/podm.nix | 22+++++++++++++++++++---
Mpkgs/data/maps/uralla/base.nix | 9++++++++-
Mpkgs/data/maps/vlasenko-maps/default.nix | 7++++++-
Mpkgs/data/misc/poi/default.nix | 9++++++++-
Mpkgs/data/osm/osm-extracts/default.nix | 7++++++-
Mpkgs/data/osm/overpassdb/default.nix | 15++++++++++++---
Mpkgs/data/osm/routinodb/default.nix | 9++++++++-
Mpkgs/data/themes/goldendict-themes/arc-dark-theme.nix | 3++-
Mpkgs/data/themes/goldendict-themes/dark-theme.nix | 3++-
Mpkgs/data/themes/qtpbfimageplugin-styles/default.nix | 6+++++-
Mpkgs/default.nix | 120++++++++++++++++++++++++++++---------------------------------------------------
Mpkgs/development/libraries/iso15765-canbus/default.nix | 11+++++++++--
Mpkgs/development/libraries/libgnunetchat/default.nix | 37++++++++++++++++++++++++-------------
Mpkgs/development/libraries/libshell/default.nix | 19++++++++++---------
Mpkgs/development/libraries/libsockcanpp/default.nix | 7++++++-
Mpkgs/development/libraries/microjson/default.nix | 17++++++++++++-----
Mpkgs/development/python-modules/click/default.nix | 17++++++++++-------
Mpkgs/development/python-modules/contextily/default.nix | 7++++++-
Mpkgs/development/python-modules/curses-menu/default.nix | 17++++++++++++++---
Mpkgs/development/python-modules/earthpy/default.nix | 7++++++-
Mpkgs/development/python-modules/geotiler/default.nix | 19++++++++++++++++---
Mpkgs/development/python-modules/gpxelevations/default.nix | 12++++++++++--
Mpkgs/development/python-modules/gpxelevations/testdata.nix | 10++++++----
Mpkgs/development/python-modules/jsonseq/default.nix | 6+++++-
Mpkgs/development/python-modules/large-image/default.nix | 14++++++++++++--
Mpkgs/development/python-modules/large-image/sources.nix | 20+++++++++++++++++---
Mpkgs/development/python-modules/modbus_tk/default.nix | 6+++++-
Mpkgs/development/python-modules/portolan/default.nix | 6+++++-
Mpkgs/development/python-modules/pyarrow_ops/default.nix | 12++++++++++--
Mpkgs/development/python-modules/pymbtiles/default.nix | 6+++++-
Mpkgs/development/python-modules/pytest-mp/default.nix | 11+++++++++--
Mpkgs/development/python-modules/pytest-shell-utilities/default.nix | 19++++++++++++++++---
Mpkgs/development/python-modules/pytest-skip-markers/default.nix | 17++++++++++++++---
Mpkgs/development/python-modules/python-periphery/default.nix | 7++++++-
Mpkgs/development/python-modules/s2sphere/default.nix | 6+++++-
Mpkgs/embedded/chdk/default.nix | 42+++++++++++++++++++++++++++++-------------
Mpkgs/embedded/embox/default.nix | 78+++++++++++++++++++++++++++++++++++++++++++++---------------------------------
Mpkgs/garmin/basecamp/default.nix | 19++++++++++++++++---
Mpkgs/garmin/cgpsmapper/default.nix | 11+++++++++--
Mpkgs/garmin/garmin-uploader/default.nix | 11+++++++++--
Mpkgs/garmin/garminimg/default.nix | 20+++++++++++++++++---
Mpkgs/garmin/gimgtools/default.nix | 7++++++-
Mpkgs/garmin/gmaptool/default.nix | 11+++++++++--
Mpkgs/garmin/imgdecode/default.nix | 6+++++-
Mpkgs/garmin/libgarmin/default.nix | 15+++++++++++++--
Mpkgs/garmin/ocad2img/default.nix | 23++++++++++++++++++++---
Mpkgs/garmin/ocad2mp/default.nix | 6+++++-
Mpkgs/garmin/openmtbmap/default.nix | 21++++++++++++++++-----
Mpkgs/garmin/osm2mp/default.nix | 64++++++++++++++++++++++++++++++++++------------------------------
Mpkgs/garmin/sendmap20/default.nix | 11+++++++++--
Mpkgs/gemini/agunua/default.nix | 6+++++-
Mpkgs/gemini/astronaut/default.nix | 14++++++++++++--
Mpkgs/gemini/comitium/default.nix | 7++++++-
Mpkgs/gemini/eva/default.nix | 22+++++++++++++++++++---
Mpkgs/gemini/gelim/default.nix | 14++++++++++++--
Mpkgs/gemini/gemcert/default.nix | 6+++++-
Mpkgs/gemini/gemgen/default.nix | 7++++++-
Mpkgs/gemini/gemini-ipfs-gateway/default.nix | 8+++++++-
Mpkgs/gemini/geminid/default.nix | 22+++++++++++++++++++---
Mpkgs/gemini/gemreader/default.nix | 6+++++-
Mpkgs/gemini/gemserv/default.nix | 10+++++++++-
Mpkgs/gemini/gloggery/default.nix | 12++++++++++--
Mpkgs/gemini/gmi2html/default.nix | 15+++++++++++++--
Mpkgs/gemini/gmnhg/default.nix | 6+++++-
Mpkgs/gemini/gmnigit/default.nix | 6+++++-
Mpkgs/gemini/gplaces/default.nix | 15+++++++++++++--
Mpkgs/gemini/gssg/default.nix | 6+++++-
Mpkgs/gemini/gurl/default.nix | 7++++++-
Mpkgs/gemini/kineto/default.nix | 6+++++-
Mpkgs/gemini/mdtohtml/default.nix | 13+++++++++++--
Mpkgs/gemini/py-gmi2html/default.nix | 6+++++-
Mpkgs/gemini/qute-gemini/default.nix | 6+++++-
Mpkgs/gemini/satellite/default.nix | 6+++++-
Mpkgs/gemini/shavit/default.nix | 6+++++-
Mpkgs/gemini/stagit-gemini/milotier.nix | 7++++++-
Mpkgs/gemini/stagit-gemini/sloum.nix | 7++++++-
Mpkgs/gemini/tom/default.nix | 27+++++++++++++++++----------
Mpkgs/geospatial/arcgis2geojson/default.nix | 6+++++-
Mpkgs/geospatial/bbox/default.nix | 21++++++++++++++++++---
Mpkgs/geospatial/c2cwsgiutils/default.nix | 7++++++-
Mpkgs/geospatial/cogdumper/default.nix | 7++++++-
Mpkgs/geospatial/cogeo-mosaic/default.nix | 15+++++++++++++--
Mpkgs/geospatial/color-operations/default.nix | 7++++++-
Mpkgs/geospatial/datamaps/default.nix | 8+++++++-
Mpkgs/geospatial/deegree/default.nix | 6+++++-
Mpkgs/geospatial/elevation/default.nix | 39+++++++++++++++++++++++----------------
Mpkgs/geospatial/geoarrow-c/default.nix | 7++++++-
Mpkgs/geospatial/geoarrow-pyarrow/default.nix | 14++++++++++++--
Mpkgs/geospatial/geojson-pydantic/default.nix | 7++++++-
Mpkgs/geospatial/geowebcache/default.nix | 7++++++-
Mpkgs/geospatial/go-pmtiles/default.nix | 6+++++-
Mpkgs/geospatial/go-staticmaps/default.nix | 6+++++-
Mpkgs/geospatial/hecate/default.nix | 10+++++++++-
Mpkgs/geospatial/kealib/default.nix | 8+++++++-
Mpkgs/geospatial/localtileserver/default.nix | 8+++++++-
Mpkgs/geospatial/mapsoft/2.nix | 66+++++++++++++++++++++++++++++++++++++-----------------------------
Mpkgs/geospatial/mapsoft/default.nix | 71+++++++++++++++++++++++++++++++++++++++--------------------------------
Mpkgs/geospatial/mbtiles2osmand/default.nix | 11+++++------
Mpkgs/geospatial/mbutiles/default.nix | 9++++++++-
Mpkgs/geospatial/mobroute/default.nix | 6+++++-
Mpkgs/geospatial/mobsql/default.nix | 6+++++-
Mpkgs/geospatial/morecantile/default.nix | 25+++++++++++++++++++------
Mpkgs/geospatial/orbisgis/default.nix | 16++++++++++++++--
Mpkgs/geospatial/ossim/default.nix | 20++++++++++++++++++--
Mpkgs/geospatial/pipfile/default.nix | 11+++++++++--
Mpkgs/geospatial/pmtiles/default.nix | 6+++++-
Mpkgs/geospatial/polyvectorization/default.nix | 22+++++++++++++++++++---
Mpkgs/geospatial/py-staticmaps/default.nix | 18++++++++++++++++--
Mpkgs/geospatial/pysheds/default.nix | 6+++++-
Mpkgs/geospatial/pystac/default.nix | 11+++++++----
Mpkgs/geospatial/qlandkartegt/default.nix | 40++++++++++++++++++++++------------------
Mpkgs/geospatial/qlandkartegt/garmindev.nix | 8+++++++-
Mpkgs/geospatial/render_geojson/default.nix | 8+++++++-
Mpkgs/geospatial/rio-cogeo/default.nix | 14++++++++++++--
Mpkgs/geospatial/rio-color/default.nix | 8+++++++-
Mpkgs/geospatial/rio-mbtiles/default.nix | 8+++++++-
Mpkgs/geospatial/rio-mucho/default.nix | 7++++++-
Mpkgs/geospatial/rio-stac/default.nix | 17++++++++++++-----
Mpkgs/geospatial/rio-tiler/default.nix | 16++++++++++++++--
Mpkgs/geospatial/rioxarray/default.nix | 7++++++-
Mpkgs/geospatial/rsgislib/default.nix | 24++++++++++++++++++++++--
Mpkgs/geospatial/sasplanet/default.nix | 51+++++++++++++++++++++++++++++----------------------
Mpkgs/geospatial/server-thread/default.nix | 17++++++++++++++---
Mpkgs/geospatial/starlette-cramjam/default.nix | 7++++++-
Mpkgs/geospatial/supermercado/default.nix | 13+++++++++++--
Mpkgs/geospatial/supermorecado/default.nix | 12++++++++++--
Mpkgs/geospatial/tdh/base.nix | 51++++++++++++++++++++++++++++++++-------------------
Mpkgs/geospatial/tdh/default.nix | 30++++++++++++++++++++----------
Mpkgs/geospatial/terracotta/default.nix | 6+++++-
Mpkgs/geospatial/tile-stitch/default.nix | 20++++++++++++++++++--
Mpkgs/geospatial/tilecloud/default.nix | 7++++++-
Mpkgs/geospatial/tilekiln/default.nix | 19+++++++++++++------
Mpkgs/geospatial/tilesets-cli/default.nix | 24+++++++++++++-----------
Mpkgs/geospatial/titiler/default.nix | 35+++++++++++++++++++++--------------
Mpkgs/geospatial/tpkutils/default.nix | 7++++++-
Mpkgs/geospatial/vt2geojson/default.nix | 12++++++++----
Mpkgs/gnss/gnsstk-apps/default.nix | 8+++++++-
Mpkgs/gnss/gnsstk/default.nix | 8+++++++-
Mpkgs/gnss/gps-sdr-sim/default.nix | 6+++++-
Mpkgs/gnss/gpsdate/default.nix | 6+++++-
Mpkgs/gnss/pygnssutils/default.nix | 8+++++++-
Mpkgs/gnss/pygpsclient/default.nix | 7++++++-
Mpkgs/gnss/pyrtcm/default.nix | 6+++++-
Mpkgs/gnss/pyspartn/default.nix | 10++++++----
Mpkgs/gnss/pyubx2/default.nix | 7++++++-
Mpkgs/gnss/rtklib/default.nix | 7++++++-
Mpkgs/gnss/visualgps/default.nix | 29+++++++++++++++++++++--------
Mpkgs/gpx/cmpgpx/default.nix | 14++++++++++++--
Mpkgs/gpx/garta/default.nix | 42++++++++++++++++++++++++++----------------
Mpkgs/gpx/geojson2dm/default.nix | 6+++++-
Mpkgs/gpx/gps-whatsnew/default.nix | 8+++++++-
Mpkgs/gpx/gpx-animator/default.nix | 8+++++++-
Mpkgs/gpx/gpx-cmd-tools/default.nix | 6+++++-
Mpkgs/gpx/gpx-converter/default.nix | 17++++++++++++++---
Mpkgs/gpx/gpx-interpolate/default.nix | 12++++++++++--
Mpkgs/gpx/gpx-layer/default.nix | 26++++++++++++++++++--------
Mpkgs/gpx/gpx2yaml/default.nix | 6+++++-
Mpkgs/gpx/gpxchart/default.nix | 6+++++-
Mpkgs/gpx/gpxeditor/default.nix | 9++++++++-
Mpkgs/gpx/gpxlib/default.nix | 8+++++++-
Mpkgs/gpx/gpxtools/default.nix | 9++++++++-
Mpkgs/gpx/gpxtrackposter/default.nix | 8+++++++-
Mpkgs/gpx/routeconverter/default.nix | 8+++++++-
Mpkgs/gpx/trackanimation/default.nix | 8+++++++-
Mpkgs/images/agate/default.nix | 18++++++++++++++++--
Mpkgs/images/elevation_server/default.nix | 8+++++++-
Mpkgs/images/git/default.nix | 6+++++-
Mpkgs/images/mbtileserver/default.nix | 5++++-
Mpkgs/images/quark/default.nix | 16++++++++++++++--
Mpkgs/linguistics/dict2rest/default.nix | 6+++++-
Mpkgs/linguistics/distance/default.nix | 6+++++-
Mpkgs/linguistics/gdcv/default.nix | 21++++++++++++++++++---
Mpkgs/linguistics/goldendict/bin.nix | 7++++++-
Mpkgs/linguistics/gt-bash-client/default.nix | 6+++++-
Mpkgs/linguistics/gt4gd/default.nix | 10+++++++---
Mpkgs/linguistics/i18n-editor/default.nix | 14++++++++++++--
Mpkgs/linguistics/lsdreader/default.nix | 6+++++-
Mpkgs/linguistics/mikatools/default.nix | 12++++++++++--
Mpkgs/linguistics/odict/default.nix | 12++++++++----
Mpkgs/linguistics/pytorchtext/default.nix | 15+++++++++++++--
Mpkgs/linguistics/revtok/default.nix | 6+++++-
Mpkgs/linguistics/stardict-tools/default.nix | 29++++++++++++++---------------
Mpkgs/linguistics/tatoebatools/default.nix | 28++++++++++++++++++++++++----
Mpkgs/linguistics/ttb/default.nix | 8+++++++-
Mpkgs/linguistics/wikitextprocessor/default.nix | 25+++++++++++++++++--------
Mpkgs/linguistics/wiktextract/default.nix | 22+++++++++++++++++++---
Mpkgs/linguistics/wiktfinnish/default.nix | 7++++++-
Mpkgs/linguistics/zdict/default.nix | 7++++++-
Mpkgs/misc/aamath/default.nix | 33++++++++++++++++++++++++++-------
Mpkgs/misc/acp/default.nix | 6+++++-
Mpkgs/misc/apibackuper/default.nix | 14++++++++++++--
Mpkgs/misc/arduinojson/default.nix | 7++++++-
Mpkgs/misc/ascii-dash/default.nix | 27++++++++++++++++++++++-----
Mpkgs/misc/bash-completor/default.nix | 13+++++++++++--
Mpkgs/misc/btpd/default.nix | 7++++++-
Mpkgs/misc/bwh/default.nix | 23++++++++++++++++++++---
Mpkgs/misc/capture2text/default.nix | 41++++++++++++++++++++++++++++++-----------
Mpkgs/misc/cfiles/default.nix | 16++++++++++++++--
Mpkgs/misc/chasquid/default.nix | 15+++++++++++++--
Mpkgs/misc/csv2html/default.nix | 7++++++-
Mpkgs/misc/csvtools/default.nix | 8+++++++-
Mpkgs/misc/diagon/default.nix | 27+++++++++++++++++++++------
Mpkgs/misc/dns-filter/default.nix | 6+++++-
Mpkgs/misc/docker-reg-tool/default.nix | 6+++++-
Mpkgs/misc/docx2csv/default.nix | 6+++++-
Mpkgs/misc/finalcut/default.nix | 16++++++++++++++--
Mpkgs/misc/freeopcua/default.nix | 12++++++++----
Mpkgs/misc/gaiagpsclient/default.nix | 11+++++++++--
Mpkgs/misc/git-tui/default.nix | 14++++++++++++--
Mpkgs/misc/graphene/default.nix | 39++++++++++++++++++++++++++-------------
Mpkgs/misc/heapusage/default.nix | 7++++++-
Mpkgs/misc/huami-token/default.nix | 17++++++++++++-----
Mpkgs/misc/ionscale/default.nix | 6+++++-
Mpkgs/misc/ish/default.nix | 6+++++-
Mpkgs/misc/json-tui/default.nix | 16++++++++++++++--
Mpkgs/misc/lazyscraper/default.nix | 12++++++++++--
Mpkgs/misc/libmdbx/default.nix | 7++++++-
Mpkgs/misc/libnbcompat/default.nix | 7++++++-
Mpkgs/misc/md2html/default.nix | 6+++++-
Mpkgs/misc/messenger-cli/default.nix | 25+++++++++++++------------
Mpkgs/misc/messenger-gtk/default.nix | 45+++++++++++++++++++++++----------------------
Mpkgs/misc/miband4/default.nix | 20++++++++++++++------
Mpkgs/misc/mitzasql/default.nix | 13+++++++++++--
Mpkgs/misc/mjs/default.nix | 12++++++++++--
Mpkgs/misc/modbus-tools/default.nix | 8+++++++-
Mpkgs/misc/modbus_sim_cli/default.nix | 7++++++-
Mpkgs/misc/morse-talk/default.nix | 13+++++++++++--
Mpkgs/misc/musig/default.nix | 21++++++++++-----------
Mpkgs/misc/mysql-to-sqlite3/default.nix | 6+++++-
Mpkgs/misc/nanodns/default.nix | 6+++++-
Mpkgs/misc/nmtree/default.nix | 8+++++++-
Mpkgs/misc/objlab/default.nix | 15+++++++++++----
Mpkgs/misc/ocelotgui/default.nix | 16+++++++++++++---
Mpkgs/misc/opcua-stack/default.nix | 14++++++++++++--
Mpkgs/misc/playonmac/default.nix | 7++++++-
Mpkgs/misc/plotjuggler/default.nix | 46++++++++++++++++++++++++++++------------------
Mpkgs/misc/pnoise/default.nix | 6+++++-
Mpkgs/misc/ptunnel/default.nix | 7++++++-
Mpkgs/misc/pvs-studio/default.nix | 31+++++++++++++++++++++----------
Mpkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix | 8+++++++-
Mpkgs/misc/qasync/default.nix | 6+++++-
Mpkgs/misc/qoiview/default.nix | 45+++++++++++++++++++++++++++++----------------
Mpkgs/misc/repolocli/default.nix | 27++++++++++++++++++++++-----
Mpkgs/misc/rhttp/default.nix | 6+++++-
Mpkgs/misc/riffraff/default.nix | 7++++++-
Mpkgs/misc/rst2txt/default.nix | 6+++++-
Mpkgs/misc/sdorfehs/default.nix | 16++++++++++++++--
Mpkgs/misc/serial-studio/bin.nix | 18+++++++++++++++---
Mpkgs/misc/serverpp/default.nix | 14++++++++++++--
Mpkgs/misc/shellprof/default.nix | 7++++++-
Mpkgs/misc/socketcand/default.nix | 19++++++++++++++++---
Mpkgs/misc/subprocess/default.nix | 14++++++++++++--
Mpkgs/misc/tabiew/default.nix | 7++++++-
Mpkgs/misc/tcvt/default.nix | 7++++++-
Mpkgs/misc/telegabber/default.nix | 21++++++++++++++++-----
Mpkgs/misc/telegram-send/default.nix | 13+++++++++++--
Mpkgs/misc/telnetpp/default.nix | 28++++++++++++++++++++++------
Mpkgs/misc/tinyflux/default.nix | 6+++++-
Mpkgs/misc/tlstunnel/default.nix | 6+++++-
Mpkgs/misc/turbo/default.nix | 13+++++++++----
Mpkgs/misc/tvision/default.nix | 12++++++++----
Mpkgs/misc/wik/default.nix | 12++++++++++--
Mpkgs/misc/worm/default.nix | 28+++++++++++++++++++++-------
Mpkgs/misc/wptools/default.nix | 6+++++-
Mpkgs/misc/xfractint/default.nix | 12++++++++++--
Mpkgs/misc/xtr/default.nix | 19++++++++++++++++---
Mpkgs/misc/youtimetrack/default.nix | 7++++++-
Mpkgs/mqtt/emitter/default.nix | 10++++++----
Mpkgs/mqtt/go-mqtt-to-influxdb/default.nix | 7++++++-
Mpkgs/mqtt/ioxy/default.nix | 7++++++-
Mpkgs/mqtt/janus-mqtt-proxy/default.nix | 6+++++-
Mpkgs/mqtt/libumqtt/default.nix | 18++++++++++++++++--
Mpkgs/mqtt/mongoose/default.nix | 7++++++-
Mpkgs/mqtt/mproxy/default.nix | 7++++++-
Mpkgs/mqtt/mqcontrol/default.nix | 7++++++-
Mpkgs/mqtt/mqtt-benchmark/default.nix | 6+++++-
Mpkgs/mqtt/mqtt-c/default.nix | 8+++++++-
Mpkgs/mqtt/mqtt-cli/default.nix | 8+++++++-
Mpkgs/mqtt/mqtt-explorer/default.nix | 35+++++++++++++++++++++++++++--------
Mpkgs/mqtt/mqtt-launcher/default.nix | 7++++++-
Mpkgs/mqtt/mqtt-proxy/default.nix | 8+++++++-
Mpkgs/mqtt/mqtt-shell/default.nix | 7++++++-
Mpkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix | 12++++++++++--
Mpkgs/mqtt/mqtt-to-influxdb/default.nix | 61++++++++++++++++++++++++++++++++-----------------------------
Mpkgs/mqtt/nanosdk/default.nix | 1-
Mpkgs/mqtt/rumqtt/default.nix | 9++++++++-
Mpkgs/nakarte/elevation_server/default.nix | 13+++++++++++--
Mpkgs/nakarte/map-tiler/default.nix | 33++++++++++++++++++++-------------
Mpkgs/nakarte/maprec/default.nix | 14++++++++++++--
Mpkgs/nakarte/nakarte/default.nix | 7++++++-
Mpkgs/nakarte/ozi_map/default.nix | 13+++++++++++--
Mpkgs/nakarte/pyimagequant/default.nix | 7++++++-
Mpkgs/nakarte/thinplatespline/default.nix | 6+++++-
Mpkgs/nakarte/tracks_storage_server/default.nix | 34++++++++++++++++++++--------------
Mpkgs/osm/cykhash/default.nix | 11+++++++++--
Mpkgs/osm/gcgn-converter/default.nix | 23+++++++++++++++--------
Mpkgs/osm/level0/default.nix | 7++++++-
Mpkgs/osm/map-machine/default.nix | 11+++++++----
Mpkgs/osm/map-stylizer/default.nix | 11+++++++++--
Mpkgs/osm/maperitive/default.nix | 15+++++++++++++--
Mpkgs/osm/memphis/default.nix | 19++++++++++---------
Mpkgs/osm/osm-3s/default.nix | 19++++++++++++++-----
Mpkgs/osm/osm-area-tools/default.nix | 25+++++++++++++------------
Mpkgs/osm/osm-python-tools/default.nix | 7++++++-
Mpkgs/osm/osm-tags-transform/default.nix | 25++++++++++++-------------
Mpkgs/osm/osm2geojson/default.nix | 6+++++-
Mpkgs/osm/osmcoastline/default.nix | 27++++++++++++++-------------
Mpkgs/osm/osmdbt/default.nix | 36+++++++++++++++++++-----------------
Mpkgs/osm/osmium-surplus/default.nix | 32++++++++++++++++++--------------
Mpkgs/osm/osmosis/default.nix | 7++++++-
Mpkgs/osm/osmwalkthrough/default.nix | 18++++++++++++------
Mpkgs/osm/overpassforge/default.nix | 6+++++-
Mpkgs/osm/phyghtmap/default.nix | 15+++++++++++++--
Mpkgs/osm/planetiler/default.nix | 9++++++++-
Mpkgs/osm/polytiles/default.nix | 7++++++-
Mpkgs/osm/prettymapp/default.nix | 12++++++++++--
Mpkgs/osm/pyrobuf/default.nix | 11+++++++++--
Mpkgs/osm/pyrosm/default.nix | 9++++++++-
Mpkgs/osm/sdlmap/default.nix | 21++++++++++++++++++---
Mpkgs/osm/smopy/default.nix | 6+++++-
Mpkgs/osm/smrender/default.nix | 37++++++++++++++++++++++++-------------
Mpkgs/osm/taginfo-tools/default.nix | 26++++++++++++++++++++++++--
Mpkgs/osm/tilelog/default.nix | 13+++++++++++--
Mpkgs/osm/tirex/default.nix | 47++++++++++++++++++++++++++++-------------------
Mpkgs/osm/vectiler/default.nix | 8+++++++-
Mpkgs/perl-packages.nix | 28+++++++++++++++++++++++-----
Mpkgs/radio/acarsdec/default.nix | 24+++++++++++++++++++++---
Mpkgs/radio/adsb_deku/default.nix | 7++++++-
Mpkgs/radio/ais-catcher/default.nix | 34+++++++++++++++++++---------------
Mpkgs/radio/aprsc/default.nix | 16++++++++++++++--
Mpkgs/radio/dumphfdl/default.nix | 32+++++++++++++++++++++++++++++---
Mpkgs/radio/dumpvdl2/default.nix | 38++++++++++++++++++++++++++++++++++----
Mpkgs/radio/fmreceiver/default.nix | 82++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
Mpkgs/radio/goestools/default.nix | 22+++++++++++++++++++---
Mpkgs/radio/gqrx-scanner/default.nix | 7++++++-
Mpkgs/radio/libacars/default.nix | 18+++++++++++++-----
Mpkgs/radio/linrad/default.nix | 14++++++++++++--
Mpkgs/radio/radiolib/default.nix | 7++++++-
Mpkgs/radio/rtlsdr-airband/default.nix | 44+++++++++++++++++++++++++++-----------------
Mpkgs/radio/rtltcp/default.nix | 20+++++++++++++++++---
Mpkgs/radio/sdr-modem/default.nix | 26+++++++++++++++++++++++---
Mpkgs/radio/sdr-server/default.nix | 26+++++++++++++++++++++++---
Mpkgs/radio/smallrx/default.nix | 6+++++-
Mpkgs/suckless/amused/default.nix | 30+++++++++++++++++++++++++++---
Mpkgs/suckless/blind/default.nix | 6+++++-
Mpkgs/suckless/chibicc/default.nix | 7++++++-
Mpkgs/suckless/cproc/default.nix | 7++++++-
Mpkgs/suckless/dragon/default.nix | 8+++++++-
Mpkgs/suckless/dtree/default.nix | 6+++++-
Mpkgs/suckless/edit/default.nix | 12++++++++++--
Mpkgs/suckless/farbfeld-utils/default.nix | 21+++++++++++++++++----
Mpkgs/suckless/ff-tools/default.nix | 6+++++-
Mpkgs/suckless/ffshot/default.nix | 12++++++++++--
Mpkgs/suckless/hurl/default.nix | 13+++++++++++--
Mpkgs/suckless/imscript/default.nix | 40++++++++++++++++++++++++++--------------
Mpkgs/suckless/imsg-compat/default.nix | 7++++++-
Mpkgs/suckless/kilo/default.nix | 6+++++-
Mpkgs/suckless/lacc/default.nix | 6+++++-
Mpkgs/suckless/lbm/default.nix | 16++++++++++++++--
Mpkgs/suckless/lchat/default.nix | 7++++++-
Mpkgs/suckless/lel/default.nix | 9++++++++-
Mpkgs/suckless/libst/default.nix | 7++++++-
Mpkgs/suckless/libutf/default.nix | 8+++++++-
Mpkgs/suckless/mage/default.nix | 16++++++++++++++--
Mpkgs/suckless/makel/default.nix | 7++++++-
Mpkgs/suckless/nextvi/default.nix | 6+++++-
Mpkgs/suckless/pista/default.nix | 7++++++-
Mpkgs/suckless/poe/default.nix | 6+++++-
Mpkgs/suckless/saait/default.nix | 6+++++-
Mpkgs/suckless/sbase/default.nix | 12++++++++++--
Mpkgs/suckless/scc/default.nix | 16++++++++++++++--
Mpkgs/suckless/scroll/default.nix | 6+++++-
Mpkgs/suckless/sdhcp/default.nix | 13+++++++++++--
Mpkgs/suckless/se/default.nix | 8+++++++-
Mpkgs/suckless/sled/default.nix | 6+++++-
Mpkgs/suckless/ste/default.nix | 6+++++-
Mpkgs/suckless/sthkd/default.nix | 6+++++-
Mpkgs/suckless/svtm/default.nix | 18++++++++++++++++--
Mpkgs/suckless/table/default.nix | 6+++++-
431 files changed, 4979 insertions(+), 1882 deletions(-)

diff --git a/ci.nix b/ci.nix @@ -9,26 +9,37 @@ # then your CI will be able to build and cache only those packages for # which this is possible. -{ pkgs ? import <nixpkgs> { } }: +{ + pkgs ? import <nixpkgs> { }, +}: with builtins; let isReserved = n: n == "lib" || n == "overlays" || n == "modules"; isDerivation = p: isAttrs p && p ? type && p.type == "derivation"; - isBuildable = p: !(p.meta.broken or false) && !(p.meta.skip.ci or false) && p.meta.license.free or true; + isBuildable = + p: !(p.meta.broken or false) && !(p.meta.skip.ci or false) && p.meta.license.free or true; isCacheable = p: !(p.preferLocalBuild or false); shouldRecurseForDerivations = p: isAttrs p && p.recurseForDerivations or false; - nameValuePair = n: v: { name = n; value = v; }; + nameValuePair = n: v: { + name = n; + value = v; + }; concatMap = builtins.concatMap or (f: xs: concatLists (map f xs)); - flattenPkgs = s: + flattenPkgs = + s: let - f = p: - if shouldRecurseForDerivations p then flattenPkgs p - else if isDerivation p then [ p ] - else [ ]; + f = + p: + if shouldRecurseForDerivations p then + flattenPkgs p + else if isDerivation p then + [ p ] + else + [ ]; in concatMap f (attrValues s); @@ -36,19 +47,11 @@ let nurAttrs = import ./default.nix { inherit pkgs; }; - nurPkgs = - flattenPkgs ( - listToAttrs ( - map - (n: nameValuePair n nurAttrs.${n}) - ( - filter - (n: !isReserved n) - (attrNames nurAttrs) - ) - ) - ); - + nurPkgs = flattenPkgs ( + listToAttrs ( + map (n: nameValuePair n nurAttrs.${n}) (filter (n: !isReserved n) (attrNames nurAttrs)) + ) + ); in rec { buildPkgs = filter isBuildable nurPkgs; diff --git a/default.nix b/default.nix @@ -6,13 +6,12 @@ # commands such as: # nix-build -A mypackage -{ pkgs ? import <nixpkgs> { } }: +{ + pkgs ? import <nixpkgs> { }, +}: { # The `lib`, `modules`, and `overlay` names are special modules = import ./modules; # NixOS modules -} // (pkgs.lib.optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs { - inherit pkgs; } -) -) +// (pkgs.lib.optionalAttrs (builtins.tryEval pkgs).success (import ./pkgs { inherit pkgs; })) diff --git a/flake.nix b/flake.nix @@ -6,30 +6,39 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: { - overlays.default = final: prev: import ./pkgs { pkgs = prev; }; - nixosModules = import ./modules; - } // flake-utils.lib.eachDefaultSystem (system: - let - config = { - permittedInsecurePackages = [ "openssl-1.1.1w" "python-2.7.18.7" "qtwebkit-5.212.0-alpha4" ]; - }; - pkgs = import nixpkgs { - inherit system config; - }; - inherit (pkgs) lib; - packages = flake-utils.lib.filterPackages system (import ./default.nix { - inherit pkgs; - }); - in + outputs = { - inherit packages; - legacyPackages = import nixpkgs { - inherit system config; - overlays = [ self.overlays.default ]; - crossOverlays = [ self.overlays.default ]; - }; - formatter = pkgs.nixpkgs-fmt; - checks.build = pkgs.linkFarmFromDrvs "sikmir-nur-packages" (lib.attrValues packages); - }); + self, + nixpkgs, + flake-utils, + }: + { + overlays.default = final: prev: import ./pkgs { pkgs = prev; }; + nixosModules = import ./modules; + } + // flake-utils.lib.eachDefaultSystem ( + system: + let + config = { + permittedInsecurePackages = [ + "openssl-1.1.1w" + "python-2.7.18.7" + "qtwebkit-5.212.0-alpha4" + ]; + }; + pkgs = import nixpkgs { inherit system config; }; + inherit (pkgs) lib; + packages = flake-utils.lib.filterPackages system (import ./default.nix { inherit pkgs; }); + in + { + inherit packages; + legacyPackages = import nixpkgs { + inherit system config; + overlays = [ self.overlays.default ]; + crossOverlays = [ self.overlays.default ]; + }; + formatter = pkgs.nixfmt-rfc-style; + checks.build = pkgs.linkFarmFromDrvs "sikmir-nur-packages" (lib.attrValues packages); + } + ); } diff --git a/modules/home-manager/programs/goldendict.nix b/modules/home-manager/programs/goldendict.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -18,9 +23,5 @@ in }; }; - config = mkIf cfg.enable { - home.packages = [ - cfg.package - ]; - }; + config = mkIf cfg.enable { home.packages = [ cfg.package ]; }; } diff --git a/modules/home-manager/programs/gpxsee.nix b/modules/home-manager/programs/gpxsee.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -66,67 +71,45 @@ in }; }; - config = mkIf cfg.enable ( - mkMerge [ - { - home.packages = [ cfg.package ]; + config = mkIf cfg.enable (mkMerge [ + { + home.packages = [ cfg.package ]; - home.activation.hideToolbar = - lib.hm.dag.entryAfter [ "writeBoundary" ] - ( - if pkgs.stdenv.isDarwin then - "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Settings.toolbar -bool false" - else - "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Settings toolbar 0" - ); - } + home.activation.hideToolbar = lib.hm.dag.entryAfter [ "writeBoundary" ] ( + if pkgs.stdenv.isDarwin then + "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Settings.toolbar -bool false" + else + "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Settings toolbar 0" + ); + } - ( - mkIf pkgs.stdenv.isLinux { - home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' - $DRY_RUN_CMD mkdir -p ${configDir} - $DRY_RUN_CMD touch ${configFile} - ''; - } - ) + (mkIf pkgs.stdenv.isLinux { + home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' + $DRY_RUN_CMD mkdir -p ${configDir} + $DRY_RUN_CMD touch ${configFile} + ''; + }) - ( - mkIf (cfg.demPackage != null) { - home.file."${demDir}".source = "${cfg.demPackage}"; - } - ) + (mkIf (cfg.demPackage != null) { home.file."${demDir}".source = "${cfg.demPackage}"; }) - ( - mkIf (length cfg.mapPackages > 0) { - home.file = listToAttrs ( - map - (m: { - name = "${mapDir}/${m.name}"; - value.source = "${m}"; - }) - cfg.mapPackages - ); - } - ) + (mkIf (length cfg.mapPackages > 0) { + home.file = listToAttrs ( + map (m: { + name = "${mapDir}/${m.name}"; + value.source = "${m}"; + }) cfg.mapPackages + ); + }) - ( - mkIf (length cfg.poiPackages > 0) { - home.file = listToAttrs ( - map - (p: { - name = "${poiDir}/${p.name}"; - value.source = "${p}"; - }) - cfg.poiPackages - ); - } - ) + (mkIf (length cfg.poiPackages > 0) { + home.file = listToAttrs ( + map (p: { + name = "${poiDir}/${p.name}"; + value.source = "${p}"; + }) cfg.poiPackages + ); + }) - ( - mkIf (cfg.stylePackage != null) { - home.file."${styleDir}".source = "${cfg.stylePackage}"; - } - ) - ] - ); + (mkIf (cfg.stylePackage != null) { home.file."${styleDir}".source = "${cfg.stylePackage}"; }) + ]); } diff --git a/modules/home-manager/programs/josm.nix b/modules/home-manager/programs/josm.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -36,39 +41,33 @@ in }; }; - config = mkIf cfg.enable ( - mkMerge [ - { - home.packages = [ cfg.package ]; + config = mkIf cfg.enable (mkMerge [ + { + home.packages = [ cfg.package ]; - home.activation.createJOSMConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' - . ${./josm/init-prefs.sh} - . ${./josm/upsert-tag.sh} - export PATH=${pkgs.xmlstarlet}/bin:$PATH - initPrefs ${cfg.package.version} ${configFile} - upsertTag josm.version ${cfg.package.version} ${configFile} - ''; - } + home.activation.createJOSMConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' + . ${./josm/init-prefs.sh} + . ${./josm/upsert-tag.sh} + export PATH=${pkgs.xmlstarlet}/bin:$PATH + initPrefs ${cfg.package.version} ${configFile} + upsertTag josm.version ${cfg.package.version} ${configFile} + ''; + } - ( - mkIf (cfg.accessTokenKey != "") { - home.activation.setupAccessTokenKey = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - . ${./josm/upsert-tag.sh} - export PATH=${pkgs.xmlstarlet}/bin:$PATH - upsertTag oauth.access-token.key ${cfg.accessTokenKey} ${configFile} - ''; - } - ) + (mkIf (cfg.accessTokenKey != "") { + home.activation.setupAccessTokenKey = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + . ${./josm/upsert-tag.sh} + export PATH=${pkgs.xmlstarlet}/bin:$PATH + upsertTag oauth.access-token.key ${cfg.accessTokenKey} ${configFile} + ''; + }) - ( - mkIf (cfg.accessTokenSecret != "") { - home.activation.setupAccessTokenSecret = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - . ${./josm/upsert-tag.sh} - export PATH=${pkgs.xmlstarlet}/bin:$PATH - upsertTag oauth.access-token.secret ${cfg.accessTokenSecret} ${configFile} - ''; - } - ) - ] - ); + (mkIf (cfg.accessTokenSecret != "") { + home.activation.setupAccessTokenSecret = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + . ${./josm/upsert-tag.sh} + export PATH=${pkgs.xmlstarlet}/bin:$PATH + upsertTag oauth.access-token.secret ${cfg.accessTokenSecret} ${configFile} + ''; + }) + ]); } diff --git a/modules/home-manager/programs/merkaartor.nix b/modules/home-manager/programs/merkaartor.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -33,41 +38,35 @@ in }; }; - config = mkIf cfg.enable ( - mkMerge [ - { - home.packages = [ cfg.package ]; - } + config = mkIf cfg.enable (mkMerge [ + { home.packages = [ cfg.package ]; } - ( - mkIf pkgs.stdenv.isLinux { - home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' - $DRY_RUN_CMD mkdir -p ${configDir} - $DRY_RUN_CMD touch ${configFile} - ''; - } - ) + (mkIf pkgs.stdenv.isLinux { + home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' + $DRY_RUN_CMD mkdir -p ${configDir} + $DRY_RUN_CMD touch ${configFile} + ''; + }) - ( - mkIf (cfg.user != "" && cfg.password != "") { - home.activation.setupCredentials = lib.hm.dag.entryAfter [ "writeBoundary" ] - ( - if pkgs.stdenv.isDarwin then '' - $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.url https://api.openstreetmap.org/api - $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.selected true - $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.user ${cfg.user} - $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.password ${cfg.password} - $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.size 1 - '' else '' - $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\url https://api.openstreetmap.org/api - $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\selected true - $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\user ${cfg.user} - $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\password ${cfg.password} - $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers size 1 - '' - ); - } - ) - ] - ); + (mkIf (cfg.user != "" && cfg.password != "") { + home.activation.setupCredentials = lib.hm.dag.entryAfter [ "writeBoundary" ] ( + if pkgs.stdenv.isDarwin then + '' + $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.url https://api.openstreetmap.org/api + $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.selected true + $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.user ${cfg.user} + $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.1.password ${cfg.password} + $DRY_RUN_CMD /usr/bin/defaults write ${domain} OsmServers.size 1 + '' + else + '' + $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\url https://api.openstreetmap.org/api + $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\selected true + $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\user ${cfg.user} + $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers 1\\\\password ${cfg.password} + $DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} OsmServers size 1 + '' + ); + }) + ]); } diff --git a/modules/home-manager/programs/openorienteering-mapper.nix b/modules/home-manager/programs/openorienteering-mapper.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -22,31 +27,23 @@ in }; }; - config = mkIf cfg.enable ( - mkMerge [ - { - home.packages = [ cfg.package ]; - } + config = mkIf cfg.enable (mkMerge [ + { home.packages = [ cfg.package ]; } - ( - mkIf pkgs.stdenv.isLinux { - home.activation.createConfigFile = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - $DRY_RUN_CMD mkdir -p ${configDir} - $DRY_RUN_CMD touch ${configFile} - ''; - } - ) + (mkIf pkgs.stdenv.isLinux { + home.activation.createConfigFile = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + $DRY_RUN_CMD mkdir -p ${configDir} + $DRY_RUN_CMD touch ${configFile} + ''; + }) - { - home.activation.tipsVisible = - lib.hm.dag.entryAfter [ "writeBoundary" ] - ( - if pkgs.stdenv.isDarwin then - "$DRY_RUN_CMD /usr/bin/defaults write ${domain} HomeScreen.tipsVisible -bool false" - else - "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} HomeScreen tipsVisible 0" - ); - } - ] - ); + { + home.activation.tipsVisible = lib.hm.dag.entryAfter [ "writeBoundary" ] ( + if pkgs.stdenv.isDarwin then + "$DRY_RUN_CMD /usr/bin/defaults write ${domain} HomeScreen.tipsVisible -bool false" + else + "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} HomeScreen tipsVisible 0" + ); + } + ]); } diff --git a/modules/home-manager/programs/qmapshack.nix b/modules/home-manager/programs/qmapshack.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let @@ -46,59 +51,41 @@ in }; }; - config = mkIf cfg.enable ( - mkMerge [ - { - home.packages = [ cfg.package ]; - } + config = mkIf cfg.enable (mkMerge [ + { home.packages = [ cfg.package ]; } - ( - mkIf pkgs.stdenv.isLinux { - home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' - $DRY_RUN_CMD mkdir -p ${configDir} - $DRY_RUN_CMD touch ${configFile} - ''; - } - ) + (mkIf pkgs.stdenv.isLinux { + home.activation.createConfigFile = lib.hm.dag.entryBefore [ "writeBoundary" ] '' + $DRY_RUN_CMD mkdir -p ${configDir} + $DRY_RUN_CMD touch ${configFile} + ''; + }) - ( - mkIf (length cfg.demPackages > 0) { - home.activation.setupDemPaths = - lib.hm.dag.entryAfter [ "writeBoundary" ] - ( - if pkgs.stdenv.isDarwin then - "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.demPaths -array ${toString cfg.demPackages}" - else - "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas demPaths ${concatStringsSep "," cfg.demPackages}" - ); - } - ) + (mkIf (length cfg.demPackages > 0) { + home.activation.setupDemPaths = lib.hm.dag.entryAfter [ "writeBoundary" ] ( + if pkgs.stdenv.isDarwin then + "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.demPaths -array ${toString cfg.demPackages}" + else + "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas demPaths ${concatStringsSep "," cfg.demPackages}" + ); + }) - ( - mkIf (length cfg.mapPackages > 0) { - home.activation.setupMapPaths = - lib.hm.dag.entryAfter [ "writeBoundary" ] - ( - if pkgs.stdenv.isDarwin then - "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.mapPath -array ${toString cfg.mapPackages}" - else - "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas mapPath ${concatStringsSep "," cfg.mapPackages}" - ); - } - ) + (mkIf (length cfg.mapPackages > 0) { + home.activation.setupMapPaths = lib.hm.dag.entryAfter [ "writeBoundary" ] ( + if pkgs.stdenv.isDarwin then + "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Canvas.mapPath -array ${toString cfg.mapPackages}" + else + "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Canvas mapPath ${concatStringsSep "," cfg.mapPackages}" + ); + }) - ( - mkIf (length cfg.routinoPackages > 0) { - home.activation.setupRoutinoPaths = - lib.hm.dag.entryAfter [ "writeBoundary" ] - ( - if pkgs.stdenv.isDarwin then - "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Route.routino.paths -array ${toString cfg.routinoPackages}" - else - "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Route routino\\\\paths ${concatStringsSep "," cfg.routinoPackages}" - ); - } - ) - ] - ); + (mkIf (length cfg.routinoPackages > 0) { + home.activation.setupRoutinoPaths = lib.hm.dag.entryAfter [ "writeBoundary" ] ( + if pkgs.stdenv.isDarwin then + "$DRY_RUN_CMD /usr/bin/defaults write ${domain} Route.routino.paths -array ${toString cfg.routinoPackages}" + else + "$DRY_RUN_CMD ${pkgs.crudini}/bin/crudini $VERBOSE_ARG --set ${configFile} Route routino\\\\paths ${concatStringsSep "," cfg.routinoPackages}" + ); + }) + ]); } diff --git a/modules/home-manager/programs/slack-term.nix b/modules/home-manager/programs/slack-term.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let diff --git a/modules/home-manager/programs/vis.nix b/modules/home-manager/programs/vis.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; let diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix @@ -1,3 +1 @@ -{ - mbtileserver = ./services/mbtileserver.nix; -} +{ mbtileserver = ./services/mbtileserver.nix; } diff --git a/modules/nixos/services/mbtileserver.nix b/modules/nixos/services/mbtileserver.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; diff --git a/overlay.nix b/overlay.nix @@ -5,13 +5,14 @@ self: super: let isReserved = n: n == "lib" || n == "overlays" || n == "modules"; - nameValuePair = n: v: { name = n; value = v; }; + nameValuePair = n: v: { + name = n; + value = v; + }; nurAttrs = import ./default.nix { pkgs = super; }; in -builtins.listToAttrs (map - (n: nameValuePair n nurAttrs.${n}) - (builtins.filter - (n: !isReserved n) - (builtins.attrNames nurAttrs) +builtins.listToAttrs ( + map (n: nameValuePair n nurAttrs.${n}) ( + builtins.filter (n: !isReserved n) (builtins.attrNames nurAttrs) ) ) diff --git a/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchfromgh, appimageTools, undmg }: +{ + lib, + stdenv, + fetchfromgh, + appimageTools, + undmg, +}: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -6,25 +12,27 @@ let pname = "goldencheetah-bin"; version = "3.5"; - suffix = { - x86_64-linux = "amd64_Linux.AppImage"; - x86_64-darwin = "64bit_MacOS.dmg"; - }.${system} or throwSystem; + suffix = + { + x86_64-linux = "amd64_Linux.AppImage"; + x86_64-darwin = "64bit_MacOS.dmg"; + } + .${system} or throwSystem; src = fetchfromgh { owner = "GoldenCheetah"; repo = "GoldenCheetah"; version = "V${version}"; name = "GoldenCheetah_v${version}_${suffix}"; - sha256 = { - x86_64-linux = "07ixivsp5j05a3zsbqx5jf11x7m3rcqaw095qjqrwd0nq0nmmhg8"; - x86_64-darwin = "0alg0a071lpkx0v3qqkqbb93vh1nsb3d7czxl9m15v17akp8nl82"; - }.${system} or throwSystem; + sha256 = + { + x86_64-linux = "07ixivsp5j05a3zsbqx5jf11x7m3rcqaw095qjqrwd0nq0nmmhg8"; + x86_64-darwin = "0alg0a071lpkx0v3qqkqbb93vh1nsb3d7czxl9m15v17akp8nl82"; + } + .${system} or throwSystem; }; - appimageContents = appimageTools.extract { - inherit pname version src; - }; + appimageContents = appimageTools.extract { inherit pname version src; }; meta = with lib; { description = "Performance software for cyclists, runners and triathletes"; @@ -32,12 +40,20 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3; maintainers = [ maintainers.sikmir ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; skip.ci = true; }; linux = appimageTools.wrapType2 rec { - inherit pname version src meta; + inherit + pname + version + src + meta + ; extraInstallCommands = '' mv $out/bin/{${pname}-${version},goldencheetah} @@ -59,6 +75,4 @@ let ''; }; in -if stdenv.isDarwin -then darwin -else linux +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchfromgh, appimageTools, undmg }: +{ + lib, + stdenv, + fetchfromgh, + appimageTools, + undmg, +}: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -6,37 +12,47 @@ let pname = "klogg-bin"; version = "22.06"; - suffix = { - x86_64-linux = "Linux-amd64.AppImage"; - x86_64-darwin = "OSX-Qt5.dmg"; - }.${system} or throwSystem; + suffix = + { + x86_64-linux = "Linux-amd64.AppImage"; + x86_64-darwin = "OSX-Qt5.dmg"; + } + .${system} or throwSystem; src = fetchfromgh { owner = "variar"; repo = "klogg"; version = "v${version}"; name = "klogg-${version}.0.1289-${suffix}"; - hash = { - x86_64-linux = "sha256-XawJ6VOF0XtMrl7iefm13quv83X171k9eKiXClrklZI="; - x86_64-darwin = "sha256-5d93ItDYUYUt2cw0Sd1C0f7z507dqMINwEs4y4UrD+w="; - }.${system} or throwSystem; + hash = + { + x86_64-linux = "sha256-XawJ6VOF0XtMrl7iefm13quv83X171k9eKiXClrklZI="; + x86_64-darwin = "sha256-5d93ItDYUYUt2cw0Sd1C0f7z507dqMINwEs4y4UrD+w="; + } + .${system} or throwSystem; }; - appimageContents = appimageTools.extract { - inherit pname version src; - }; + appimageContents = appimageTools.extract { inherit pname version src; }; meta = with lib; { description = "A fast, advanced log explorer based on glogg project"; homepage = "https://klogg.filimonov.dev/"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; maintainers = [ maintainers.sikmir ]; skip.ci = true; }; linux = appimageTools.wrapType2 rec { - inherit pname version src meta; + inherit + pname + version + src + meta + ; extraInstallCommands = '' mv $out/bin/{${pname}-${version},klogg} @@ -46,7 +62,12 @@ let }; darwin = stdenv.mkDerivation { - inherit pname version src meta; + inherit + pname + version + src + meta + ; nativeBuildInputs = [ undmg ]; @@ -58,6 +79,4 @@ let ''; }; in -if stdenv.isDarwin -then darwin -else linux +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/klogg/default.nix b/pkgs/applications/misc/klogg/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, mkDerivation -, fetchFromGitHub -, cmake -, ninja -, python3Packages -, boost -, ragel -, useSentry ? stdenv.isLinux -, useHyperscan ? false +{ + stdenv, + lib, + mkDerivation, + fetchFromGitHub, + cmake, + ninja, + python3Packages, + boost, + ragel, + useSentry ? stdenv.isLinux, + useHyperscan ? false, }: mkDerivation rec { @@ -22,9 +23,16 @@ mkDerivation rec { hash = "sha256-bim/cDEOfMolHkrBLBEu94YI+1o1opdeA66xeovAwp0="; }; - nativeBuildInputs = [ cmake ninja python3Packages.python ]; + nativeBuildInputs = [ + cmake + ninja + python3Packages.python + ]; - buildInputs = [ boost ragel ]; + buildInputs = [ + boost + ragel + ]; postPatch = lib.optionalString useSentry '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ diff --git a/pkgs/applications/synwrite/default.nix b/pkgs/applications/synwrite/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, unzip, wine, makeWrapper, withExLexer ? true }: +{ + lib, + stdenv, + fetchurl, + unzip, + wine, + makeWrapper, + withExLexer ? true, +}: let exlexer = fetchurl { url = "mirror://sourceforge/synwrite-addons/PyPlugins/plugin.Alexey.ExLexer.zip"; @@ -19,18 +27,23 @@ stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ + unzip + makeWrapper + ]; - installPhase = '' - mkdir -p $out/opt/synwrite - cp -r . $out/opt/synwrite + installPhase = + '' + mkdir -p $out/opt/synwrite + cp -r . $out/opt/synwrite - makeWrapper ${wine}/bin/wine $out/bin/synwrite \ - --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \ - --add-flags "\$HOME/.synwrite/Syn.exe" - '' + lib.optionalString withExLexer '' - unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer - ''; + makeWrapper ${wine}/bin/wine $out/bin/synwrite \ + --run "[ -d \$HOME/.synwrite ] || { cp -r $out/opt/synwrite \$HOME/.synwrite && chmod -R +w \$HOME/.synwrite; }" \ + --add-flags "\$HOME/.synwrite/Syn.exe" + '' + + lib.optionalString withExLexer '' + unzip ${exlexer} -d $out/opt/synwrite/Py/syn_exlexer + ''; preferLocalBuild = true; diff --git a/pkgs/build-support/fetchfromgh/default.nix b/pkgs/build-support/fetchfromgh/default.nix @@ -1,14 +1,28 @@ { fetchurl }: -{ owner, repo, version, name, ... } @ args: +{ + owner, + repo, + version, + name, + ... +}@args: let baseUrl = "https://github.com/${owner}/${repo}"; in ( - fetchurl - ( - { - url = "${baseUrl}/releases/download/${version}/${name}"; - } // removeAttrs args [ "owner" "repo" "version" "name" ] - ) // { meta.homepage = baseUrl; } + fetchurl ( + { + url = "${baseUrl}/releases/download/${version}/${name}"; + } + // removeAttrs args [ + "owner" + "repo" + "version" + "name" + ] + ) + // { + meta.homepage = baseUrl; + } ) diff --git a/pkgs/build-support/fetchgdrive/default.nix b/pkgs/build-support/fetchgdrive/default.nix @@ -1,11 +1,7 @@ { fetchurl }: -{ id, ... } @ args: +{ id, ... }@args: -( - fetchurl ( - { - url = "https://drive.google.com/uc?export=download&id=${id}"; - } // removeAttrs args [ "id" ] - ) -) +(fetchurl ( + { url = "https://drive.google.com/uc?export=download&id=${id}"; } // removeAttrs args [ "id" ] +)) diff --git a/pkgs/build-support/fetchwebarchive/default.nix b/pkgs/build-support/fetchwebarchive/default.nix @@ -1,11 +1,13 @@ { fetchurl }: -{ timestamp, url, ... } @ args: +{ timestamp, url, ... }@args: -( - fetchurl ( - { - url = "https://web.archive.org/web/${timestamp}/${url}"; - } // removeAttrs args [ "timestamp" "url" ] - ) -) +(fetchurl ( + { + url = "https://web.archive.org/web/${timestamp}/${url}"; + } + // removeAttrs args [ + "timestamp" + "url" + ] +)) diff --git a/pkgs/build-support/fetchymaps/default.nix b/pkgs/build-support/fetchymaps/default.nix @@ -1,11 +1,5 @@ { fetchurl }: -{ um, ... } @ args: +{ um, ... }@args: -( - fetchurl ( - { - url = "https://yandex.ru/maps/export/usermaps/${um}"; - } // removeAttrs args [ "um" ] - ) -) +(fetchurl ({ url = "https://yandex.ru/maps/export/usermaps/${um}"; } // removeAttrs args [ "um" ])) diff --git a/pkgs/darwin/amethyst/default.nix b/pkgs/darwin/amethyst/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchfromgh, unzip }: +{ + lib, + stdenv, + fetchfromgh, + unzip, +}: stdenv.mkDerivation (finalAttrs: { pname = "Amethyst"; diff --git a/pkgs/darwin/cudatext/bin.nix b/pkgs/darwin/cudatext/bin.nix @@ -1,24 +1,36 @@ -{ lib, stdenv, fetchurl, _7zz, makeWrapper, cudatext }: +{ + lib, + stdenv, + fetchurl, + _7zz, + makeWrapper, + cudatext, +}: stdenv.mkDerivation (finalAttrs: { pname = "cudatext-bin"; version = "1.214.0.0"; - src = { - "aarch64-darwin" = fetchurl { - url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-aarch64-${finalAttrs.version}.dmg"; - hash = "sha256-DU2QtKjPsHBw8hBb2t7cmYvUQ3UodgcW4Hp9kEyEzBI="; - }; - "x86_64-darwin" = fetchurl { - url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-amd64-${finalAttrs.version}.dmg"; - hash = "sha256-oGmUcPmnlqKn4mGVhbnFjM1FJ7H3uUg9Z7MKvt2By2Y="; - }; - }.${stdenv.hostPlatform.system}; + src = + { + "aarch64-darwin" = fetchurl { + url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-aarch64-${finalAttrs.version}.dmg"; + hash = "sha256-DU2QtKjPsHBw8hBb2t7cmYvUQ3UodgcW4Hp9kEyEzBI="; + }; + "x86_64-darwin" = fetchurl { + url = "mirror://sourceforge/cudatext/cudatext-macos-cocoa-amd64-${finalAttrs.version}.dmg"; + hash = "sha256-oGmUcPmnlqKn4mGVhbnFjM1FJ7H3uUg9Z7MKvt2By2Y="; + }; + } + .${stdenv.hostPlatform.system}; sourceRoot = "."; # APFS format is unsupported by undmg - nativeBuildInputs = [ _7zz makeWrapper ]; + nativeBuildInputs = [ + _7zz + makeWrapper + ]; unpackCmd = "7zz x $curSrc"; installPhase = '' @@ -32,9 +44,17 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = with lib; { - inherit (cudatext.meta) description homepage changelog license; + inherit (cudatext.meta) + description + homepage + changelog + license + ; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; maintainers = [ maintainers.sikmir ]; skip.ci = true; }; diff --git a/pkgs/darwin/darktable/bin.nix b/pkgs/darwin/darktable/bin.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchfromgh, undmg, darktable }: +{ + lib, + stdenv, + fetchfromgh, + undmg, + darktable, +}: stdenv.mkDerivation (finalAttrs: { pname = "darktable-bin"; @@ -25,8 +31,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; - darktable.meta // { + meta = + with lib; + darktable.meta + // { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/darwin/finch/default.nix b/pkgs/darwin/finch/default.nix @@ -1,29 +1,43 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchurl }: +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + fetchurl, +}: let arch = lib.head (lib.splitString "-" stdenv.hostPlatform.system); # Check LIMA_URL in Makefile - lima = { - "x86_64-darwin" = fetchurl { - url = "https://deps.runfinch.com/${lib.replaceStrings [ "_" ] [ "-" ] arch}/lima-and-qemu.macos-${arch}.1701821611.tar.gz"; - hash = "sha256-mXBQLptj7hpPWGZXMnxDORVq3Zti/yYyW+Udm/FF9UQ="; - }; - "aarch64-darwin" = fetchurl { - url = "https://deps.runfinch.com/${lib.replaceStrings [ "_" ] [ "-" ] arch}/lima-and-qemu.macos-${arch}.1701821611.tar.gz"; - hash = "sha256-6Ll2CUwGJKUl8vxgdDx4Xm6O2WMYGJxMX6mLHJSvtT8="; - }; - }.${stdenv.hostPlatform.system}; + lima = + { + "x86_64-darwin" = fetchurl { + url = "https://deps.runfinch.com/${ + lib.replaceStrings [ "_" ] [ "-" ] arch + }/lima-and-qemu.macos-${arch}.1701821611.tar.gz"; + hash = "sha256-mXBQLptj7hpPWGZXMnxDORVq3Zti/yYyW+Udm/FF9UQ="; + }; + "aarch64-darwin" = fetchurl { + url = "https://deps.runfinch.com/${ + lib.replaceStrings [ "_" ] [ "-" ] arch + }/lima-and-qemu.macos-${arch}.1701821611.tar.gz"; + hash = "sha256-6Ll2CUwGJKUl8vxgdDx4Xm6O2WMYGJxMX6mLHJSvtT8="; + }; + } + .${stdenv.hostPlatform.system}; # Check FINCH_OS_BASENAME in Makefile - os = { - "x86_64-darwin" = fetchurl { - url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2"; - hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII="; - }; - "aarch64-darwin" = fetchurl { - url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2"; - hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII="; - }; - }.${stdenv.hostPlatform.system}; + os = + { + "x86_64-darwin" = fetchurl { + url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2"; + hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII="; + }; + "aarch64-darwin" = fetchurl { + url = "https://dl.fedoraproject.org/pub/fedora/linux/releases/38/Cloud/${arch}/images/Fedora-Cloud-Base-38-1.6.${arch}.qcow2"; + hash = "sha256-0zRnBAH/PVtBKfzGYs9k9ablaCKK9ZB2zESaSUUxhII="; + }; + } + .${stdenv.hostPlatform.system}; in buildGoModule rec { pname = "finch"; @@ -41,9 +55,7 @@ buildGoModule rec { subPackages = [ "cmd/finch" ]; - ldflags = [ - "-X github.com/runfinch/finch/pkg/version.Version=${version}" - ]; + ldflags = [ "-X github.com/runfinch/finch/pkg/version.Version=${version}" ]; doCheck = false; diff --git a/pkgs/darwin/macpass/default.nix b/pkgs/darwin/macpass/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchfromgh, unzip }: +{ + lib, + stdenv, + fetchfromgh, + unzip, +}: stdenv.mkDerivation (finalAttrs: { pname = "MacPass"; diff --git a/pkgs/darwin/macsvg/default.nix b/pkgs/darwin/macsvg/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchfromgh, unzip, makeWrapper }: +{ + lib, + stdenv, + fetchfromgh, + unzip, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "macsvg"; @@ -14,12 +20,17 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "."; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ + unzip + makeWrapper + ]; installPhase = '' runHook preInstall mkdir -p $out/Applications - mv macSVG_v${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor finalAttrs.version)}/*.app $out/Applications + mv macSVG_v${ + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor finalAttrs.version) + }/*.app $out/Applications makeWrapper $out/{Applications/macSVG.app/Contents/MacOS/macSVG,bin/macsvg} runHook postInstall ''; @@ -30,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; mainProgram = "macsvg"; skip.ci = true; }; diff --git a/pkgs/darwin/marta/default.nix b/pkgs/darwin/marta/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenvNoCC, fetchurl, undmg, makeWrapper }: +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + makeWrapper, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "marta"; @@ -9,7 +15,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-DbNkvLCy6q0CN8b4+8oheM4EaaLAQvH3O5zWVYxEyh8="; }; - nativeBuildInputs = [ undmg makeWrapper ]; + nativeBuildInputs = [ + undmg + makeWrapper + ]; sourceRoot = "."; diff --git a/pkgs/darwin/pinentry-touchid/default.nix b/pkgs/darwin/pinentry-touchid/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, LocalAuthentication }: +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + LocalAuthentication, +}: buildGoModule rec { pname = "pinentry-touchid"; diff --git a/pkgs/darwin/podman-desktop/bin.nix b/pkgs/darwin/podman-desktop/bin.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchfromgh, undmg }: +{ + lib, + stdenv, + fetchfromgh, + undmg, +}: let - arch = { - "aarch64-darwin" = "arm64"; - "x86_64-darwin" = "x64"; - }.${stdenv.hostPlatform.system}; - hash = { - "aarch64-darwin" = "sha256-3+Lib7gWF03UrIKRcyzHw9aX79aebkCQscAPdKAf6z0="; - "x86_64-darwin" = "sha256-miIw5xsL6GSHC+sX3JNxktfwhY5tkLrLCNdHHUwdtdY="; - }.${stdenv.hostPlatform.system}; + arch = + { + "aarch64-darwin" = "arm64"; + "x86_64-darwin" = "x64"; + } + .${stdenv.hostPlatform.system}; + hash = + { + "aarch64-darwin" = "sha256-3+Lib7gWF03UrIKRcyzHw9aX79aebkCQscAPdKAf6z0="; + "x86_64-darwin" = "sha256-miIw5xsL6GSHC+sX3JNxktfwhY5tkLrLCNdHHUwdtdY="; + } + .${stdenv.hostPlatform.system}; in stdenv.mkDerivation (finalAttrs: { pname = "podman-desktop"; @@ -38,7 +47,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://podman-desktop.io/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; maintainers = [ maintainers.sikmir ]; skip.ci = true; }; diff --git a/pkgs/darwin/qtcreator/bin.nix b/pkgs/darwin/qtcreator/bin.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchfromgh, p7zip, makeWrapper, qtcreator }: +{ + lib, + stdenv, + fetchfromgh, + p7zip, + makeWrapper, + qtcreator, +}: stdenv.mkDerivation (finalAttrs: { pname = "qtcreator-bin"; @@ -14,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "."; - nativeBuildInputs = [ p7zip makeWrapper ]; + nativeBuildInputs = [ + p7zip + makeWrapper + ]; installPhase = '' runHook preInstall @@ -24,8 +34,10 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = with lib; - qtcreator.meta // { + meta = + with lib; + qtcreator.meta + // { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/darwin/qutebrowser/bin.nix b/pkgs/darwin/qutebrowser/bin.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchfromgh, undmg, python3Packages, qutebrowser }: +{ + lib, + stdenv, + fetchfromgh, + undmg, + python3Packages, + qutebrowser, +}: stdenv.mkDerivation (finalAttrs: { pname = "qutebrowser-bin"; @@ -14,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "."; - nativeBuildInputs = [ undmg python3Packages.wrapPython ]; + nativeBuildInputs = [ + undmg + python3Packages.wrapPython + ]; installPhase = '' runHook preInstall @@ -36,8 +46,10 @@ stdenv.mkDerivation (finalAttrs: { passthru.userscripts = "${finalAttrs.finalPackage}/Applications/qutebrowser.app/Contents/Resources/userscripts"; - meta = with lib; - qutebrowser.meta // { + meta = + with lib; + qutebrowser.meta + // { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = [ maintainers.sikmir ]; platforms = [ "x86_64-darwin" ]; diff --git a/pkgs/darwin/sequel-ace/default.nix b/pkgs/darwin/sequel-ace/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenvNoCC, fetchfromgh, unzip }: +{ + lib, + stdenvNoCC, + fetchfromgh, + unzip, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "sequel-ace"; diff --git a/pkgs/darwin/zed/default.nix b/pkgs/darwin/zed/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenvNoCC, fetchurl, _7zz }: +{ + lib, + stdenvNoCC, + fetchurl, + _7zz, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "zed"; diff --git a/pkgs/data/dicts/dadako/base.nix b/pkgs/data/dicts/dadako/base.nix @@ -1,4 +1,14 @@ -{ lib, srcOnly, fetchzip, unzip, pname, version, filename, hash, description }: +{ + lib, + srcOnly, + fetchzip, + unzip, + pname, + version, + filename, + hash, + description, +}: srcOnly { inherit pname version; diff --git a/pkgs/data/dicts/freedict/base.nix b/pkgs/data/dicts/freedict/base.nix @@ -1,4 +1,11 @@ -{ lib, stdenvNoCC, fetchurl, lang, version, hash }: +{ + lib, + stdenvNoCC, + fetchurl, + lang, + version, + hash, +}: stdenvNoCC.mkDerivation { pname = "freedict-${lang}"; diff --git a/pkgs/data/dicts/huzheng/base.nix b/pkgs/data/dicts/huzheng/base.nix @@ -1,4 +1,13 @@ -{ lib, srcOnly, fetchwebarchive, pname, version, filename, hash, description }: +{ + lib, + srcOnly, + fetchwebarchive, + pname, + version, + filename, + hash, + description, +}: srcOnly { inherit pname version; diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenvNoCC, fetchFromGitHub, dict, pandoc, stardict-tools }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + dict, + pandoc, + stardict-tools, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "it-sanasto"; @@ -11,7 +18,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-+YLKG4kqflWkRdrER0A7GRYXluZpuf1TO0zyk3gVzU4="; }; - nativeBuildInputs = [ dict pandoc stardict-tools ]; + nativeBuildInputs = [ + dict + pandoc + stardict-tools + ]; buildPhase = '' for i in *.md; do diff --git a/pkgs/data/dicts/komputeko/default.nix b/pkgs/data/dicts/komputeko/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenvNoCC, fetchwebarchive, dict, jq, stardict-tools }: +{ + lib, + stdenvNoCC, + fetchwebarchive, + dict, + jq, + stardict-tools, +}: stdenvNoCC.mkDerivation { pname = "komputeko"; @@ -12,7 +19,11 @@ stdenvNoCC.mkDerivation { dontUnpack = true; - nativeBuildInputs = [ dict jq stardict-tools ]; + nativeBuildInputs = [ + dict + jq + stardict-tools + ]; buildPhase = '' cat $src | \ diff --git a/pkgs/data/dicts/libredict/default.nix b/pkgs/data/dicts/libredict/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: let - dicts = lib.mapAttrs - (name: spec: - fetchurl { - url = "http://libredict.org/dictionaries/${name}/wiktionary_${name}_stardict_${spec.version}.tgz"; - inherit (spec) hash; - } - ) - (lib.importJSON ./dicts.json); + dicts = lib.mapAttrs ( + name: spec: + fetchurl { + url = "http://libredict.org/dictionaries/${name}/wiktionary_${name}_stardict_${spec.version}.tgz"; + inherit (spec) hash; + } + ) (lib.importJSON ./dicts.json); in stdenvNoCC.mkDerivation { pname = "libredict"; diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenvNoCC, fetchurl, dict, jq, moreutils, stardict-tools, tatoebatools }: +{ + lib, + stdenvNoCC, + fetchurl, + dict, + jq, + moreutils, + stardict-tools, + tatoebatools, +}: let langs = [ "bel eng" @@ -40,24 +49,31 @@ stdenvNoCC.mkDerivation rec { srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba; - unpackPhase = '' - echo "{}" > versions.json - '' + lib.concatMapStringsSep "\n" - (src: '' + unpackPhase = + '' + echo "{}" > versions.json + '' + + lib.concatMapStringsSep "\n" (src: '' bzcat ${src} > ${lib.removeSuffix ".bz2" src.name} jq '.+{"${lib.removeSuffix ".tsv.bz2" src.name}":"${version} 00:00:00"}' versions.json | \ sponge versions.json - '') - srcs; + '') srcs; - nativeBuildInputs = [ dict jq moreutils stardict-tools tatoebatools ]; + nativeBuildInputs = [ + dict + jq + moreutils + stardict-tools + tatoebatools + ]; buildPhase = let - makeDict = lang: with lib; '' - parallel_corpus ${lang} > tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab - stardict-tabfile tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab - ''; + makeDict = + lang: with lib; '' + parallel_corpus ${lang} > tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab + stardict-tabfile tatoeba_${replaceStrings [ " " ] [ "_" ] lang}.tab + ''; in '' export XDG_DATA_HOME=$PWD diff --git a/pkgs/data/maps/dem/default.nix b/pkgs/data/maps/dem/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenvNoCC, fetchurl, unzip, gdal, elevation_server }: +{ + lib, + stdenvNoCC, + fetchurl, + unzip, + gdal, + elevation_server, +}: let version = "2014-05-25"; @@ -23,7 +30,10 @@ in unpackPhase = lib.concatMapStringsSep "\n" (src: "unzip ${src}") srcs; - nativeBuildInputs = [ unzip gdal ]; + nativeBuildInputs = [ + unzip + gdal + ]; dontFixup = true; preferLocalBuild = true; @@ -43,7 +53,10 @@ in unpackPhase = lib.concatMapStringsSep "\n" (src: "unzip ${src}") srcs; - nativeBuildInputs = [ unzip elevation_server ]; + nativeBuildInputs = [ + unzip + elevation_server + ]; dontFixup = true; preferLocalBuild = true; diff --git a/pkgs/data/maps/freizeitkarte-osm/default.nix b/pkgs/data/maps/freizeitkarte-osm/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchurl, unzip, country ? "FIN", lang ? "en" }: +{ + lib, + fetchurl, + unzip, + country ? "FIN", + lang ? "en", +}: let pname = "freizeitkarte-osm"; version = "2023-12-09"; diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, hereApiKey ? "" -, mapboxApiKey ? "" -, maptilerApiKey ? "" -, mmlApiKey ? "" -, openrouteserviceApiKey ? "" -, thunderforestApiKey ? "" -, mapsList ? [ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + hereApiKey ? "", + mapboxApiKey ? "", + maptilerApiKey ? "", + mmlApiKey ? "", + openrouteserviceApiKey ? "", + thunderforestApiKey ? "", + mapsList ? [ "World/Asia/nakarte-*.xml" "World/Europe/FI/*.xml" "World/Europe/RU/*.xml" @@ -21,7 +22,7 @@ "World/heidelberg.xml" "World/here-*.xml" "World/marshruty.ru.xml" - ] + ], }: stdenvNoCC.mkDerivation { diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenvNoCC, fetchurl, unzip }: +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: stdenvNoCC.mkDerivation rec { pname = "maptourist"; diff --git a/pkgs/data/maps/meridian/base.nix b/pkgs/data/maps/meridian/base.nix @@ -1,4 +1,12 @@ -{ lib, stdenvNoCC, fetchurl, unrar, pname, version, hash }: +{ + lib, + stdenvNoCC, + fetchurl, + unrar, + pname, + version, + hash, +}: stdenvNoCC.mkDerivation { inherit pname version; diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenvNoCC, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mtk-suomi"; diff --git a/pkgs/data/maps/opentopomap/default.nix b/pkgs/data/maps/opentopomap/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, unzip, mkgmap, mkgmap-splitter, osm-extracts }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + unzip, + mkgmap, + mkgmap-splitter, + osm-extracts, +}: let bounds = fetchurl { url = "https://www.thkukuk.de/osm/data/bounds-20240126.zip"; @@ -22,7 +31,11 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/garmin"; - nativeBuildInputs = [ mkgmap mkgmap-splitter unzip ]; + nativeBuildInputs = [ + mkgmap + mkgmap-splitter + unzip + ]; postPatch = '' unzip ${bounds} -d bounds diff --git a/pkgs/data/maps/qmapshack-onlinemaps/default.nix b/pkgs/data/maps/qmapshack-onlinemaps/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchwebarchive, unzip }: +{ + lib, + fetchwebarchive, + unzip, +}: fetchwebarchive { name = "qmapshack-onlinemaps-2022-09-02"; diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, bc, cgpsmapper, gmaptool, mapsoft2 }: +{ + lib, + stdenv, + fetchFromGitHub, + bc, + cgpsmapper, + gmaptool, + mapsoft2, +}: stdenv.mkDerivation { pname = "slazav-hr"; @@ -11,9 +19,17 @@ stdenv.mkDerivation { sha256 = "0z2782smylf62ank8bpdhnvldqy46xai8ahg87yfyl203zcpp07h"; }; - nativeBuildInputs = [ bc cgpsmapper gmaptool mapsoft2 ]; + nativeBuildInputs = [ + bc + cgpsmapper + gmaptool + mapsoft2 + ]; - buildFlags = [ "directories" "reg_img" ]; + buildFlags = [ + "directories" + "reg_img" + ]; installPhase = "install -Dm644 OUT/all_*.img -t $out"; diff --git a/pkgs/data/maps/slazav/podm-bin.nix b/pkgs/data/maps/slazav/podm-bin.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: fetchurl { name = "slazav-podm-2020-12-03"; diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, bc, cgpsmapper, gmaptool, mapsoft2 }: +{ + lib, + stdenv, + fetchFromGitHub, + bc, + cgpsmapper, + gmaptool, + mapsoft2, +}: stdenv.mkDerivation { pname = "slazav-podm"; @@ -11,9 +19,17 @@ stdenv.mkDerivation { sha256 = "0jsrjzmg23rp3ay5149llqrq6pnr66wf7siphwn7gisz5g60pgpf"; }; - nativeBuildInputs = [ bc cgpsmapper gmaptool mapsoft2 ]; + nativeBuildInputs = [ + bc + cgpsmapper + gmaptool + mapsoft2 + ]; - buildFlags = [ "directories" "reg_img" ]; + buildFlags = [ + "directories" + "reg_img" + ]; installPhase = "install -Dm644 OUT/all_*.img -t $out"; diff --git a/pkgs/data/maps/uralla/base.nix b/pkgs/data/maps/uralla/base.nix @@ -1,4 +1,11 @@ -{ lib, stdenvNoCC, fetchurl, pname, version, sha256 }: +{ + lib, + stdenvNoCC, + fetchurl, + pname, + version, + sha256, +}: stdenvNoCC.mkDerivation { inherit pname version; diff --git a/pkgs/data/maps/vlasenko-maps/default.nix b/pkgs/data/maps/vlasenko-maps/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenvNoCC, fetchgdrive, unzip }: +{ + lib, + stdenvNoCC, + fetchgdrive, + unzip, +}: { hib-lov = stdenvNoCC.mkDerivation rec { diff --git a/pkgs/data/misc/poi/default.nix b/pkgs/data/misc/poi/default.nix @@ -1,4 +1,11 @@ -{ lib, fetchurl, fetchymaps, fetchwebarchive, jq, gdal }: +{ + lib, + fetchurl, + fetchymaps, + fetchwebarchive, + jq, + gdal, +}: { geocachingSu = fetchwebarchive { diff --git a/pkgs/data/osm/osm-extracts/default.nix b/pkgs/data/osm/osm-extracts/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, osmium-tool }: +{ + lib, + stdenv, + fetchurl, + osmium-tool, +}: stdenv.mkDerivation rec { pname = "osm-extracts"; diff --git a/pkgs/data/osm/overpassdb/default.nix b/pkgs/data/osm/overpassdb/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, osmctools, osm-3s, osm-extracts }: +{ + lib, + stdenv, + fetchurl, + osmctools, + osm-3s, + osm-extracts, +}: stdenv.mkDerivation { pname = "overpassdb"; @@ -6,7 +13,10 @@ stdenv.mkDerivation { dontUnpack = true; - nativeBuildInputs = [ osmctools osm-3s ]; + nativeBuildInputs = [ + osmctools + osm-3s + ]; installPhase = '' install -dm755 $out @@ -23,4 +33,3 @@ stdenv.mkDerivation { skip.ci = true; }; } - diff --git a/pkgs/data/osm/routinodb/default.nix b/pkgs/data/osm/routinodb/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, routino, osm-extracts, prefix ? "Russia-NWFD" }: +{ + lib, + stdenv, + fetchurl, + routino, + osm-extracts, + prefix ? "Russia-NWFD", +}: stdenv.mkDerivation { pname = "routinodb"; diff --git a/pkgs/data/themes/goldendict-themes/arc-dark-theme.nix b/pkgs/data/themes/goldendict-themes/arc-dark-theme.nix @@ -5,7 +5,8 @@ url = "https://gist.github.com/ManiaciaChao/ddb14a09a12c95f134003bcd552dced4"; rev = "af58374"; sha256 = "0z3rsi87bf6mlb9syqvsz1jg74i3mxf2cxq43jlfr9zkdmnwgj18"; -}) // { +}) +// { meta = with lib; { description = "GoldenDict Arc Dark Theme"; homepage = "https://gist.github.com/ManiaciaChao/ddb14a09a12c95f134003bcd552dced4"; diff --git a/pkgs/data/themes/goldendict-themes/dark-theme.nix b/pkgs/data/themes/goldendict-themes/dark-theme.nix @@ -5,7 +5,8 @@ url = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453"; rev = "5c616fa"; sha256 = "1rpkfcjp3dhdnrnf68id956hvm8bn655cp8v4if5s753vx5ni012"; -}) // { +}) +// { meta = with lib; { description = "GoldenDict Dark Theme"; homepage = "https://gist.github.com/ilius/5a2f35c79775267fbdb249493c041453"; diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "qtpbfimageplugin-styles"; diff --git a/pkgs/default.nix b/pkgs/default.nix @@ -1,6 +1,12 @@ { pkgs }: let - inherit (pkgs) lib newScope recurseIntoAttrs libsForQt5 darwin; + inherit (pkgs) + lib + newScope + recurseIntoAttrs + libsForQt5 + darwin + ; in lib.makeScope newScope ( self: with self; { @@ -28,9 +34,7 @@ lib.makeScope newScope ( amethyst = callPackage ./darwin/amethyst { }; cudatext-bin = callPackage ./darwin/cudatext/bin.nix { }; darktable-bin = callPackage ./darwin/darktable/bin.nix { }; - finch = callPackage ./darwin/finch { - buildGoModule = pkgs.buildGo122Module; - }; + finch = callPackage ./darwin/finch { buildGoModule = pkgs.buildGo122Module; }; macpass = callPackage ./darwin/macpass { }; macsvg = callPackage ./darwin/macsvg { }; marta = callPackage ./darwin/marta { }; @@ -73,10 +77,8 @@ lib.makeScope newScope ( overpassdb = callPackage ./data/osm/overpassdb { }; routinodb = callPackage ./data/osm/routinodb { }; - goldendict-arc-dark-theme = - callPackage ./data/themes/goldendict-themes/arc-dark-theme.nix { }; - goldendict-dark-theme = - callPackage ./data/themes/goldendict-themes/dark-theme.nix { }; + goldendict-arc-dark-theme = callPackage ./data/themes/goldendict-themes/arc-dark-theme.nix { }; + goldendict-dark-theme = callPackage ./data/themes/goldendict-themes/dark-theme.nix { }; qtpbfimageplugin-styles = callPackage ./data/themes/qtpbfimageplugin-styles { }; ### DEVELOPMENT / LIBRARIES @@ -89,11 +91,8 @@ lib.makeScope newScope ( ### DEVELOPMENT / PERL MODULES - perlPackages = ( - callPackage ./perl-packages.nix { } - ) // pkgs.perlPackages // { - recurseForDerivations = false; - }; + perlPackages = + (callPackage ./perl-packages.nix { }) // pkgs.perlPackages // { recurseForDerivations = false; }; ### DEVELOPMENT / PYTHON MODULES @@ -105,7 +104,8 @@ lib.makeScope newScope ( gpxelevations = callPackage ./development/python-modules/gpxelevations { }; jsonseq = callPackage ./development/python-modules/jsonseq { }; large-image = callPackage ./development/python-modules/large-image { }; - large-image-source-gdal = (callPackage ./development/python-modules/large-image/sources.nix { }).source-gdal; + large-image-source-gdal = + (callPackage ./development/python-modules/large-image/sources.nix { }).source-gdal; modbus_tk = callPackage ./development/python-modules/modbus_tk { python3Packages = pkgs.python310Packages; }; @@ -120,38 +120,36 @@ lib.makeScope newScope ( ### EMBEDDED - chdk = callPackage ./embedded/chdk { - gcc-arm-embedded = pkgs.gcc-arm-embedded-10; - }; + chdk = callPackage ./embedded/chdk { gcc-arm-embedded = pkgs.gcc-arm-embedded-10; }; embox-aarch64 = callPackage ./embedded/embox { arch = "aarch64"; }; embox-arm = callPackage ./embedded/embox { arch = "arm"; }; embox-ppc = callPackage ./embedded/embox { arch = "ppc"; }; embox-riscv64 = callPackage ./embedded/embox { arch = "riscv64"; }; - embox-x86 = callPackage ./embedded/embox { - stdenv = pkgs.gccMultiStdenv; - }; + embox-x86 = callPackage ./embedded/embox { stdenv = pkgs.gccMultiStdenv; }; ### GARMIN basecamp = callPackage ./garmin/basecamp { }; cgpsmapper = callPackage ./garmin/cgpsmapper { }; garmin-uploader = callPackage ./garmin/garmin-uploader { }; - garminimg = libsForQt5.callPackage ./garmin/garminimg { - proj = pkgs.proj_7; - }; + garminimg = libsForQt5.callPackage ./garmin/garminimg { proj = pkgs.proj_7; }; gimgtools = callPackage ./garmin/gimgtools { }; gmaptool = callPackage ./garmin/gmaptool { }; imgdecode = callPackage ./garmin/imgdecode { }; - libgarmin = callPackage ./garmin/libgarmin { - automake = pkgs.automake111x; - }; + libgarmin = callPackage ./garmin/libgarmin { automake = pkgs.automake111x; }; ocad2img = perlPackages.callPackage ./garmin/ocad2img { inherit cgpsmapper ocad2mp fetchwebarchive; }; ocad2mp = callPackage ./garmin/ocad2mp { }; openmtbmap = callPackage ./garmin/openmtbmap { }; osm2mp = perlPackages.callPackage ./garmin/osm2mp { - inherit (perlPackages) GeoOpenstreetmapParser MatchSimple MathPolygon MathPolygonTree TreeR; + inherit (perlPackages) + GeoOpenstreetmapParser + MatchSimple + MathPolygon + MathPolygonTree + TreeR + ; }; sendmap20 = callPackage ./garmin/sendmap20 { }; @@ -160,22 +158,16 @@ lib.makeScope newScope ( agunua = callPackage ./gemini/agunua { }; astronaut = callPackage ./gemini/astronaut { }; comitium = callPackage ./gemini/comitium { }; - eva = callPackage ./gemini/eva { - inherit (darwin.apple_sdk.frameworks) Security; - }; + eva = callPackage ./gemini/eva { inherit (darwin.apple_sdk.frameworks) Security; }; gelim = callPackage ./gemini/gelim { }; gemcert = callPackage ./gemini/gemcert { }; gemgen = callPackage ./gemini/gemgen { }; gemini-ipfs-gateway = callPackage ./gemini/gemini-ipfs-gateway { }; geminid = callPackage ./gemini/geminid { }; gemreader = callPackage ./gemini/gemreader { }; - gemserv = callPackage ./gemini/gemserv { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gemserv = callPackage ./gemini/gemserv { inherit (darwin.apple_sdk.frameworks) Security; }; gloggery = callPackage ./gemini/gloggery { }; - gmi2html = callPackage ./gemini/gmi2html { - zig = pkgs.zig_0_9; - }; + gmi2html = callPackage ./gemini/gmi2html { zig = pkgs.zig_0_9; }; gmnhg = callPackage ./gemini/gmnhg { }; gmnigit = callPackage ./gemini/gmnigit { }; gplaces = callPackage ./gemini/gplaces { }; @@ -201,9 +193,7 @@ lib.makeScope newScope ( color-operations = callPackage ./geospatial/color-operations { }; datamaps = callPackage ./geospatial/datamaps { }; deegree = callPackage ./geospatial/deegree { }; - elevation = callPackage ./geospatial/elevation { - click = click-6-7; - }; + elevation = callPackage ./geospatial/elevation { click = click-6-7; }; garmindev = callPackage ./geospatial/qlandkartegt/garmindev.nix { }; geoarrow-c = callPackage ./geospatial/geoarrow-c { }; geoarrow-pyarrow = callPackage ./geospatial/geoarrow-pyarrow { }; @@ -211,14 +201,10 @@ lib.makeScope newScope ( geowebcache = callPackage ./geospatial/geowebcache { }; go-pmtiles = callPackage ./geospatial/go-pmtiles { }; go-staticmaps = callPackage ./geospatial/go-staticmaps { }; - hecate = callPackage ./geospatial/hecate { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hecate = callPackage ./geospatial/hecate { inherit (darwin.apple_sdk.frameworks) Security; }; kealib = callPackage ./geospatial/kealib { }; localtileserver = callPackage ./geospatial/localtileserver { }; - mapsoft = callPackage ./geospatial/mapsoft { - proj = pkgs.proj_7; - }; + mapsoft = callPackage ./geospatial/mapsoft { proj = pkgs.proj_7; }; mapsoft2 = callPackage ./geospatial/mapsoft/2.nix { }; mbtiles2osmand = callPackage ./geospatial/mbtiles2osmand { }; mbutiles = callPackage ./geospatial/mbutiles { }; @@ -242,9 +228,7 @@ lib.makeScope newScope ( proj = pkgs.proj_7; inherit garmindev; }; - render_geojson = callPackage ./geospatial/render_geojson { - wxGTK = pkgs.wxGTK32; - }; + render_geojson = callPackage ./geospatial/render_geojson { wxGTK = pkgs.wxGTK32; }; rio-cogeo = callPackage ./geospatial/rio-cogeo { }; rio-color = callPackage ./geospatial/rio-color { }; rio-mbtiles = callPackage ./geospatial/rio-mbtiles { }; @@ -334,9 +318,7 @@ lib.makeScope newScope ( revtok = callPackage ./linguistics/revtok { }; stardict-tools = callPackage ./linguistics/stardict-tools { }; tatoebatools = callPackage ./linguistics/tatoebatools { }; - ttb = callPackage ./linguistics/ttb { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - }; + ttb = callPackage ./linguistics/ttb { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; wikitextprocessor = callPackage ./linguistics/wikitextprocessor { }; wiktextract = callPackage ./linguistics/wiktextract { }; wiktfinnish = callPackage ./linguistics/wiktfinnish { }; @@ -383,12 +365,8 @@ lib.makeScope newScope ( miband4 = callPackage ./misc/miband4 { }; mitzasql = callPackage ./misc/mitzasql { }; mjs = callPackage ./misc/mjs { }; - modbus-tools = callPackage ./misc/modbus-tools { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; - modbus_sim_cli = callPackage ./misc/modbus_sim_cli { - python3Packages = pkgs.python310Packages; - }; + modbus-tools = callPackage ./misc/modbus-tools { inherit (darwin.apple_sdk.frameworks) IOKit; }; + modbus_sim_cli = callPackage ./misc/modbus_sim_cli { python3Packages = pkgs.python310Packages; }; morse-talk = callPackage ./misc/morse-talk { }; musig = callPackage ./misc/musig { }; mysql-to-sqlite3 = callPackage ./misc/mysql-to-sqlite3 { }; @@ -429,9 +407,7 @@ lib.makeScope newScope ( #worm = callPackage ./misc/worm { }; wptools = callPackage ./misc/wptools { }; xfractint = callPackage ./misc/xfractint { }; - xtr = callPackage ./misc/xtr { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + xtr = callPackage ./misc/xtr { inherit (darwin.apple_sdk.frameworks) Foundation; }; youtimetrack = callPackage ./misc/youtimetrack { }; ### MQTT @@ -454,26 +430,16 @@ lib.makeScope newScope ( mqtt-to-influxdb = callPackage ./mqtt/mqtt-to-influxdb { }; mqtt-to-influxdb-forwarder = callPackage ./mqtt/mqtt-to-influxdb-forwarder { }; nanosdk = callPackage ./mqtt/nanosdk { }; - rumqtt = callPackage ./mqtt/rumqtt { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rumqtt = callPackage ./mqtt/rumqtt { inherit (darwin.apple_sdk.frameworks) Security; }; ### NAKARTE elevation_server = callPackage ./nakarte/elevation_server { }; - map-tiler = callPackage ./nakarte/map-tiler { - python3Packages = pkgs.python39Packages; - }; - maprec = callPackage ./nakarte/maprec { - python3Packages = pkgs.python39Packages; - }; + map-tiler = callPackage ./nakarte/map-tiler { python3Packages = pkgs.python39Packages; }; + maprec = callPackage ./nakarte/maprec { python3Packages = pkgs.python39Packages; }; #nakarte = callPackage ./nakarte/nakarte { }; - ozi_map = callPackage ./nakarte/ozi_map { - python3Packages = pkgs.python39Packages; - }; - pyimagequant = callPackage ./nakarte/pyimagequant { - python3Packages = pkgs.python39Packages; - }; + ozi_map = callPackage ./nakarte/ozi_map { python3Packages = pkgs.python39Packages; }; + pyimagequant = callPackage ./nakarte/pyimagequant { python3Packages = pkgs.python39Packages; }; thinplatespline = callPackage ./nakarte/thinplatespline { python3Packages = pkgs.python39Packages; }; @@ -507,9 +473,7 @@ lib.makeScope newScope ( pyrosm = callPackage ./osm/pyrosm { }; sdlmap = callPackage ./osm/sdlmap { }; smopy = callPackage ./osm/smopy { }; - smrender = callPackage ./osm/smrender { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + smrender = callPackage ./osm/smrender { inherit (darwin.apple_sdk.frameworks) Foundation; }; taginfo-tools = callPackage ./osm/taginfo-tools { }; tilelog = callPackage ./osm/tilelog { }; tirex = callPackage ./osm/tirex { }; diff --git a/pkgs/development/libraries/iso15765-canbus/default.nix b/pkgs/development/libraries/iso15765-canbus/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "iso15765-canbus"; @@ -11,7 +15,10 @@ stdenv.mkDerivation rec { hash = "sha256-KdVw8JhJsqa+n3ELnTojHV/37Wfb1A2a7fSbBsTkJgI="; }; - makeFlags = [ "CC:=$(CC)" "CXX:=$(CXX)" ]; + makeFlags = [ + "CC:=$(CC)" + "CXX:=$(CXX)" + ]; installPhase = '' install -Dm644 lib/lib_iqueue.h src/lib_iso15765.h -t $out/include diff --git a/pkgs/development/libraries/libgnunetchat/default.nix b/pkgs/development/libraries/libgnunetchat/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchurl -, cmake -, meson -, ninja -, pkg-config -, gnunet -, libextractor -, libgcrypt -, libsodium +{ + lib, + stdenv, + fetchurl, + cmake, + meson, + ninja, + pkg-config, + gnunet, + libextractor, + libgcrypt, + libsodium, }: stdenv.mkDerivation rec { @@ -28,9 +29,19 @@ stdenv.mkDerivation rec { --replace-fail "GNUNET_CHAT_VERSION_ASSERT();" "" ''; - nativeBuildInputs = [ meson cmake ninja pkg-config ]; + nativeBuildInputs = [ + meson + cmake + ninja + pkg-config + ]; - buildInputs = [ gnunet libextractor libgcrypt libsodium ]; + buildInputs = [ + gnunet + libextractor + libgcrypt + libsodium + ]; doCheck = false; diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, bash -, dash -, help2man -, ncurses -, withDoc ? false -, scdoc +{ + lib, + stdenv, + fetchFromGitHub, + bash, + dash, + help2man, + ncurses, + withDoc ? false, + scdoc, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/development/libraries/libsockcanpp/default.nix b/pkgs/development/libraries/libsockcanpp/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation (finalAttrs: { pname = "libsockcanpp"; diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gtest }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, +}: stdenv.mkDerivation (finalAttrs: { pname = "microjson"; @@ -18,12 +24,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "find_package(microjson CONFIG REQUIRED)" "" ''; - nativeBuildInputs = [ cmake gtest ]; - - cmakeFlags = [ - (lib.cmakeBool "MICROJSON_MAKE_TESTS" true) + nativeBuildInputs = [ + cmake + gtest ]; + cmakeFlags = [ (lib.cmakeBool "MICROJSON_MAKE_TESTS" true) ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix @@ -1,4 +1,9 @@ -{ lib, python3Packages, substituteAll, locale }: +{ + lib, + python3Packages, + substituteAll, + locale, +}: python3Packages.buildPythonPackage rec { pname = "click"; @@ -9,12 +14,10 @@ python3Packages.buildPythonPackage rec { hash = "sha256-8VUW30eNWlYYD7+A5o8gYBDm0WD8OfpQi2XgNf11Ews="; }; - patches = lib.optional (lib.versionAtLeast version "6.7") ( - substituteAll { - src = ./fix-paths.patch; - locale = "${locale}/bin/locale"; - } - ); + patches = lib.optional (lib.versionAtLeast version "6.7") (substituteAll { + src = ./fix-paths.patch; + locale = "${locale}/bin/locale"; + }); nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/contextily/default.nix b/pkgs/development/python-modules/contextily/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "contextily"; diff --git a/pkgs/development/python-modules/curses-menu/default.nix b/pkgs/development/python-modules/curses-menu/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "curses-menu"; @@ -14,9 +18,16 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3Packages; [ deprecated pexpect pyte ]; + propagatedBuildInputs = with python3Packages; [ + deprecated + pexpect + pyte + ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-cov + ]; doCheck = false; diff --git a/pkgs/development/python-modules/earthpy/default.nix b/pkgs/development/python-modules/earthpy/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "earthpy"; diff --git a/pkgs/development/python-modules/geotiler/default.nix b/pkgs/development/python-modules/geotiler/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "geotiler"; @@ -12,9 +16,18 @@ python3Packages.buildPythonPackage rec { hash = "sha256-xqAsjuUMODZvkSMyGXpP1/FTyqNKPfa8l4Zr2CUHaDY="; }; - propagatedBuildInputs = with python3Packages; [ aiohttp cytoolz numpy pillow setuptools ]; + propagatedBuildInputs = with python3Packages; [ + aiohttp + cytoolz + numpy + pillow + setuptools + ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-cov + ]; postInstall = '' cp -r geotiler/source $out/lib/${python3Packages.python.libPrefix}/site-packages/geotiler diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix @@ -1,4 +1,9 @@ -{ lib, python3Packages, fetchFromGitHub, fetchurl }: +{ + lib, + python3Packages, + fetchFromGitHub, + fetchurl, +}: let testdata = import ./testdata.nix { inherit fetchurl; }; in @@ -13,7 +18,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/AGvFE74sJTnn70VklQp0MG+7dsooavAdSTyV2oJM+I="; }; - propagatedBuildInputs = with python3Packages; [ requests gpxpy ]; + propagatedBuildInputs = with python3Packages; [ + requests + gpxpy + ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/python-modules/gpxelevations/testdata.nix b/pkgs/development/python-modules/gpxelevations/testdata.nix @@ -1,9 +1,11 @@ { fetchurl }: let - fetchSrtm = { file, hash }: fetchurl { - inherit hash; - url = "https://srtm.kurviger.de/SRTM3/${file}"; - }; + fetchSrtm = + { file, hash }: + fetchurl { + inherit hash; + url = "https://srtm.kurviger.de/SRTM3/${file}"; + }; in [ (fetchSrtm { diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "jsonseq"; diff --git a/pkgs/development/python-modules/large-image/default.nix b/pkgs/development/python-modules/large-image/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "large-image"; @@ -15,7 +19,13 @@ python3Packages.buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ cachetools palettable pillow psutil numpy ]; + propagatedBuildInputs = with python3Packages; [ + cachetools + palettable + pillow + psutil + numpy + ]; doCheck = false; diff --git a/pkgs/development/python-modules/large-image/sources.nix b/pkgs/development/python-modules/large-image/sources.nix @@ -1,14 +1,28 @@ -{ lib, python3Packages, large-image, gdal }: +{ + lib, + python3Packages, + large-image, + gdal, +}: { source-gdal = python3Packages.buildPythonPackage rec { pname = "large-image-source-gdal"; - inherit (large-image) version src nativeBuildInputs meta; + inherit (large-image) + version + src + nativeBuildInputs + meta + ; sourceRoot = "${src.name}/sources/gdal"; SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ gdal pyproj large-image ]; + propagatedBuildInputs = with python3Packages; [ + gdal + pyproj + large-image + ]; doCheck = false; }; diff --git a/pkgs/development/python-modules/modbus_tk/default.nix b/pkgs/development/python-modules/modbus_tk/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "modbus_tk"; diff --git a/pkgs/development/python-modules/portolan/default.nix b/pkgs/development/python-modules/portolan/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "portolan"; diff --git a/pkgs/development/python-modules/pyarrow_ops/default.nix b/pkgs/development/python-modules/pyarrow_ops/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "pyarrow_ops"; @@ -16,7 +21,10 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ cython ]; - propagatedBuildInputs = with python3Packages; [ numpy pyarrow ]; + propagatedBuildInputs = with python3Packages; [ + numpy + pyarrow + ]; meta = with lib; { description = "Convenient pyarrow operations following the Pandas API"; diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pymbtiles"; diff --git a/pkgs/development/python-modules/pytest-mp/default.nix b/pkgs/development/python-modules/pytest-mp/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pytest-mp"; @@ -20,7 +24,10 @@ python3Packages.buildPythonPackage rec { nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - propagatedBuildInputs = with python3Packages; [ pytest psutil ]; + propagatedBuildInputs = with python3Packages; [ + pytest + psutil + ]; doCheck = false; diff --git a/pkgs/development/python-modules/pytest-shell-utilities/default.nix b/pkgs/development/python-modules/pytest-shell-utilities/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, pytest-skip-markers }: +{ + lib, + fetchFromGitHub, + python3Packages, + pytest-skip-markers, +}: python3Packages.buildPythonPackage rec { pname = "pytest-shell-utilities"; @@ -15,9 +20,17 @@ python3Packages.buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = with python3Packages; [ setuptools-scm setuptools-declarative-requirements ]; + nativeBuildInputs = with python3Packages; [ + setuptools-scm + setuptools-declarative-requirements + ]; - propagatedBuildInputs = with python3Packages; [ psutil pytest-skip-markers pytest-subtests pytest-helpers-namespace ]; + propagatedBuildInputs = with python3Packages; [ + psutil + pytest-skip-markers + pytest-subtests + pytest-helpers-namespace + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-skip-markers/default.nix b/pkgs/development/python-modules/pytest-skip-markers/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pytest-skip-markers"; @@ -15,9 +19,16 @@ python3Packages.buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = with python3Packages; [ setuptools-scm setuptools-declarative-requirements ]; + nativeBuildInputs = with python3Packages; [ + setuptools-scm + setuptools-declarative-requirements + ]; - propagatedBuildInputs = with python3Packages; [ attrs distro pytest ]; + propagatedBuildInputs = with python3Packages; [ + attrs + distro + pytest + ]; doCheck = false; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "python-periphery"; diff --git a/pkgs/development/python-modules/s2sphere/default.nix b/pkgs/development/python-modules/s2sphere/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "s2sphere"; diff --git a/pkgs/embedded/chdk/default.nix b/pkgs/embedded/chdk/default.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchzip -, gcc-arm-embedded -, zip -, platform ? null -, platformsub ? null -, fi2key ? null -, fi2iv ? null +{ + lib, + stdenv, + fetchzip, + gcc-arm-embedded, + zip, + platform ? null, + platformsub ? null, + fi2key ? null, + fi2iv ? null, }: let @@ -27,11 +28,26 @@ stdenv.mkDerivation { hash = "sha256-VNkPju3nVxk1g5SzRZok5994JVupySbO7KZsD6sgXo8="; }; - nativeBuildInputs = [ gcc-arm-embedded zip ]; + nativeBuildInputs = [ + gcc-arm-embedded + zip + ]; - buildFlags = [ "DEF_SVN_REF=${revision}" "HOSTCC=${stdenv.cc.targetPrefix}cc" ] - ++ lib.optionals (optFI2 && !batchBuild) [ "OPT_FI2=1" "FI2KEY=${fi2key}" "FI2IV=${fi2iv}" ] - ++ lib.optionals (!batchBuild) [ "PLATFORM=${platform}" "PLATFORMSUB=${platformsub}" "firzipsubcomplete" ] + buildFlags = + [ + "DEF_SVN_REF=${revision}" + "HOSTCC=${stdenv.cc.targetPrefix}cc" + ] + ++ lib.optionals (optFI2 && !batchBuild) [ + "OPT_FI2=1" + "FI2KEY=${fi2key}" + "FI2IV=${fi2iv}" + ] + ++ lib.optionals (!batchBuild) [ + "PLATFORM=${platform}" + "PLATFORMSUB=${platformsub}" + "firzipsubcomplete" + ] ++ lib.optional batchBuild "batch-zip-complete"; env.NIX_CFLAGS_COMPILE = "-Wno-format-security"; diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix @@ -1,24 +1,31 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, makeWrapper -, pkgsCross -, cpio -, gcc-arm-embedded -, python3 -, qemu -, unzip -, which -, arch ? "x86" +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + makeWrapper, + pkgsCross, + cpio, + gcc-arm-embedded, + python3, + qemu, + unzip, + which, + arch ? "x86", }: -assert lib.assertOneOf "arch" arch [ "aarch64" "arm" "ppc" "riscv64" "x86" ]; +assert lib.assertOneOf "arch" arch [ + "aarch64" + "arm" + "ppc" + "riscv64" + "x86" +]; let - third-party = lib.mapAttrs - (name: spec: fetchurl spec) - (builtins.fromJSON (builtins.readFile ./third-party.json)); + third-party = lib.mapAttrs (name: spec: fetchurl spec) ( + builtins.fromJSON (builtins.readFile ./third-party.json) + ); in stdenv.mkDerivation (finalAttrs: { pname = "embox-${arch}-qemu"; @@ -42,14 +49,16 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "riscv64-unknown-elf" "riscv64-none-elf" ''; - nativeBuildInputs = [ - cpio - python3 - unzip - which - makeWrapper - ] ++ lib.optional (arch != "x86" && arch != "arm") pkgsCross."${arch}-embedded".stdenv.cc - ++ lib.optional (arch == "arm") gcc-arm-embedded; + nativeBuildInputs = + [ + cpio + python3 + unzip + which + makeWrapper + ] + ++ lib.optional (arch != "x86" && arch != "arm") pkgsCross."${arch}-embedded".stdenv.cc + ++ lib.optional (arch == "arm") gcc-arm-embedded; configurePhase = "make confload-${arch}/qemu"; @@ -62,13 +71,15 @@ stdenv.mkDerivation (finalAttrs: { installPhase = let - platform_args = { - aarch64 = "-M virt -cpu cortex-a53 -m 1024"; - arm = "-M integratorcp -m 256"; - ppc = "-M virtex-ml507 -m 64"; - riscv64 = "-M virt -m 512"; - x86 = "-enable-kvm -device pci-ohci,id=ohci -m 256"; - }.${arch}; + platform_args = + { + aarch64 = "-M virt -cpu cortex-a53 -m 1024"; + arm = "-M integratorcp -m 256"; + ppc = "-M virtex-ml507 -m 64"; + riscv64 = "-M virt -m 512"; + x86 = "-enable-kvm -device pci-ohci,id=ohci -m 256"; + } + .${arch}; net_args = { aarch64 = "model=e1000"; arm = "model=smc91c111"; @@ -88,7 +99,8 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 build/base/bin/embox $out/share/embox/images/embox.img install -Dm644 conf/*.conf* -t $out/share/embox/conf - '' + lib.optionalString withNetwork '' + '' + + lib.optionalString withNetwork '' install -Dm755 scripts/qemu/{start,stop}_script -t $out/share/embox/scripts ''; diff --git a/pkgs/garmin/basecamp/default.nix b/pkgs/garmin/basecamp/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, undmg, xar, cpio }: +{ + lib, + stdenv, + fetchurl, + undmg, + xar, + cpio, +}: stdenv.mkDerivation rec { pname = "basecamp"; version = "4.8.11"; src = fetchurl { - url = "https://download.garmin.com/software/BaseCampforMac_${lib.replaceStrings [ "." ] [ "" ] version}.dmg"; + url = "https://download.garmin.com/software/BaseCampforMac_${ + lib.replaceStrings [ "." ] [ "" ] version + }.dmg"; sha256 = "1ql049xxb7021qssn55hj8f49bzhriia0yvcv5xs3vrya7ymmhgn"; }; preferLocalBuild = true; - nativeBuildInputs = [ undmg xar cpio ]; + nativeBuildInputs = [ + undmg + xar + cpio + ]; sourceRoot = "."; diff --git a/pkgs/garmin/cgpsmapper/default.nix b/pkgs/garmin/cgpsmapper/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchwebarchive }: +{ + lib, + stdenv, + fetchwebarchive, +}: stdenv.mkDerivation { pname = "cgpsmapper"; @@ -25,7 +29,10 @@ stdenv.mkDerivation { homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com"; license = licenses.free; maintainers = [ maintainers.sikmir ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; mainProgram = "cgpsmapper-static"; skip.ci = true; }; diff --git a/pkgs/garmin/garmin-uploader/default.nix b/pkgs/garmin/garmin-uploader/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "garmin-uploader"; @@ -11,7 +15,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OHY4f+0jfxKXiwRJRdSarlb2H+lEt2EVoAAsD4aEc9o="; }; - propagatedBuildInputs = with python3Packages; [ requests six ]; + propagatedBuildInputs = with python3Packages; [ + requests + six + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gdal, proj, wrapQtAppsHook }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gdal, + proj, + wrapQtAppsHook, +}: stdenv.mkDerivation rec { pname = "garminimg"; @@ -20,9 +28,15 @@ stdenv.mkDerivation rec { --replace-fail "PROJ4_" "PROJ_" ''; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; - buildInputs = [ gdal proj ]; + buildInputs = [ + gdal + proj + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, libiconv }: +{ + lib, + stdenv, + fetchFromGitHub, + libiconv, +}: stdenv.mkDerivation (finalAttrs: { pname = "gimgtools"; diff --git a/pkgs/garmin/gmaptool/default.nix b/pkgs/garmin/gmaptool/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchzip }: +{ + lib, + stdenv, + fetchzip, +}: let version = "0.8.220"; filename = "lgmt${lib.replaceStrings [ "." ] [ "" ] version}.zip"; @@ -22,7 +26,10 @@ stdenv.mkDerivation { homepage = "https://www.gmaptool.eu"; license = licenses.cc-by-sa-30; maintainers = [ maintainers.sikmir ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; mainProgram = "gmt"; skip.ci = true; }; diff --git a/pkgs/garmin/imgdecode/default.nix b/pkgs/garmin/imgdecode/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: stdenv.mkDerivation (finalAttrs: { pname = "imgdecode"; diff --git a/pkgs/garmin/libgarmin/default.nix b/pkgs/garmin/libgarmin/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchsvn, autoconf, automake, libtool }: +{ + lib, + stdenv, + fetchsvn, + autoconf, + automake, + libtool, +}: stdenv.mkDerivation { pname = "libgarmin"; @@ -10,7 +17,11 @@ stdenv.mkDerivation { sha256 = "sha256-aFXD+HnEZBsg2kcc8m8v95poz87DrwgZl4diHSeQZ78="; }; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ + autoconf + automake + libtool + ]; preConfigure = '' aclocal \ diff --git a/pkgs/garmin/ocad2img/default.nix b/pkgs/garmin/ocad2img/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, buildPerlPackage, fetchwebarchive, unzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }: +{ + lib, + stdenv, + buildPerlPackage, + fetchwebarchive, + unzip, + dos2unix, + cgpsmapper, + ocad2mp, + ModulePluggable, + Tk, +}: buildPerlPackage { pname = "ocad2img"; @@ -14,9 +25,15 @@ buildPerlPackage { outputs = [ "out" ]; - nativeBuildInputs = [ unzip dos2unix ]; + nativeBuildInputs = [ + unzip + dos2unix + ]; - propagatedBuildInputs = [ ModulePluggable Tk ]; + propagatedBuildInputs = [ + ModulePluggable + Tk + ]; postPatch = '' substituteInPlace ocad2img.pl \ diff --git a/pkgs/garmin/ocad2mp/default.nix b/pkgs/garmin/ocad2mp/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchsvn }: +{ + lib, + stdenv, + fetchsvn, +}: stdenv.mkDerivation { pname = "ocad2mp"; diff --git a/pkgs/garmin/openmtbmap/default.nix b/pkgs/garmin/openmtbmap/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, gmaptool, mkgmap, p7zip, zsh, substituteAll }: +{ + lib, + stdenv, + fetchFromGitHub, + gmaptool, + mkgmap, + p7zip, + zsh, + substituteAll, +}: stdenv.mkDerivation (finalAttrs: { pname = "openmtbmap"; @@ -11,10 +20,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-J09SYLk869pQYeoGfuY9PFIOU+/W9w22kKwAkVpvkNI="; }; - patches = (substituteAll { - src = ./0001-fix-path.patch; - inherit gmaptool mkgmap p7zip; - }); + patches = ( + substituteAll { + src = ./0001-fix-path.patch; + inherit gmaptool mkgmap p7zip; + } + ); buildInputs = [ zsh ]; diff --git a/pkgs/garmin/osm2mp/default.nix b/pkgs/garmin/osm2mp/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, buildPerlPackage -, shortenPerlShebang -, fetchFromGitHub -, ConfigStd -, EncodeLocale -, FileSlurp -, GeoOpenstreetmapParser -, JSON -, ListMoreUtils -, LWPProtocolHttps -, MatchSimple -, MathPolygon -, MathPolygonTree -, TemplateToolkit -, TextUnidecode -, TreeR -, YAML +{ + lib, + stdenv, + buildPerlPackage, + shortenPerlShebang, + fetchFromGitHub, + ConfigStd, + EncodeLocale, + FileSlurp, + GeoOpenstreetmapParser, + JSON, + ListMoreUtils, + LWPProtocolHttps, + MatchSimple, + MathPolygon, + MathPolygonTree, + TemplateToolkit, + TextUnidecode, + TreeR, + YAML, }: buildPerlPackage rec { @@ -58,17 +59,20 @@ buildPerlPackage rec { preConfigure = "touch Makefile.PL"; - installPhase = '' - install -Dm755 osm2mp.pl $out/bin/osm2mp - install -dm755 $out/share/osm2mp/cfg - cp -r cfg/* $out/share/osm2mp/cfg - install -dm755 $out/lib/perl5/site_perl - cp -r lib/* $out/lib/perl5/site_perl - '' + lib.optionalString stdenv.isLinux '' - patchShebangs $out/bin/osm2mp - '' + lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/osm2mp - ''; + installPhase = + '' + install -Dm755 osm2mp.pl $out/bin/osm2mp + install -dm755 $out/share/osm2mp/cfg + cp -r cfg/* $out/share/osm2mp/cfg + install -dm755 $out/lib/perl5/site_perl + cp -r lib/* $out/lib/perl5/site_perl + '' + + lib.optionalString stdenv.isLinux '' + patchShebangs $out/bin/osm2mp + '' + + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/osm2mp + ''; meta = with lib; { description = "Convert Openstreetmap data to MP format"; diff --git a/pkgs/garmin/sendmap20/default.nix b/pkgs/garmin/sendmap20/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchwebarchive }: +{ + lib, + stdenv, + fetchwebarchive, +}: stdenv.mkDerivation { pname = "sendmap20"; @@ -25,7 +29,10 @@ stdenv.mkDerivation { homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com"; license = licenses.free; maintainers = [ maintainers.sikmir ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ + "i686-linux" + "x86_64-linux" + ]; skip.ci = true; }; } diff --git a/pkgs/gemini/agunua/default.nix b/pkgs/gemini/agunua/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitLab, python3Packages }: +{ + lib, + fetchFromGitLab, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "agunua"; diff --git a/pkgs/gemini/astronaut/default.nix b/pkgs/gemini/astronaut/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }: +{ + lib, + stdenv, + buildGoModule, + fetchFromSourcehut, + scdoc, + installShellFiles, +}: buildGoModule rec { pname = "astronaut"; @@ -11,7 +18,10 @@ buildGoModule rec { hash = "sha256-YkaeJMabEHGcyYeEyiYXR2K8YKX7Qqo5mb1XzvKT2+U="; }; - nativeBuildInputs = [ scdoc installShellFiles ]; + nativeBuildInputs = [ + scdoc + installShellFiles + ]; vendorHash = "sha256-4obhPl3Yvlrsf+C0vFpS/EOPEK7Kwm3GgbZ/ociihD8="; diff --git a/pkgs/gemini/comitium/default.nix b/pkgs/gemini/comitium/default.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchgit, scdoc }: +{ + lib, + buildGoModule, + fetchgit, + scdoc, +}: buildGoModule rec { pname = "comitium"; diff --git a/pkgs/gemini/eva/default.nix b/pkgs/gemini/eva/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitea, pkg-config, gtk4, openssl, wrapGAppsHook, Security }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitea, + pkg-config, + gtk4, + openssl, + wrapGAppsHook, + Security, +}: rustPlatform.buildRustPackage rec { pname = "eva"; @@ -15,9 +25,15 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; cargoHash = "sha256-BFRowucvjYzCF7au4O/Q/lSpgaNUpNDx3OhnbwwfF24="; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + ]; - buildInputs = [ gtk4 openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + gtk4 + openssl + ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { description = "Gemini protocol browser written in Rust using the gtk+ toolkit"; diff --git a/pkgs/gemini/gelim/default.nix b/pkgs/gemini/gelim/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }: +{ + lib, + stdenv, + buildGoModule, + fetchFromSourcehut, + scdoc, + installShellFiles, +}: buildGoModule rec { pname = "gelim"; @@ -11,7 +18,10 @@ buildGoModule rec { hash = "sha256-xFOiE0OLaJ4WK+I8oNXNk7feP3nXp9wvH0bkNnBK1Yg="; }; - nativeBuildInputs = [ scdoc installShellFiles ]; + nativeBuildInputs = [ + scdoc + installShellFiles + ]; vendorHash = "sha256-sWNPNZYcm296zhz57/NCaAlQxJ+Z1zzd/Y+KiLxZ46E="; diff --git a/pkgs/gemini/gemcert/default.nix b/pkgs/gemini/gemcert/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitea }: +{ + lib, + buildGoPackage, + fetchFromGitea, +}: buildGoPackage { pname = "gemcert"; diff --git a/pkgs/gemini/gemgen/default.nix b/pkgs/gemini/gemgen/default.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromSourcehut, scdoc }: +{ + lib, + buildGoModule, + fetchFromSourcehut, + scdoc, +}: buildGoModule rec { pname = "gemgen"; diff --git a/pkgs/gemini/gemini-ipfs-gateway/default.nix b/pkgs/gemini/gemini-ipfs-gateway/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromSourcehut, scdoc }: +{ + lib, + stdenv, + buildGoModule, + fetchFromSourcehut, + scdoc, +}: buildGoModule rec { pname = "gemini-ipfs-gateway"; diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, libconfig, file, openssl, flex }: +{ + lib, + stdenv, + fetchFromGitHub, + libconfig, + file, + openssl, + flex, +}: stdenv.mkDerivation (finalAttrs: { pname = "geminid"; @@ -13,9 +21,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ flex ]; - buildInputs = [ libconfig file openssl.dev ]; + buildInputs = [ + libconfig + file + openssl.dev + ]; - makeFlags = [ "geminid" "CC:=$(CC)" "LEX=flex" ]; + makeFlags = [ + "geminid" + "CC:=$(CC)" + "LEX=flex" + ]; installPhase = "install -Dm755 geminid -t $out/bin"; diff --git a/pkgs/gemini/gemreader/default.nix b/pkgs/gemini/gemreader/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "gemreader"; diff --git a/pkgs/gemini/gemserv/default.nix b/pkgs/gemini/gemserv/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, rustPlatform, fetchFromSourcehut, pkg-config, openssl, Security }: +{ + lib, + stdenv, + rustPlatform, + fetchFromSourcehut, + pkg-config, + openssl, + Security, +}: rustPlatform.buildRustPackage rec { pname = "gemserv"; diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, go }: +{ + lib, + stdenv, + fetchFromGitHub, + go, +}: stdenv.mkDerivation (finalAttrs: { pname = "gloggery"; @@ -13,7 +18,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ go ]; - makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" "HOME=$(out)" ]; + makeFlags = [ + "GOCACHE=$(TMPDIR)/go-cache" + "HOME=$(out)" + ]; preInstall = "install -dm755 $out/{bin,share}"; diff --git a/pkgs/gemini/gmi2html/default.nix b/pkgs/gemini/gmi2html/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, zig, scdoc, installShellFiles }: +{ + lib, + stdenv, + fetchFromGitHub, + zig, + scdoc, + installShellFiles, +}: stdenv.mkDerivation (finalAttrs: { pname = "gmi2html"; @@ -11,7 +18,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5m3erToDFkYOV1xoM+BLWbUOgP0A7TXthzQ0Sk1Qj+U="; }; - nativeBuildInputs = [ zig scdoc installShellFiles ]; + nativeBuildInputs = [ + zig + scdoc + installShellFiles + ]; buildPhase = '' export HOME=$TMPDIR diff --git a/pkgs/gemini/gmnhg/default.nix b/pkgs/gemini/gmnhg/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "gmnhg"; diff --git a/pkgs/gemini/gmnigit/default.nix b/pkgs/gemini/gmnigit/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "gmnigit"; diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, curl, openssl, memstreamHook }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + curl, + openssl, + memstreamHook, +}: stdenv.mkDerivation (finalAttrs: { pname = "gplaces"; @@ -14,7 +22,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl openssl ] ++ lib.optional stdenv.isDarwin memstreamHook; + buildInputs = [ + curl + openssl + ] ++ lib.optional stdenv.isDarwin memstreamHook; makeFlags = [ "VERSION=${finalAttrs.version}" ]; diff --git a/pkgs/gemini/gssg/default.nix b/pkgs/gemini/gssg/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "gssg"; diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, zig }: +{ + lib, + stdenv, + fetchFromGitHub, + zig, +}: stdenv.mkDerivation (finalAttrs: { pname = "gurl"; diff --git a/pkgs/gemini/kineto/default.nix b/pkgs/gemini/kineto/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "kineto"; diff --git a/pkgs/gemini/mdtohtml/default.nix b/pkgs/gemini/mdtohtml/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromSourcehut, + scdoc, + installShellFiles, +}: buildGoModule rec { pname = "mdtohtml"; @@ -11,7 +17,10 @@ buildGoModule rec { hash = "sha256-qvd4Iz+1uNT1Y/DkHGRYBVCLeIpleQ58Ua4eSYv+ilQ="; }; - nativeBuildInputs = [ scdoc installShellFiles ]; + nativeBuildInputs = [ + scdoc + installShellFiles + ]; vendorHash = "sha256-b+xQpGSN6F79qTDqVpyEsEQGNgcR1/l7pzwIxqgTcic="; diff --git a/pkgs/gemini/py-gmi2html/default.nix b/pkgs/gemini/py-gmi2html/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitea, python3Packages }: +{ + lib, + fetchFromGitea, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "gmi2html"; diff --git a/pkgs/gemini/qute-gemini/default.nix b/pkgs/gemini/qute-gemini/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromSourcehut, python3Packages }: +{ + lib, + fetchFromSourcehut, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "qute-gemini"; diff --git a/pkgs/gemini/satellite/default.nix b/pkgs/gemini/satellite/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "satellite"; diff --git a/pkgs/gemini/shavit/default.nix b/pkgs/gemini/shavit/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "shavit"; diff --git a/pkgs/gemini/stagit-gemini/milotier.nix b/pkgs/gemini/stagit-gemini/milotier.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, libgit2, fetchgit }: +{ + lib, + stdenv, + libgit2, + fetchgit, +}: stdenv.mkDerivation { pname = "stagit-gemini"; diff --git a/pkgs/gemini/stagit-gemini/sloum.nix b/pkgs/gemini/stagit-gemini/sloum.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, libgit2, fetchFromGitea }: +{ + lib, + stdenv, + libgit2, + fetchFromGitea, +}: stdenv.mkDerivation (finalAttrs: { pname = "stagit-gemini"; diff --git a/pkgs/gemini/tom/default.nix b/pkgs/gemini/tom/default.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, makeWrapper -, lua5_3 -, memstreamHook -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + makeWrapper, + lua5_3, + memstreamHook, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -25,9 +26,15 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "tom.lua" "$out/share/lua/tom.lua" ''; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; - buildInputs = [ lua5_3 zlib ] ++ lib.optional stdenv.isDarwin memstreamHook; + buildInputs = [ + lua5_3 + zlib + ] ++ lib.optional stdenv.isDarwin memstreamHook; installPhase = '' install -Dm644 *.so *.lua -t $out/share/lua diff --git a/pkgs/geospatial/arcgis2geojson/default.nix b/pkgs/geospatial/arcgis2geojson/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonApplication rec { pname = "arcgis2geojson"; diff --git a/pkgs/geospatial/bbox/default.nix b/pkgs/geospatial/bbox/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin, buildPackages }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + darwin, + buildPackages, +}: rustPlatform.buildRustPackage rec { pname = "bbox"; @@ -22,12 +29,20 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; - cargoBuildFlags = [ "--package" "bbox-server" "--package" "bbox-tile-server" ]; + cargoBuildFlags = [ + "--package" + "bbox-server" + "--package" + "bbox-tile-server" + ]; meta = with lib; { description = "BBOX services"; inherit (src.meta) homepage; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ + asl20 + mit + ]; maintainers = [ maintainers.sikmir ]; }; } diff --git a/pkgs/geospatial/c2cwsgiutils/default.nix b/pkgs/geospatial/c2cwsgiutils/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, pipfile }: +{ + lib, + fetchFromGitHub, + python3Packages, + pipfile, +}: python3Packages.buildPythonPackage rec { pname = "c2cwsgiutils"; diff --git a/pkgs/geospatial/cogdumper/default.nix b/pkgs/geospatial/cogdumper/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "cogdumper"; diff --git a/pkgs/geospatial/cogeo-mosaic/default.nix b/pkgs/geospatial/cogeo-mosaic/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, morecantile, supermorecado, rio-tiler }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + morecantile, + supermorecado, + rio-tiler, +}: python3Packages.buildPythonPackage rec { pname = "cogeo-mosaic"; @@ -12,7 +20,10 @@ python3Packages.buildPythonPackage rec { hash = "sha256-FJJZvLGBEZpVyfXBqmz6r1obx4HrKmtK0dWusItX3j4="; }; - nativeBuildInputs = with python3Packages; [ hatchling hatch-fancy-pypi-readme ]; + nativeBuildInputs = with python3Packages; [ + hatchling + hatch-fancy-pypi-readme + ]; propagatedBuildInputs = with python3Packages; [ morecantile diff --git a/pkgs/geospatial/color-operations/default.nix b/pkgs/geospatial/color-operations/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "color-operations"; diff --git a/pkgs/geospatial/datamaps/default.nix b/pkgs/geospatial/datamaps/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, libpng, pkg-config }: +{ + lib, + stdenv, + fetchFromGitHub, + libpng, + pkg-config, +}: stdenv.mkDerivation (finalAttrs: { pname = "datamaps"; diff --git a/pkgs/geospatial/deegree/default.nix b/pkgs/geospatial/deegree/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: stdenv.mkDerivation (finalAttrs: { pname = "deegree"; diff --git a/pkgs/geospatial/elevation/default.nix b/pkgs/geospatial/elevation/default.nix @@ -1,14 +1,15 @@ -{ lib -, fetchFromGitHub -, python3Packages -, click -, gnumake -, curl -, unzip -, gzip -, gdal -, testers -, elevation +{ + lib, + fetchFromGitHub, + python3Packages, + click, + gnumake, + curl, + unzip, + gzip, + gdal, + testers, + elevation, }: python3Packages.buildPythonApplication rec { @@ -26,7 +27,12 @@ python3Packages.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ fasteners appdirs click setuptools ]; + propagatedBuildInputs = with python3Packages; [ + fasteners + appdirs + click + setuptools + ]; postPatch = '' for f in elevation/datasource.* \ @@ -43,15 +49,16 @@ python3Packages.buildPythonApplication rec { done ''; - nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-mock ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-mock + ]; postInstall = '' install -Dm644 elevation/datasource.mk -t $out/lib/${python3Packages.python.libPrefix}/site-packages/elevation ''; - passthru.tests.version = testers.testVersion { - package = elevation; - }; + passthru.tests.version = testers.testVersion { package = elevation; }; meta = with lib; { description = "Python script to download global terrain digital elevation models, SRTM 30m DEM and SRTM 90m DEM"; diff --git a/pkgs/geospatial/geoarrow-c/default.nix b/pkgs/geospatial/geoarrow-c/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "geoarrow-c"; diff --git a/pkgs/geospatial/geoarrow-pyarrow/default.nix b/pkgs/geospatial/geoarrow-pyarrow/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, geoarrow-c }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + geoarrow-c, +}: python3Packages.buildPythonPackage rec { pname = "geoarrow-pyarrow"; @@ -16,7 +22,11 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ setuptools-scm ]; - propagatedBuildInputs = with python3Packages; [ geoarrow-c pyarrow pyarrow-hotfix ]; + propagatedBuildInputs = with python3Packages; [ + geoarrow-c + pyarrow + pyarrow-hotfix + ]; meta = with lib; { description = "Python implementation of the GeoArrow specification"; diff --git a/pkgs/geospatial/geojson-pydantic/default.nix b/pkgs/geospatial/geojson-pydantic/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "geojson-pydantic"; diff --git a/pkgs/geospatial/geowebcache/default.nix b/pkgs/geospatial/geowebcache/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, unzip }: +{ + lib, + stdenv, + fetchurl, + unzip, +}: stdenv.mkDerivation (finalAttrs: { pname = "geowebcache"; diff --git a/pkgs/geospatial/go-pmtiles/default.nix b/pkgs/geospatial/go-pmtiles/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "go-pmtiles"; diff --git a/pkgs/geospatial/go-staticmaps/default.nix b/pkgs/geospatial/go-staticmaps/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "go-staticmaps"; diff --git a/pkgs/geospatial/hecate/default.nix b/pkgs/geospatial/hecate/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + Security, +}: rustPlatform.buildRustPackage rec { pname = "hecate"; diff --git a/pkgs/geospatial/kealib/default.nix b/pkgs/geospatial/kealib/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, hdf5 }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + hdf5, +}: stdenv.mkDerivation rec { pname = "kealib"; diff --git a/pkgs/geospatial/localtileserver/default.nix b/pkgs/geospatial/localtileserver/default.nix @@ -1,4 +1,10 @@ -{ lib, python3Packages, fetchFromGitHub, large-image-source-gdal, server-thread }: +{ + lib, + python3Packages, + fetchFromGitHub, + large-image-source-gdal, + server-thread, +}: python3Packages.buildPythonApplication rec { pname = "localtileserver"; diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix @@ -1,30 +1,31 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, copyDesktopItems -, desktopToDarwinBundle -, makeDesktopItem -, db -, fig2dev -, giflib -, gsettings-desktop-schemas -, gtkmm3 -, imagemagick -, jansson -, curl -, libjpeg -, libpng -, librsvg -, libtiff -, libxml2 -, libzip -, perlPackages -, pkg-config -, proj -, shapelib -, unzip -, wrapGAppsHook +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + copyDesktopItems, + desktopToDarwinBundle, + makeDesktopItem, + db, + fig2dev, + giflib, + gsettings-desktop-schemas, + gtkmm3, + imagemagick, + jansson, + curl, + libjpeg, + libpng, + librsvg, + libtiff, + libxml2, + libzip, + perlPackages, + pkg-config, + proj, + shapelib, + unzip, + wrapGAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -46,7 +47,10 @@ stdenv.mkDerivation (finalAttrs: { inherit giflib; }) ]; - patchFlags = [ "-p1" "-d modules" ]; + patchFlags = [ + "-p1" + "-d modules" + ]; postPatch = '' substituteInPlace modules/get_deps \ @@ -69,7 +73,11 @@ stdenv.mkDerivation (finalAttrs: { comment = "Viewer for geodata and raster maps"; desktopName = "ms2view"; genericName = "Mapsoft2 viewer"; - categories = [ "Geography" "Geoscience" "Science" ]; + categories = [ + "Geography" + "Geoscience" + "Science" + ]; }) ]; diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix @@ -1,33 +1,34 @@ -{ lib -, stdenv -, fetchFromGitHub -, perlPackages -, python2Packages -, gimp -, bc -, fig2dev -, imagemagick -, m4 -, netpbm -, pkg-config -, scons -, boost -, curl -, giflib -, gtkmm2 -, jansson -, libjpeg -, libpng -, libshell -, libtiff -, libusb1 -, libxml2 -, libyaml -, libzip -, proj -, shapelib -, zlib -, getopt +{ + lib, + stdenv, + fetchFromGitHub, + perlPackages, + python2Packages, + gimp, + bc, + fig2dev, + imagemagick, + m4, + netpbm, + pkg-config, + scons, + boost, + curl, + giflib, + gtkmm2, + jansson, + libjpeg, + libpng, + libshell, + libtiff, + libusb1, + libxml2, + libyaml, + libzip, + proj, + shapelib, + zlib, + getopt, }: stdenv.mkDerivation (finalAttrs: { @@ -81,14 +82,20 @@ stdenv.mkDerivation (finalAttrs: { shapelib zlib ]; - propagatedBuildInputs = [ bc libshell ]; + propagatedBuildInputs = [ + bc + libshell + ]; preBuild = '' export CPPFLAGS="-I${boost.dev}/include -I${giflib}/include -I${proj.dev}/include" export LINKFLAGS="-L${giflib}/lib -lgif -L${proj}/lib -lproj" ''; - sconsFlags = [ "minimal=1" "prefix=$(out)" ]; + sconsFlags = [ + "minimal=1" + "prefix=$(out)" + ]; postInstall = '' wrapPythonProgramsIn $out/lib/gimp/${lib.versions.major gimp.version}.0/plug-ins/ diff --git a/pkgs/geospatial/mbtiles2osmand/default.nix b/pkgs/geospatial/mbtiles2osmand/default.nix @@ -1,6 +1,7 @@ -{ lib -, fetchFromGitHub -, python3Packages +{ + lib, + fetchFromGitHub, + python3Packages, }: python3Packages.buildPythonApplication rec { @@ -20,9 +21,7 @@ python3Packages.buildPythonApplication rec { installPhase = let - pythonEnv = python3Packages.python.withPackages (p: with p; [ - pillow - ]); + pythonEnv = python3Packages.python.withPackages (p: with p; [ pillow ]); in '' site_packages=$out/lib/${python3Packages.python.libPrefix}/site-packages diff --git a/pkgs/geospatial/mbutiles/default.nix b/pkgs/geospatial/mbutiles/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, sqlite }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + sqlite, +}: rustPlatform.buildRustPackage rec { pname = "mbutiles"; diff --git a/pkgs/geospatial/mobroute/default.nix b/pkgs/geospatial/mobroute/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "mobroute"; diff --git a/pkgs/geospatial/mobsql/default.nix b/pkgs/geospatial/mobsql/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromSourcehut }: +{ + lib, + buildGoModule, + fetchFromSourcehut, +}: buildGoModule rec { pname = "mobsql"; diff --git a/pkgs/geospatial/morecantile/default.nix b/pkgs/geospatial/morecantile/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, testers, morecantile }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + testers, + morecantile, +}: python3Packages.buildPythonPackage rec { pname = "morecantile"; @@ -15,13 +22,19 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ attrs pydantic pyproj ]; + propagatedBuildInputs = with python3Packages; [ + attrs + pydantic + pyproj + ]; - nativeCheckInputs = with python3Packages; [ mercantile pytestCheckHook rasterio ]; + nativeCheckInputs = with python3Packages; [ + mercantile + pytestCheckHook + rasterio + ]; - passthru.tests.version = testers.testVersion { - package = morecantile; - }; + passthru.tests.version = testers.testVersion { package = morecantile; }; meta = with lib; { description = "Construct and use map tile grids in different projection"; diff --git a/pkgs/geospatial/orbisgis/default.nix b/pkgs/geospatial/orbisgis/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchfromgh, unzip, rsync, makeWrapper, jre }: +{ + lib, + stdenv, + fetchfromgh, + unzip, + rsync, + makeWrapper, + jre, +}: stdenv.mkDerivation (finalAttrs: { pname = "orbisgis"; @@ -12,7 +20,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-e7SSn+P8rF5eSbl4Z/zp1mHNN2rAi4ZoMvkoy360hGM="; }; - nativeBuildInputs = [ unzip rsync makeWrapper ]; + nativeBuildInputs = [ + unzip + rsync + makeWrapper + ]; postPatch = '' sed -i "s#/usr/bin/orbisgis#$out/bin/orbisgis#" orbisgis.desktop diff --git a/pkgs/geospatial/ossim/default.nix b/pkgs/geospatial/ossim/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, geos, jsoncpp, libgeotiff, libjpeg, libtiff }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + geos, + jsoncpp, + libgeotiff, + libjpeg, + libtiff, +}: stdenv.mkDerivation (finalAttrs: { pname = "ossim"; @@ -13,7 +23,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ geos jsoncpp libgeotiff libjpeg libtiff ]; + buildInputs = [ + geos + jsoncpp + libgeotiff + libjpeg + libtiff + ]; cmakeFlags = [ (lib.cmakeBool "BUILD_OSSIM_APPS" false) diff --git a/pkgs/geospatial/pipfile/default.nix b/pkgs/geospatial/pipfile/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "pipfile"; @@ -19,7 +23,10 @@ python3Packages.buildPythonPackage rec { meta = with lib; { description = "Pipfile: the replacement for requirements.txt"; inherit (src.meta) homepage; - license = with licenses; [ asl20 bsd2 ]; + license = with licenses; [ + asl20 + bsd2 + ]; maintainers = [ maintainers.sikmir ]; }; } diff --git a/pkgs/geospatial/pmtiles/default.nix b/pkgs/geospatial/pmtiles/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "pmtiles"; diff --git a/pkgs/geospatial/polyvectorization/default.nix b/pkgs/geospatial/polyvectorization/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, opencv2, wrapQtAppsHook }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + eigen, + opencv2, + wrapQtAppsHook, +}: stdenv.mkDerivation rec { pname = "polyvectorization"; @@ -18,9 +27,16 @@ stdenv.mkDerivation rec { --replace-fail "#define WITH_GUI 1" "//#define WITH_GUI 1" ''; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; - buildInputs = [ boost eigen opencv2 ]; + buildInputs = [ + boost + eigen + opencv2 + ]; env.NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/geospatial/py-staticmaps/default.nix b/pkgs/geospatial/py-staticmaps/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, s2sphere }: +{ + lib, + fetchFromGitHub, + python3Packages, + s2sphere, +}: python3Packages.buildPythonApplication rec { pname = "py-staticmaps"; @@ -11,7 +16,16 @@ python3Packages.buildPythonApplication rec { hash = "sha256-vW457HbdDDhfz8hsvEN3/HJmIHKdrRDVNuhSpZXoZ78="; }; - propagatedBuildInputs = with python3Packages; [ appdirs geographiclib pillow pycairo python-slugify requests s2sphere svgwrite ]; + propagatedBuildInputs = with python3Packages; [ + appdirs + geographiclib + pillow + pycairo + python-slugify + requests + s2sphere + svgwrite + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/geospatial/pysheds/default.nix b/pkgs/geospatial/pysheds/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pysheds"; diff --git a/pkgs/geospatial/pystac/default.nix b/pkgs/geospatial/pystac/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pystac"; @@ -14,9 +19,7 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ - python-dateutil - ]; + propagatedBuildInputs = with python3Packages; [ python-dateutil ]; nativeCheckInputs = with python3Packages; [ html5lib diff --git a/pkgs/geospatial/qlandkartegt/default.nix b/pkgs/geospatial/qlandkartegt/default.nix @@ -1,20 +1,21 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, cmake -, qtmultimedia -, qtserialport -, qtscript -, qtwebkit -, wrapQtAppsHook -, garmindev -, gdal -, gpsd -, libdmtx -, libexif -, libGLU -, proj +{ + stdenv, + lib, + fetchurl, + fetchpatch, + cmake, + qtmultimedia, + qtserialport, + qtscript, + qtwebkit, + wrapQtAppsHook, + garmindev, + gdal, + gpsd, + libdmtx, + libexif, + libGLU, + proj, }: stdenv.mkDerivation rec { @@ -65,7 +66,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; buildInputs = [ qtmultimedia diff --git a/pkgs/geospatial/qlandkartegt/garmindev.nix b/pkgs/geospatial/qlandkartegt/garmindev.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, cmake, libusb-compat-0_1 }: +{ + lib, + stdenv, + fetchurl, + cmake, + libusb-compat-0_1, +}: stdenv.mkDerivation rec { pname = "garmindev"; diff --git a/pkgs/geospatial/render_geojson/default.nix b/pkgs/geospatial/render_geojson/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + wxGTK, +}: stdenv.mkDerivation (finalAttrs: { pname = "render_geojson"; diff --git a/pkgs/geospatial/rio-cogeo/default.nix b/pkgs/geospatial/rio-cogeo/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, morecantile, cogdumper }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + morecantile, + cogdumper, +}: python3Packages.buildPythonPackage rec { pname = "rio-cogeo"; @@ -24,7 +31,10 @@ python3Packages.buildPythonPackage rec { doCheck = false; - nativeCheckInputs = with python3Packages; [ pytestCheckHook cogdumper ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + cogdumper + ]; meta = with lib; { description = "Cloud Optimized GeoTIFF creation and validation plugin for rasterio"; diff --git a/pkgs/geospatial/rio-color/default.nix b/pkgs/geospatial/rio-color/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, rio-mucho }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + rio-mucho, +}: python3Packages.buildPythonPackage rec { pname = "rio-color"; diff --git a/pkgs/geospatial/rio-mbtiles/default.nix b/pkgs/geospatial/rio-mbtiles/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, supermercado }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + supermercado, +}: python3Packages.buildPythonApplication rec { pname = "rio-mbtiles"; diff --git a/pkgs/geospatial/rio-mucho/default.nix b/pkgs/geospatial/rio-mucho/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "rio-mucho"; diff --git a/pkgs/geospatial/rio-stac/default.nix b/pkgs/geospatial/rio-stac/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, pystac }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + pystac, +}: python3Packages.buildPythonPackage rec { pname = "rio-stac"; @@ -19,12 +25,13 @@ python3Packages.buildPythonPackage rec { pystac ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook jsonschema ]; - - disabledTests = [ - "test_create_item" + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + jsonschema ]; + disabledTests = [ "test_create_item" ]; + meta = with lib; { description = "Create STAC item from raster datasets"; homepage = "https://developmentseed.org/rio-stac/"; diff --git a/pkgs/geospatial/rio-tiler/default.nix b/pkgs/geospatial/rio-tiler/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, morecantile, pystac, color-operations, rioxarray }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + morecantile, + pystac, + color-operations, + rioxarray, +}: python3Packages.buildPythonPackage rec { pname = "rio-tiler"; @@ -25,7 +34,10 @@ python3Packages.buildPythonPackage rec { color-operations ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook rioxarray ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + rioxarray + ]; pythonImportsCheck = [ "rio_tiler" ]; diff --git a/pkgs/geospatial/rioxarray/default.nix b/pkgs/geospatial/rioxarray/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "rioxarray"; diff --git a/pkgs/geospatial/rsgislib/default.nix b/pkgs/geospatial/rsgislib/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gdal, gsl, hdf5, kealib, muparser, python3 }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + gdal, + gsl, + hdf5, + kealib, + muparser, + python3, +}: stdenv.mkDerivation rec { pname = "rsgislib"; @@ -13,7 +25,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost gdal gsl hdf5 kealib muparser python3 ]; + buildInputs = [ + boost + gdal + gsl + hdf5 + kealib + muparser + python3 + ]; meta = with lib; { description = "Remote Sensing and GIS Software Library"; diff --git a/pkgs/geospatial/sasplanet/default.nix b/pkgs/geospatial/sasplanet/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchurl -, fetchgit -, fetchgdrive -, unzip -, wine -, makeWrapper -, withMaps ? true -, withExtremum ? false +{ + lib, + stdenv, + fetchurl, + fetchgit, + fetchgdrive, + unzip, + wine, + makeWrapper, + withMaps ? true, + withExtremum ? false, }: let maps = fetchgit { @@ -32,23 +33,29 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "."; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ + unzip + makeWrapper + ]; # Post install regedit: # * increase font size: https://askubuntu.com/a/1313810 # * dark theme: https://gist.github.com/Zeinok/ceaf6ff204792dde0ae31e0199d89398 - installPhase = '' - mkdir -p $out/opt/sasplanet - cp -r . $out/opt/sasplanet + installPhase = + '' + mkdir -p $out/opt/sasplanet + cp -r . $out/opt/sasplanet - makeWrapper ${wine}/bin/wine $out/bin/sasplanet \ - --run "[ -d \$HOME/.sasplanet ] || { cp -r $out/opt/sasplanet \$HOME/.sasplanet && chmod -R +w \$HOME/.sasplanet; }" \ - --add-flags "\$HOME/.sasplanet/SASPlanet.exe" - '' + lib.optionalString withMaps '' - cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps - '' + lib.optionalString withExtremum '' - unzip ${extremum} -d $out/opt/sasplanet/Maps/sas.maps - ''; + makeWrapper ${wine}/bin/wine $out/bin/sasplanet \ + --run "[ -d \$HOME/.sasplanet ] || { cp -r $out/opt/sasplanet \$HOME/.sasplanet && chmod -R +w \$HOME/.sasplanet; }" \ + --add-flags "\$HOME/.sasplanet/SASPlanet.exe" + '' + + lib.optionalString withMaps '' + cp -r ${maps}/* $out/opt/sasplanet/Maps/sas.maps + '' + + lib.optionalString withExtremum '' + unzip ${extremum} -d $out/opt/sasplanet/Maps/sas.maps + ''; preferLocalBuild = true; diff --git a/pkgs/geospatial/server-thread/default.nix b/pkgs/geospatial/server-thread/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "server-thread"; @@ -11,9 +15,16 @@ python3Packages.buildPythonPackage rec { hash = "sha256-EAL/moz3AIPBRLfAVI2zcCstjLsssKqBrxIDvq9CV3g="; }; - propagatedBuildInputs = with python3Packages; [ scooby werkzeug ]; + propagatedBuildInputs = with python3Packages; [ + scooby + werkzeug + ]; - nativeCheckInputs = with python3Packages; [ flask requests pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ + flask + requests + pytestCheckHook + ]; meta = with lib; { description = "Launch a WSGIApplication in a background thread with werkzeug"; diff --git a/pkgs/geospatial/starlette-cramjam/default.nix b/pkgs/geospatial/starlette-cramjam/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "starlette-cramjam"; diff --git a/pkgs/geospatial/supermercado/default.nix b/pkgs/geospatial/supermercado/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "supermercado"; @@ -11,7 +15,12 @@ python3Packages.buildPythonApplication rec { hash = "sha256-k2S1aOHQEJq//4mdWZ5GhJQJjKqJuDbBztoHi373s6w="; }; - propagatedBuildInputs = with python3Packages; [ click-plugins rasterio mercantile numpy ]; + propagatedBuildInputs = with python3Packages; [ + click-plugins + rasterio + mercantile + numpy + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/geospatial/supermorecado/default.nix b/pkgs/geospatial/supermorecado/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, morecantile }: +{ + lib, + fetchFromGitHub, + python3Packages, + morecantile, +}: python3Packages.buildPythonApplication rec { pname = "supermorecado"; @@ -14,7 +19,10 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ morecantile rasterio ]; + propagatedBuildInputs = with python3Packages; [ + morecantile + rasterio + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/geospatial/tdh/base.nix b/pkgs/geospatial/tdh/base.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchgdrive -, unzip -, gsettings-desktop-schemas -, gtk3 -, wxgtk -, libredirect -, makeWrapper -, wrapGAppsHook -, pname -, version -, id -, sha256 -, description -, homepage +{ + lib, + stdenv, + fetchgdrive, + unzip, + gsettings-desktop-schemas, + gtk3, + wxgtk, + libredirect, + makeWrapper, + wrapGAppsHook, + pname, + version, + id, + sha256, + description, + homepage, }: stdenv.mkDerivation { @@ -26,9 +27,16 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = [ makeWrapper wrapGAppsHook unzip ]; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + unzip + ]; - buildInputs = [ gsettings-desktop-schemas gtk3 ]; + buildInputs = [ + gsettings-desktop-schemas + gtk3 + ]; dontStrip = true; dontPatchELF = true; @@ -50,7 +58,12 @@ stdenv.mkDerivation { $out/bin/${pname} patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$out/lib:${lib.makeLibraryPath [ stdenv.cc.cc.lib wxgtk ]}" \ + --set-rpath "$out/lib:${ + lib.makeLibraryPath [ + stdenv.cc.cc.lib + wxgtk + ] + }" \ $out/bin/${pname} gappsWrapperArgs+=( diff --git a/pkgs/geospatial/tdh/default.nix b/pkgs/geospatial/tdh/default.nix @@ -1,15 +1,25 @@ -{ callPackage, fetchFromGitHub, wxGTK30, gcc8Stdenv }: +{ + callPackage, + fetchFromGitHub, + wxGTK30, + gcc8Stdenv, +}: let # Fix mismatch between the program and library build versions - wxGTK30_gcc8 = (wxGTK30.override { stdenv = gcc8Stdenv; compat26 = false; }).overrideAttrs (old: { - version = "3.0.5"; - src = fetchFromGitHub { - owner = "wxWidgets"; - repo = "wxWidgets"; - rev = "v3.0.5"; - sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; - }; - }); + wxGTK30_gcc8 = + (wxGTK30.override { + stdenv = gcc8Stdenv; + compat26 = false; + }).overrideAttrs + (old: { + version = "3.0.5"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v3.0.5"; + sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; + }; + }); in { cad = callPackage ./base.nix { diff --git a/pkgs/geospatial/terracotta/default.nix b/pkgs/geospatial/terracotta/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "terracotta"; diff --git a/pkgs/geospatial/tile-stitch/default.nix b/pkgs/geospatial/tile-stitch/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, curl, libjpeg, libpng, libtiff, libgeotiff, pkg-config }: +{ + lib, + stdenv, + fetchFromGitHub, + curl, + libjpeg, + libpng, + libtiff, + libgeotiff, + pkg-config, +}: stdenv.mkDerivation (finalAttrs: { pname = "tile-stitch"; @@ -13,7 +23,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl libjpeg libpng libtiff libgeotiff ]; + buildInputs = [ + curl + libjpeg + libpng + libtiff + libgeotiff + ]; installPhase = "install -Dm755 stitch -t $out/bin"; diff --git a/pkgs/geospatial/tilecloud/default.nix b/pkgs/geospatial/tilecloud/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, c2cwsgiutils }: +{ + lib, + fetchFromGitHub, + python3Packages, + c2cwsgiutils, +}: python3Packages.buildPythonApplication rec { pname = "tilecloud"; diff --git a/pkgs/geospatial/tilekiln/default.nix b/pkgs/geospatial/tilekiln/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "tilekiln"; @@ -11,11 +16,13 @@ python3Packages.buildPythonApplication rec { hash = "sha256-CLeZMfru8hnhotTAmdRc9hG473wD9gc4omD1G1XQkoQ="; }; - postPatch = '' - sed -i '/setup_requires=/d' setup.py - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's/len(os.sched_getaffinity(0))/4/' tilekiln/scripts/__init__.py - ''; + postPatch = + '' + sed -i '/setup_requires=/d' setup.py + '' + + lib.optionalString stdenv.isDarwin '' + sed -i 's/len(os.sched_getaffinity(0))/4/' tilekiln/scripts/__init__.py + ''; propagatedBuildInputs = with python3Packages; [ click diff --git a/pkgs/geospatial/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix @@ -1,10 +1,11 @@ -{ lib -, fetchFromGitHub -, python3Packages -, jsonseq -, supermercado -, testers -, tilesets-cli +{ + lib, + fetchFromGitHub, + python3Packages, + jsonseq, + supermercado, + testers, + tilesets-cli, }: python3Packages.buildPythonApplication rec { @@ -33,11 +34,12 @@ python3Packages.buildPythonApplication rec { geojson ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook supermercado ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + supermercado + ]; - passthru.tests.version = testers.testVersion { - package = tilesets-cli; - }; + passthru.tests.version = testers.testVersion { package = tilesets-cli; }; meta = with lib; { description = "CLI for interacting with the Mapbox Tilesets API"; diff --git a/pkgs/geospatial/titiler/default.nix b/pkgs/geospatial/titiler/default.nix @@ -1,12 +1,13 @@ -{ lib -, fetchFromGitHub -, python3Packages -, rio-stac -, rio-tiler -, geojson-pydantic -, rio-cogeo -, starlette-cramjam -, cogeo-mosaic +{ + lib, + fetchFromGitHub, + python3Packages, + rio-stac, + rio-tiler, + geojson-pydantic, + rio-cogeo, + starlette-cramjam, + cogeo-mosaic, }: let pname = "titiler"; @@ -57,7 +58,10 @@ let titiler-core ]; doCheck = false; - nativeCheckInputs = with python3Packages; [ pytestCheckHook jsonschema ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + jsonschema + ]; disabledTests = [ "test_stacExtension" ]; }; @@ -77,7 +81,12 @@ let }; in python3Packages.buildPythonPackage { - inherit pname version src meta; + inherit + pname + version + src + meta + ; sourceRoot = "${src.name}/src/titiler/application"; pyproject = true; @@ -94,7 +103,5 @@ python3Packages.buildPythonPackage { doCheck = false; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - disabledTests = [ - "test_mosaic_auth_error" - ]; + disabledTests = [ "test_mosaic_auth_error" ]; } diff --git a/pkgs/geospatial/tpkutils/default.nix b/pkgs/geospatial/tpkutils/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, pymbtiles }: +{ + lib, + fetchFromGitHub, + python3Packages, + pymbtiles, +}: python3Packages.buildPythonApplication rec { pname = "tpkutils"; diff --git a/pkgs/geospatial/vt2geojson/default.nix b/pkgs/geospatial/vt2geojson/default.nix @@ -1,4 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, vt2geojson }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + vt2geojson, +}: buildGoModule rec { pname = "vt2geojson"; @@ -15,9 +21,7 @@ buildGoModule rec { ldflags = [ "-X main.appVersion=${version}" ]; - passthru.tests.version = testers.testVersion { - package = vt2geojson; - }; + passthru.tests.version = testers.testVersion { package = vt2geojson; }; meta = with lib; { description = "Command line tool to dump Mapbox Vector Tiles to GeoJSON"; diff --git a/pkgs/gnss/gnsstk-apps/default.nix b/pkgs/gnss/gnsstk-apps/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gnsstk }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gnsstk, +}: stdenv.mkDerivation (finalAttrs: { pname = "gnsstk-apps"; diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, +}: stdenv.mkDerivation (finalAttrs: { pname = "gnsstk"; diff --git a/pkgs/gnss/gps-sdr-sim/default.nix b/pkgs/gnss/gps-sdr-sim/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "gps-sdr-sim"; diff --git a/pkgs/gnss/gpsdate/default.nix b/pkgs/gnss/gpsdate/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "gpsdate"; diff --git a/pkgs/gnss/pygnssutils/default.nix b/pkgs/gnss/pygnssutils/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, python3Packages, pyspartn, pyubx2 }: +{ + lib, + fetchFromGitHub, + python3Packages, + pyspartn, + pyubx2, +}: python3Packages.buildPythonPackage rec { pname = "pygnssutils"; diff --git a/pkgs/gnss/pygpsclient/default.nix b/pkgs/gnss/pygpsclient/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, pygnssutils }: +{ + lib, + fetchFromGitHub, + python3Packages, + pygnssutils, +}: python3Packages.buildPythonApplication rec { pname = "pygpsclient"; diff --git a/pkgs/gnss/pyrtcm/default.nix b/pkgs/gnss/pyrtcm/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pyrtcm"; diff --git a/pkgs/gnss/pyspartn/default.nix b/pkgs/gnss/pyspartn/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pyspartn"; @@ -14,9 +18,7 @@ python3Packages.buildPythonPackage rec { build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ - cryptography - ]; + propagatedBuildInputs = with python3Packages; [ cryptography ]; pythonImportsCheck = [ "pyspartn" ]; diff --git a/pkgs/gnss/pyubx2/default.nix b/pkgs/gnss/pyubx2/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, pyrtcm }: +{ + lib, + fetchFromGitHub, + python3Packages, + pyrtcm, +}: python3Packages.buildPythonPackage rec { pname = "pyubx2"; diff --git a/pkgs/gnss/rtklib/default.nix b/pkgs/gnss/rtklib/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, gfortran }: +{ + lib, + stdenv, + fetchFromGitHub, + gfortran, +}: stdenv.mkDerivation (finalAttrs: { pname = "rtklib"; diff --git a/pkgs/gnss/visualgps/default.nix b/pkgs/gnss/visualgps/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtserialport, wrapQtAppsHook }: +{ + lib, + stdenv, + fetchFromGitHub, + qmake, + qtserialport, + wrapQtAppsHook, +}: stdenv.mkDerivation { pname = "visualgps"; @@ -12,19 +19,25 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; buildInputs = [ qtserialport ]; qmakeFlags = [ "Software/VisualGPSqt/Source/VisualGPSqt.pro" ]; postInstall = - if stdenv.isDarwin then '' - mkdir -p $out/Applications - mv *.app $out/Applications - '' else '' - install -Dm755 VisualGPSqt -t $out/bin - ''; + if stdenv.isDarwin then + '' + mkdir -p $out/Applications + mv *.app $out/Applications + '' + else + '' + install -Dm755 VisualGPSqt -t $out/bin + ''; meta = with lib; { description = "A QT application (GUI) that makes use of the VisualGPS/NMEAParser project"; diff --git a/pkgs/gpx/cmpgpx/default.nix b/pkgs/gpx/cmpgpx/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, geotiler }: +{ + lib, + fetchFromGitHub, + python3Packages, + geotiler, +}: python3Packages.buildPythonApplication rec { pname = "cmpgpx"; @@ -12,7 +17,12 @@ python3Packages.buildPythonApplication rec { hash = "sha256-iJajSbDDPkBmGKZp0QH03RK9VBMmLHWvHViojlQJArs="; }; - propagatedBuildInputs = with python3Packages; [ cairocffi geotiler gpxpy numpy ]; + propagatedBuildInputs = with python3Packages; [ + cairocffi + geotiler + gpxpy + numpy + ]; dontUseSetuptoolsBuild = true; dontUseSetuptoolsCheck = true; diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, rustPlatform -, rust -, fetchFromGitLab -, pkg-config -, atk -, cairo -, gdk-pixbuf -, glib -, gtk3 -, harfbuzz -, openssl -, pango -, zlib +{ + lib, + stdenv, + rustPlatform, + rust, + fetchFromGitLab, + pkg-config, + atk, + cairo, + gdk-pixbuf, + glib, + gtk3, + harfbuzz, + openssl, + pango, + zlib, }: rustPlatform.buildRustPackage rec { @@ -33,7 +34,16 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ atk cairo gdk-pixbuf glib gtk3 harfbuzz openssl pango ]; + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + harfbuzz + openssl + pango + ]; postPatch = '' substituteInPlace ./configure.sh \ diff --git a/pkgs/gpx/geojson2dm/default.nix b/pkgs/gpx/geojson2dm/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromSourcehut }: +{ + lib, + stdenv, + fetchFromSourcehut, +}: stdenv.mkDerivation { pname = "geojson2dm"; diff --git a/pkgs/gpx/gps-whatsnew/default.nix b/pkgs/gpx/gps-whatsnew/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, boost, qt5 }: +{ + lib, + stdenv, + fetchFromGitHub, + boost, + qt5, +}: stdenv.mkDerivation (finalAttrs: { pname = "gps-whatsnew"; diff --git a/pkgs/gpx/gpx-animator/default.nix b/pkgs/gpx/gpx-animator/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ + lib, + stdenv, + fetchurl, + jre, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "gpx-animator"; diff --git a/pkgs/gpx/gpx-cmd-tools/default.nix b/pkgs/gpx/gpx-cmd-tools/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "gpx-cmd-tools"; diff --git a/pkgs/gpx/gpx-converter/default.nix b/pkgs/gpx/gpx-converter/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "gpx-converter"; @@ -11,9 +15,16 @@ python3Packages.buildPythonApplication rec { hash = "sha256-bT94phfkJiOQ8rZn783qOmIph6ck27z18rQQby9uEeg="; }; - propagatedBuildInputs = with python3Packages; [ gpxpy numpy pandas ]; + propagatedBuildInputs = with python3Packages; [ + gpxpy + numpy + pandas + ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-runner ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-runner + ]; disabledTests = [ "test_gpx_to_dictionary" ]; diff --git a/pkgs/gpx/gpx-interpolate/default.nix b/pkgs/gpx/gpx-interpolate/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "gpx-interpolate"; @@ -12,7 +16,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-cCiRXpX6qj2o+vPs3V0/+UwnnHKvDFOgTbCV347BKkc="; }; - propagatedBuildInputs = with python3Packages; [ gpxpy scipy numpy ]; + propagatedBuildInputs = with python3Packages; [ + gpxpy + scipy + numpy + ]; dontUseSetuptoolsBuild = true; diff --git a/pkgs/gpx/gpx-layer/default.nix b/pkgs/gpx/gpx-layer/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, buildPerlPackage, shortenPerlShebang, XMLParser }: +{ + lib, + stdenv, + fetchFromGitHub, + buildPerlPackage, + shortenPerlShebang, + XMLParser, +}: buildPerlPackage rec { pname = "gpx-layer"; @@ -19,13 +26,16 @@ buildPerlPackage rec { preConfigure = "touch Makefile.PL"; - installPhase = '' - install -Dm755 parse-gpx $out/bin/datamaps-parse-gpx - '' + lib.optionalString stdenv.isLinux '' - patchShebangs $out/bin/datamaps-parse-gpx - '' + lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/datamaps-parse-gpx - ''; + installPhase = + '' + install -Dm755 parse-gpx $out/bin/datamaps-parse-gpx + '' + + lib.optionalString stdenv.isLinux '' + patchShebangs $out/bin/datamaps-parse-gpx + '' + + lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/datamaps-parse-gpx + ''; meta = with lib; { description = "Tools to turn GPX files into a GPS map tracing layer"; diff --git a/pkgs/gpx/gpx2yaml/default.nix b/pkgs/gpx/gpx2yaml/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromSourcehut }: +{ + lib, + stdenv, + fetchFromSourcehut, +}: stdenv.mkDerivation { pname = "gpx2yaml"; diff --git a/pkgs/gpx/gpxchart/default.nix b/pkgs/gpx/gpxchart/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "gpxchart"; diff --git a/pkgs/gpx/gpxeditor/default.nix b/pkgs/gpx/gpxeditor/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, unzip, wine, writers }: +{ + lib, + stdenv, + fetchurl, + unzip, + wine, + writers, +}: let runScript = writers.writeBash "gpxeditor" '' export WINEDEBUG=warn+all diff --git a/pkgs/gpx/gpxlib/default.nix b/pkgs/gpx/gpxlib/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, expat }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + expat, +}: stdenv.mkDerivation { pname = "gpxlib"; diff --git a/pkgs/gpx/gpxtools/default.nix b/pkgs/gpx/gpxtools/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitea, cmake, expat, exiv2 }: +{ + lib, + stdenv, + fetchFromGitea, + cmake, + expat, + exiv2, +}: stdenv.mkDerivation { pname = "gpxtools"; diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages, s2sphere }: +{ + lib, + fetchFromGitHub, + fetchpatch, + python3Packages, + s2sphere, +}: python3Packages.buildPythonApplication rec { pname = "gpxtrackposter"; diff --git a/pkgs/gpx/routeconverter/default.nix b/pkgs/gpx/routeconverter/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: +{ + lib, + stdenv, + fetchurl, + jre, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "routeconverter"; diff --git a/pkgs/gpx/trackanimation/default.nix b/pkgs/gpx/trackanimation/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, smopy }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + smopy, +}: python3Packages.buildPythonApplication rec { pname = "trackanimation"; diff --git a/pkgs/images/agate/default.nix b/pkgs/images/agate/default.nix @@ -1,4 +1,8 @@ -{ dockerTools, agate, domain ? "localhost" }: +{ + dockerTools, + agate, + domain ? "localhost", +}: let key = "/certs/${domain}.key"; cert = "/certs/${domain}.crt"; @@ -11,7 +15,17 @@ dockerTools.buildImage { runAsRoot = "mkdir -p /certs /gemini"; config = { - Cmd = [ "agate" "--content" "/gemini" "--key" key "--cert" cert "--hostname" domain ]; + Cmd = [ + "agate" + "--content" + "/gemini" + "--key" + key + "--cert" + cert + "--hostname" + domain + ]; Volumes = { "/certs" = { }; "/gemini" = { }; diff --git a/pkgs/images/elevation_server/default.nix b/pkgs/images/elevation_server/default.nix @@ -8,7 +8,13 @@ dockerTools.buildImage { runAsRoot = "mkdir -p /dem"; config = { - Cmd = [ "elevation_server" "-dem" "/dem/dem_tiles" "-host" "0.0.0.0" ]; + Cmd = [ + "elevation_server" + "-dem" + "/dem/dem_tiles" + "-host" + "0.0.0.0" + ]; Volumes = { "/dem" = { }; }; diff --git a/pkgs/images/git/default.nix b/pkgs/images/git/default.nix @@ -8,7 +8,11 @@ dockerTools.buildImage { runAsRoot = "mkdir -p /git"; config = { - Cmd = [ "git" "daemon" "--base-path=/git" ]; + Cmd = [ + "git" + "daemon" + "--base-path=/git" + ]; Volumes = { "/git" = { }; }; diff --git a/pkgs/images/mbtileserver/default.nix b/pkgs/images/mbtileserver/default.nix @@ -8,7 +8,10 @@ dockerTools.buildImage { runAsRoot = "mkdir -p /tilesets"; config = { - Cmd = [ "mbtileserver" "--enable-reload" ]; + Cmd = [ + "mbtileserver" + "--enable-reload" + ]; Volumes = { "/tilesets" = { }; }; diff --git a/pkgs/images/quark/default.nix b/pkgs/images/quark/default.nix @@ -4,11 +4,23 @@ dockerTools.buildImage { name = "quark"; tag = quark.version; - contents = [ dockerTools.fakeNss quark ]; + contents = [ + dockerTools.fakeNss + quark + ]; runAsRoot = "mkdir -p /htdocs"; config = { - Cmd = [ "quark" "-h" "0.0.0.0" "-p" "8080" "-g" "nobody" "-l" ]; + Cmd = [ + "quark" + "-h" + "0.0.0.0" + "-p" + "8080" + "-g" + "nobody" + "-l" + ]; WorkingDir = "/htdocs"; Volumes = { "/htdocs" = { }; diff --git a/pkgs/linguistics/dict2rest/default.nix b/pkgs/linguistics/dict2rest/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ + lib, + fetchFromGitHub, + buildGoPackage, +}: buildGoPackage rec { pname = "dict2rest"; diff --git a/pkgs/linguistics/distance/default.nix b/pkgs/linguistics/distance/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "distance"; diff --git a/pkgs/linguistics/gdcv/default.nix b/pkgs/linguistics/gdcv/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, argp-standalone, emacs, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + argp-standalone, + emacs, + zlib, +}: stdenv.mkDerivation (finalAttrs: { pname = "gdcv"; @@ -21,9 +29,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ emacs zlib ] ++ lib.optional stdenv.isDarwin argp-standalone; + buildInputs = [ + emacs + zlib + ] ++ lib.optional stdenv.isDarwin argp-standalone; - makeFlags = [ "CC:=$(CC)" "gdcv" "emacs-module" ]; + makeFlags = [ + "CC:=$(CC)" + "gdcv" + "emacs-module" + ]; env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; diff --git a/pkgs/linguistics/goldendict/bin.nix b/pkgs/linguistics/goldendict/bin.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, undmg }: +{ + lib, + stdenv, + fetchurl, + undmg, +}: stdenv.mkDerivation rec { pname = "goldendict-bin"; diff --git a/pkgs/linguistics/gt-bash-client/default.nix b/pkgs/linguistics/gt-bash-client/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "gt-bash-client"; diff --git a/pkgs/linguistics/gt4gd/default.nix b/pkgs/linguistics/gt4gd/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, withUI ? true }: +{ + lib, + fetchFromGitHub, + python3Packages, + withUI ? true, +}: python3Packages.buildPythonApplication rec { pname = "gt4gd"; @@ -11,8 +16,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-zJq5dhmrd0k7bsw75xFECKmwZU4qjw+wwSzsYjg8zao="; }; - propagatedBuildInputs = with python3Packages; [ requests ] - ++ lib.optional withUI tkinter; + propagatedBuildInputs = with python3Packages; [ requests ] ++ lib.optional withUI tkinter; doCheck = false; diff --git a/pkgs/linguistics/i18n-editor/default.nix b/pkgs/linguistics/i18n-editor/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }: +{ + lib, + stdenv, + fetchfromgh, + unzip, + jre, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "i18n-editor"; @@ -14,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "."; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ + makeWrapper + unzip + ]; buildInputs = [ jre ]; diff --git a/pkgs/linguistics/lsdreader/default.nix b/pkgs/linguistics/lsdreader/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonApplication rec { pname = "lsdreader"; diff --git a/pkgs/linguistics/mikatools/default.nix b/pkgs/linguistics/mikatools/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "mikatools"; @@ -11,7 +15,11 @@ python3Packages.buildPythonPackage rec { hash = "sha256-2YpRTSZWJVXMoTLDBFS+tFkmA8pOBsqWF7Z85gtIfY0="; }; - propagatedBuildInputs = with python3Packages; [ requests cryptography tqdm ]; + propagatedBuildInputs = with python3Packages; [ + requests + cryptography + tqdm + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/linguistics/odict/default.nix b/pkgs/linguistics/odict/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, buildGoModule, testers, odict }: +{ + lib, + fetchFromGitHub, + buildGoModule, + testers, + odict, +}: buildGoModule rec { pname = "odict"; @@ -13,9 +19,7 @@ buildGoModule rec { vendorHash = "sha256-8vDlrbdmGfpCLZIU3rxuk004T9om/CGTc8vJElvlP3s="; - passthru.tests.version = testers.testVersion { - package = odict; - }; + passthru.tests.version = testers.testVersion { package = odict; }; meta = with lib; { description = "A blazingly-fast portable dictionary file format"; diff --git a/pkgs/linguistics/pytorchtext/default.nix b/pkgs/linguistics/pytorchtext/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, cmake, which, revtok }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + cmake, + which, + revtok, +}: python3Packages.buildPythonPackage rec { pname = "pytorchtext"; @@ -12,7 +20,10 @@ python3Packages.buildPythonPackage rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake which ]; + nativeBuildInputs = [ + cmake + which + ]; buildInputs = with python3Packages; [ pybind11 ]; diff --git a/pkgs/linguistics/revtok/default.nix b/pkgs/linguistics/revtok/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "revtok"; diff --git a/pkgs/linguistics/stardict-tools/default.nix b/pkgs/linguistics/stardict-tools/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchurl -, autoconf -, automake -, libtool -, p7zip -, pkg-config -, gtk2 -, libmysqlclient -, libxml2 -, pcre +{ + lib, + stdenv, + fetchurl, + autoconf, + automake, + libtool, + p7zip, + pkg-config, + gtk2, + libmysqlclient, + libxml2, + pcre, }: stdenv.mkDerivation (finalAttrs: { @@ -44,9 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ''; preConfigure = "./autogen.sh"; - configureFlags = [ - (lib.enableFeature false "dict") - ]; + configureFlags = [ (lib.enableFeature false "dict") ]; env.NIX_CFLAGS_COMPILE = "-std=c++14"; diff --git a/pkgs/linguistics/tatoebatools/default.nix b/pkgs/linguistics/tatoebatools/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, withCli ? true, checkLang ? false }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + withCli ? true, + checkLang ? false, +}: python3Packages.buildPythonApplication rec { pname = "tatoebatools"; @@ -11,13 +18,26 @@ python3Packages.buildPythonApplication rec { hash = "sha256-45CDAH80z6zApgR4gK7ZLPSXtCyPx+6YaA61Iskued4="; }; - patches = lib.optional (!checkLang) ./dont-check-lang-validity.patch + patches = + lib.optional (!checkLang) ./dont-check-lang-validity.patch ++ lib.optional withCli ./cli.patch; postPatch = "sed -i 's/==.*\"/\"/;s/>=.*\"/\"/' setup.py"; - propagatedBuildInputs = with python3Packages; [ beautifulsoup4 pandas requests sqlalchemy setuptools tqdm ] - ++ lib.optionals withCli [ click xdg-base-dirs ]; + propagatedBuildInputs = + with python3Packages; + [ + beautifulsoup4 + pandas + requests + sqlalchemy + setuptools + tqdm + ] + ++ lib.optionals withCli [ + click + xdg-base-dirs + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/linguistics/ttb/default.nix b/pkgs/linguistics/ttb/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, SystemConfiguration }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + SystemConfiguration, +}: rustPlatform.buildRustPackage rec { pname = "ttb"; diff --git a/pkgs/linguistics/wikitextprocessor/default.nix b/pkgs/linguistics/wikitextprocessor/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "wikitextprocessor"; @@ -11,16 +16,20 @@ python3Packages.buildPythonPackage rec { hash = "sha256-cjhKgzqsPwVO2/fwC62IDilMhz6fg6qQrnm0xLQ3KPk="; }; - propagatedBuildInputs = with python3Packages; [ lupa dateparser lru-dict ]; + propagatedBuildInputs = with python3Packages; [ + lupa + dateparser + lru-dict + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - disabledTests = [ - "test_string_format2" - ] ++ lib.optionals stdenv.isDarwin [ - "test_long_twothread" - "test_expr29" - ]; + disabledTests = + [ "test_string_format2" ] + ++ lib.optionals stdenv.isDarwin [ + "test_long_twothread" + "test_expr29" + ]; doCheck = false; diff --git a/pkgs/linguistics/wiktextract/default.nix b/pkgs/linguistics/wiktextract/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, fetchurl, unzip, wikitextprocessor }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + fetchurl, + unzip, + wikitextprocessor, +}: let brown = fetchurl { @@ -22,9 +30,17 @@ python3Packages.buildPythonApplication rec { --replace-fail python-Levenshtein Levenshtein ''; - propagatedBuildInputs = with python3Packages; [ levenshtein setuptools wikitextprocessor nltk ]; + propagatedBuildInputs = with python3Packages; [ + levenshtein + setuptools + wikitextprocessor + nltk + ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook unzip ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + unzip + ]; # https://www.nltk.org/data.html#manual-installation preCheck = '' diff --git a/pkgs/linguistics/wiktfinnish/default.nix b/pkgs/linguistics/wiktfinnish/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonApplication rec { pname = "wiktfinnish"; diff --git a/pkgs/linguistics/zdict/default.nix b/pkgs/linguistics/zdict/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "zdict"; diff --git a/pkgs/misc/aamath/default.nix b/pkgs/misc/aamath/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchwebarchive, fetchpatch, readline, ncurses, bison, flex, installShellFiles }: +{ + lib, + stdenv, + fetchwebarchive, + fetchpatch, + readline, + ncurses, + bison, + flex, + installShellFiles, +}: stdenv.mkDerivation (finalAttrs: { pname = "aamath"; @@ -10,10 +20,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-mEP0WIaV4s1Vzl2PWJIdTyVeDmXtlWnh3N3z9o93tjE="; }; - patches = (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/6c3088afddcf34ca2bcc5c209f85f264dcf0bc69/math/aamath/files/patch-expr.h.diff"; - hash = "sha256-JtLcqdBq/88Bemj4NQYnpEVVTUyiCLWX2zE3CuXtRlM="; - }); + patches = ( + fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/6c3088afddcf34ca2bcc5c209f85f264dcf0bc69/math/aamath/files/patch-expr.h.diff"; + hash = "sha256-JtLcqdBq/88Bemj4NQYnpEVVTUyiCLWX2zE3CuXtRlM="; + } + ); patchFlags = [ "-p0" ]; @@ -23,9 +35,16 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "-ltermcap" "-lncurses" ''; - nativeBuildInputs = [ bison flex installShellFiles ]; + nativeBuildInputs = [ + bison + flex + installShellFiles + ]; - buildInputs = [ readline ncurses ]; + buildInputs = [ + readline + ncurses + ]; installPhase = '' install -Dm755 aamath -t $out/bin diff --git a/pkgs/misc/acp/default.nix b/pkgs/misc/acp/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "acp"; diff --git a/pkgs/misc/apibackuper/default.nix b/pkgs/misc/apibackuper/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "apibackuper"; @@ -11,7 +15,13 @@ python3Packages.buildPythonApplication rec { hash = "sha256-2vNuzQK6Wm6DBWRSLFuy6loCLAbcql3CqSktMjGE8JE="; }; - propagatedBuildInputs = with python3Packages; [ bson click lxml requests xmltodict ]; + propagatedBuildInputs = with python3Packages; [ + bson + click + lxml + requests + xmltodict + ]; doCheck = false; diff --git a/pkgs/misc/arduinojson/default.nix b/pkgs/misc/arduinojson/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "arduinojson"; diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, cmake, unzip, ncurses5, SDL, SDL_mixer }: +{ + lib, + stdenv, + fetchurl, + cmake, + unzip, + ncurses5, + SDL, + SDL_mixer, +}: stdenv.mkDerivation (finalAttrs: { pname = "ascii-dash"; @@ -20,12 +29,20 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "data/" "$out/share/ascii-dash/data/" ''; - nativeBuildInputs = [ cmake unzip ]; + nativeBuildInputs = [ + cmake + unzip + ]; - buildInputs = [ ncurses5 SDL SDL_mixer ]; + buildInputs = [ + ncurses5 + SDL + SDL_mixer + ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=mismatched-new-delete" ] - ++ lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=mismatched-new-delete" + ] ++ lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation"; installPhase = '' install -Dm755 main $out/bin/ascii-dash diff --git a/pkgs/misc/bash-completor/default.nix b/pkgs/misc/bash-completor/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, bashInteractive, installShellFiles }: +{ + lib, + stdenv, + fetchFromGitHub, + bashInteractive, + installShellFiles, +}: stdenv.mkDerivation (finalAttrs: { pname = "bash-completor"; @@ -11,7 +17,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Ph+cQaXbykn703cdgkqlXcYMO4vvH6e0hCeecWS/6yA="; }; - nativeBuildInputs = [ bashInteractive installShellFiles ]; + nativeBuildInputs = [ + bashInteractive + installShellFiles + ]; buildFlags = [ "build" ]; diff --git a/pkgs/misc/btpd/default.nix b/pkgs/misc/btpd/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: +{ + lib, + stdenv, + fetchFromGitHub, + openssl, +}: stdenv.mkDerivation (finalAttrs: { pname = "btpd"; diff --git a/pkgs/misc/bwh/default.nix b/pkgs/misc/bwh/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitea, cmake, pkg-config, makeWrapper, SDL2, the-foundation, AppKit }: +{ + lib, + stdenv, + fetchFromGitea, + cmake, + pkg-config, + makeWrapper, + SDL2, + the-foundation, + AppKit, +}: stdenv.mkDerivation rec { pname = "bwh"; @@ -12,9 +22,16 @@ stdenv.mkDerivation rec { hash = "sha256-POKjvUGFS3urc1aqOvfCAApUnRxoZhU725eYRAS4Z2w="; }; - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; - buildInputs = [ SDL2 the-foundation ] ++ lib.optional stdenv.isDarwin AppKit; + buildInputs = [ + SDL2 + the-foundation + ] ++ lib.optional stdenv.isDarwin AppKit; installPhase = lib.optionalString stdenv.isDarwin '' runHook preInstall diff --git a/pkgs/misc/capture2text/default.nix b/pkgs/misc/capture2text/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, qmake, unzip, leptonica, tesseract4, wrapQtAppsHook }: +{ + lib, + stdenv, + fetchurl, + qmake, + unzip, + leptonica, + tesseract4, + wrapQtAppsHook, +}: stdenv.mkDerivation rec { pname = "capture2text"; @@ -33,9 +42,16 @@ stdenv.mkDerivation rec { "pixAverageInRect(binarizeForNegPixs, NULL, &negRect, 0, 255, 1, &pixelAvg)" ''; - buildInputs = [ leptonica tesseract4 ]; + buildInputs = [ + leptonica + tesseract4 + ]; - nativeBuildInputs = [ qmake unzip wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + unzip + wrapQtAppsHook + ]; qmakeFlags = [ "CONFIG+=console" @@ -44,14 +60,17 @@ stdenv.mkDerivation rec { ]; installPhase = - if stdenv.isDarwin then '' - mkdir -p $out/Applications $out/bin - mv Capture2Text_CLI.app $out/Applications - ln -s $out/Applications/Capture2Text_CLI.app/Contents/MacOS/Capture2Text_CLI $out/bin/capture2text - '' else '' - install -Dm755 Capture2Text_CLI -t $out/bin - ln -s $out/bin/Capture2Text_CLI $out/bin/capture2text - ''; + if stdenv.isDarwin then + '' + mkdir -p $out/Applications $out/bin + mv Capture2Text_CLI.app $out/Applications + ln -s $out/Applications/Capture2Text_CLI.app/Contents/MacOS/Capture2Text_CLI $out/bin/capture2text + '' + else + '' + install -Dm755 Capture2Text_CLI -t $out/bin + ln -s $out/bin/Capture2Text_CLI $out/bin/capture2text + ''; meta = with lib; { description = "Capture2Text enables users to quickly OCR a portion of the screen using a keyboard shortcut"; diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, w3m, ueberzug }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + ncurses, + w3m, + ueberzug, +}: stdenv.mkDerivation (finalAttrs: { pname = "cfiles"; @@ -21,7 +29,11 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses w3m ueberzug ]; + buildInputs = [ + ncurses + w3m + ueberzug + ]; makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/misc/chasquid/default.nix b/pkgs/misc/chasquid/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, installShellFiles }: +{ + lib, + stdenv, + fetchFromGitHub, + buildGoModule, + installShellFiles, +}: buildGoModule rec { pname = "chasquid"; @@ -13,7 +19,12 @@ buildGoModule rec { vendorHash = "sha256-dOQJJ2U9Y7zyCNNxUMX85BNMlqn9/KQbZB2CWiYaylc="; - subPackages = [ "." "cmd/chasquid-util" "cmd/smtp-check" "cmd/mda-lmtp" ]; + subPackages = [ + "." + "cmd/chasquid-util" + "cmd/smtp-check" + "cmd/mda-lmtp" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/misc/csv2html/default.nix b/pkgs/misc/csv2html/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, +}: rustPlatform.buildRustPackage rec { pname = "csv2html"; diff --git a/pkgs/misc/csvtools/default.nix b/pkgs/misc/csvtools/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pcre, openssl }: +{ + lib, + stdenv, + fetchFromGitHub, + pcre, + openssl, +}: stdenv.mkDerivation (finalAttrs: { pname = "csvtools"; diff --git a/pkgs/misc/diagon/default.nix b/pkgs/misc/diagon/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, substituteAll, cmake, boost, jre }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + substituteAll, + cmake, + boost, + jre, +}: let json_src = fetchFromGitHub { @@ -39,17 +48,23 @@ stdenv.mkDerivation rec { # Prevent CMake from trying to fetch libraries from GitHub (substituteAll { src = ./deps.patch; - inherit antlr_src antlr_jar json_src kgt_src; + inherit + antlr_src + antlr_jar + json_src + kgt_src + ; }) ]; - nativeBuildInputs = [ cmake jre ]; + nativeBuildInputs = [ + cmake + jre + ]; buildInputs = [ boost ]; - cmakeFlags = [ - (lib.cmakeBool "DIAGON_BUILD_TESTS" true) - ]; + cmakeFlags = [ (lib.cmakeBool "DIAGON_BUILD_TESTS" true) ]; doCheck = true; diff --git a/pkgs/misc/dns-filter/default.nix b/pkgs/misc/dns-filter/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "dns-filter"; diff --git a/pkgs/misc/docker-reg-tool/default.nix b/pkgs/misc/docker-reg-tool/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "docker-reg-tool"; diff --git a/pkgs/misc/docx2csv/default.nix b/pkgs/misc/docx2csv/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "docx2csv"; diff --git a/pkgs/misc/finalcut/default.nix b/pkgs/misc/finalcut/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf-archive, ncurses, pkg-config }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + autoconf-archive, + ncurses, + pkg-config, +}: stdenv.mkDerivation (finalAttrs: { pname = "finalcut"; @@ -11,7 +19,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-fRAzfvuqruveb229fV0XYh764cA26NlDVXxX+3Fobg4="; }; - nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + ]; buildInputs = [ ncurses ]; diff --git a/pkgs/misc/freeopcua/default.nix b/pkgs/misc/freeopcua/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, +}: stdenv.mkDerivation (finalAttrs: { pname = "freeopcua"; @@ -15,9 +21,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost ]; - cmakeFlags = [ - (lib.cmakeBool "SSL_SUPPORT_MBEDTLS" false) - ]; + cmakeFlags = [ (lib.cmakeBool "SSL_SUPPORT_MBEDTLS" false) ]; meta = with lib; { description = "Open Source C++ OPC-UA Server and Client Library"; diff --git a/pkgs/misc/gaiagpsclient/default.nix b/pkgs/misc/gaiagpsclient/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "gaiagpsclient"; @@ -20,7 +24,10 @@ python3Packages.buildPythonApplication rec { pathvalidate ]; - nativeCheckInputs = with python3Packages; [ mock pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ + mock + pytestCheckHook + ]; doCheck = false; diff --git a/pkgs/misc/git-tui/default.nix b/pkgs/misc/git-tui/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ftxui, subprocess }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ftxui, + subprocess, +}: stdenv.mkDerivation rec { pname = "git-tui"; @@ -15,7 +22,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ ftxui subprocess ]; + buildInputs = [ + ftxui + subprocess + ]; meta = with lib; { description = "Collection of human friendly terminal interface for git"; diff --git a/pkgs/misc/graphene/default.nix b/pkgs/misc/graphene/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, perl -, pkg-config -, wget -, db -, libmicrohttpd -, jansson -, tcl +{ + lib, + stdenv, + fetchFromGitHub, + perl, + pkg-config, + wget, + db, + libmicrohttpd, + jansson, + tcl, }: stdenv.mkDerivation (finalAttrs: { @@ -26,11 +27,23 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs . ''; - nativeBuildInputs = [ perl pkg-config wget ]; + nativeBuildInputs = [ + perl + pkg-config + wget + ]; - buildInputs = [ db libmicrohttpd jansson tcl ]; + buildInputs = [ + db + libmicrohttpd + jansson + tcl + ]; - installFlags = [ "prefix=$(out)" "sysconfdir=$(out)/etc" ]; + installFlags = [ + "prefix=$(out)" + "sysconfdir=$(out)/etc" + ]; meta = with lib; { description = "A simple time series database based on BerkleyDB"; diff --git a/pkgs/misc/heapusage/default.nix b/pkgs/misc/heapusage/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation rec { pname = "heapusage"; diff --git a/pkgs/misc/huami-token/default.nix b/pkgs/misc/huami-token/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "huami-token"; @@ -17,10 +22,12 @@ python3Packages.buildPythonApplication rec { installPhase = let - pythonEnv = python3Packages.python.withPackages (p: with p; [ - requests - rich - ]); + pythonEnv = python3Packages.python.withPackages ( + p: with p; [ + requests + rich + ] + ); in '' site_packages=$out/lib/${python3Packages.python.libPrefix}/site-packages diff --git a/pkgs/misc/ionscale/default.nix b/pkgs/misc/ionscale/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "ionscale"; diff --git a/pkgs/misc/ish/default.nix b/pkgs/misc/ish/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: stdenv.mkDerivation (finalAttrs: { pname = "ish"; diff --git a/pkgs/misc/json-tui/default.nix b/pkgs/misc/json-tui/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ftxui, nlohmann_json, libargs }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ftxui, + nlohmann_json, + libargs, +}: stdenv.mkDerivation rec { pname = "json-tui"; @@ -15,7 +23,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ ftxui nlohmann_json libargs ]; + buildInputs = [ + ftxui + nlohmann_json + libargs + ]; meta = with lib; { description = "A JSON terminal UI made in C++"; diff --git a/pkgs/misc/lazyscraper/default.nix b/pkgs/misc/lazyscraper/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonApplication rec { pname = "lazyscraper"; @@ -11,7 +15,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-gnhJB+ZMKQIYZNHMeRrlICgz5UhyHy72Js/I4kbp8Qo="; }; - propagatedBuildInputs = with python3Packages; [ click lxml requests ]; + propagatedBuildInputs = with python3Packages; [ + click + lxml + requests + ]; postInstall = "mv $out/bin/lscraper.py $out/bin/lscraper"; diff --git a/pkgs/misc/libmdbx/default.nix b/pkgs/misc/libmdbx/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, cmake }: +{ + lib, + stdenv, + fetchurl, + cmake, +}: stdenv.mkDerivation rec { pname = "libmdbx"; diff --git a/pkgs/misc/libnbcompat/default.nix b/pkgs/misc/libnbcompat/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, +}: stdenv.mkDerivation (finalAttrs: { pname = "libnbcompat"; diff --git a/pkgs/misc/md2html/default.nix b/pkgs/misc/md2html/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "md2html"; diff --git a/pkgs/misc/messenger-cli/default.nix b/pkgs/misc/messenger-cli/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchurl -, cmake -, meson -, ninja -, pkg-config -, gnunet -, libgcrypt -, libgnunetchat -, libsodium -, ncurses +{ + lib, + stdenv, + fetchurl, + cmake, + meson, + ninja, + pkg-config, + gnunet, + libgcrypt, + libgnunetchat, + libsodium, + ncurses, }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/messenger-gtk/default.nix b/pkgs/misc/messenger-gtk/default.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, fetchurl -, cmake -, meson -, ninja -, pkg-config -, desktop-file-utils -, desktopToDarwinBundle -, gnunet -, gst_all_1 -, gtk3 -, libgcrypt -, libgnunetchat -, libhandy -, libnotify -, libportal -, libportal-gtk3 -, libsodium -, libunistring -, pipewire -, qrencode +{ + lib, + stdenv, + fetchurl, + cmake, + meson, + ninja, + pkg-config, + desktop-file-utils, + desktopToDarwinBundle, + gnunet, + gst_all_1, + gtk3, + libgcrypt, + libgnunetchat, + libhandy, + libnotify, + libportal, + libportal-gtk3, + libsodium, + libunistring, + pipewire, + qrencode, }: stdenv.mkDerivation rec { diff --git a/pkgs/misc/miband4/default.nix b/pkgs/misc/miband4/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, curses-menu }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, + curses-menu, +}: python3Packages.buildPythonApplication rec { pname = "miband4"; @@ -17,11 +23,13 @@ python3Packages.buildPythonApplication rec { installPhase = let - pythonEnv = python3Packages.python.withPackages (p: with p; [ - bluepy - pycrypto - curses-menu - ]); + pythonEnv = python3Packages.python.withPackages ( + p: with p; [ + bluepy + pycrypto + curses-menu + ] + ); in '' site_packages=$out/lib/${python3Packages.python.libPrefix}/site-packages diff --git a/pkgs/misc/mitzasql/default.nix b/pkgs/misc/mitzasql/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "mitzasql"; @@ -19,7 +23,12 @@ python3Packages.buildPythonApplication rec { --replace-fail "appdirs ==1.4.4" "appdirs" ''; - propagatedBuildInputs = with python3Packages; [ appdirs pygments mysql-connector urwid ]; + propagatedBuildInputs = with python3Packages; [ + appdirs + pygments + mysql-connector + urwid + ]; preBuild = '' export HOME=$TMPDIR diff --git a/pkgs/misc/mjs/default.nix b/pkgs/misc/mjs/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ + lib, + stdenv, + fetchFromGitHub, + python3, +}: stdenv.mkDerivation (finalAttrs: { pname = "mjs"; @@ -20,7 +25,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ python3 ]; - makeFlags = [ "DOCKER_GCC=" "DOCKER_CLANG=" ]; + makeFlags = [ + "DOCKER_GCC=" + "DOCKER_CLANG=" + ]; installPhase = '' install -Dm755 build/mjs -t $out/bin diff --git a/pkgs/misc/modbus-tools/default.nix b/pkgs/misc/modbus-tools/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, rustPlatform, fetchFromGitLab, IOKit }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitLab, + IOKit, +}: rustPlatform.buildRustPackage rec { pname = "modbus-tools"; diff --git a/pkgs/misc/modbus_sim_cli/default.nix b/pkgs/misc/modbus_sim_cli/default.nix @@ -1,4 +1,9 @@ -{ lib, python3Packages, fetchFromGitHub, modbus_tk }: +{ + lib, + python3Packages, + fetchFromGitHub, + modbus_tk, +}: python3Packages.buildPythonApplication rec { pname = "modbus_sim_cli"; diff --git a/pkgs/misc/morse-talk/default.nix b/pkgs/misc/morse-talk/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "morse-talk"; @@ -11,7 +16,11 @@ python3Packages.buildPythonApplication rec { hash = "sha256-fvQCETz0Lv0hyfKG7HC2Whm+xoZ9233hF/1ogsfZ10o="; }; - propagatedBuildInputs = with python3Packages; [ matplotlib sounddevice tkinter ]; + propagatedBuildInputs = with python3Packages; [ + matplotlib + sounddevice + tkinter + ]; nativeCheckInputs = with python3Packages; [ nose ]; checkPhase = "nosetests"; diff --git a/pkgs/misc/musig/default.nix b/pkgs/misc/musig/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, buildGoModule -, pkg-config -, portaudio -, testers -, musig +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, + pkg-config, + portaudio, + testers, + musig, }: buildGoModule rec { @@ -27,9 +28,7 @@ buildGoModule rec { ldflags = [ "-X main.VERSION=${version}" ]; - passthru.tests.version = testers.testVersion { - package = musig; - }; + passthru.tests.version = testers.testVersion { package = musig; }; meta = with lib; { description = "A shazam like tool to store songs fingerprints and retrieve them"; diff --git a/pkgs/misc/mysql-to-sqlite3/default.nix b/pkgs/misc/mysql-to-sqlite3/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "mysql-to-sqlite3"; diff --git a/pkgs/misc/nanodns/default.nix b/pkgs/misc/nanodns/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ + lib, + buildGoPackage, + fetchFromGitHub, +}: buildGoPackage rec { pname = "nanodns"; diff --git a/pkgs/misc/nmtree/default.nix b/pkgs/misc/nmtree/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libnbcompat }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libnbcompat, +}: stdenv.mkDerivation (finalAttrs: { pname = "nmtree"; diff --git a/pkgs/misc/objlab/default.nix b/pkgs/misc/objlab/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ghc_filesystem, glfw, libglvnd, libGLU }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ghc_filesystem, + glfw, + libglvnd, + libGLU, +}: stdenv.mkDerivation (finalAttrs: { pname = "objlab"; @@ -27,9 +36,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-fpermissive"; - cmakeFlags = [ - (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") - ]; + cmakeFlags = [ (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") ]; installPhase = '' install -Dm755 objlab -t $out/bin diff --git a/pkgs/misc/ocelotgui/default.nix b/pkgs/misc/ocelotgui/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, desktopToDarwinBundle, mariadb-connector-c, wrapQtAppsHook }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + desktopToDarwinBundle, + mariadb-connector-c, + wrapQtAppsHook, +}: stdenv.mkDerivation (finalAttrs: { pname = "ocelotgui"; @@ -11,8 +19,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-CmLF8HrwdmWatFljSGLpy5YImlBGhjooB1K+axIDWhU="; }; - nativeBuildInputs = [ cmake wrapQtAppsHook ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ mariadb-connector-c ]; diff --git a/pkgs/misc/opcua-stack/default.nix b/pkgs/misc/opcua-stack/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, openssl }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + openssl, +}: stdenv.mkDerivation rec { pname = "opcua-stack"; @@ -19,7 +26,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost openssl ]; + buildInputs = [ + boost + openssl + ]; meta = with lib; { description = "Open Source OPC UA Application Server and OPC UA Client/Server C++ Libraries"; diff --git a/pkgs/misc/playonmac/default.nix b/pkgs/misc/playonmac/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, undmg }: +{ + lib, + stdenv, + fetchurl, + undmg, +}: stdenv.mkDerivation rec { pname = "playonmac"; diff --git a/pkgs/misc/plotjuggler/default.nix b/pkgs/misc/plotjuggler/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, desktopToDarwinBundle -, wrapQtAppsHook -, qtsvg -, qtwebsockets -, qtx11extras -, mosquitto -, libdwarf -, protobuf -, zeromq -, zstd +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + desktopToDarwinBundle, + wrapQtAppsHook, + qtsvg, + qtwebsockets, + qtx11extras, + mosquitto, + libdwarf, + protobuf, + zeromq, + zstd, }: stdenv.mkDerivation rec { @@ -32,11 +33,20 @@ stdenv.mkDerivation rec { --replace-fail "QCoreApplication::applicationDirPath()" "\"$out/lib/plugins\"" ''; - nativeBuildInputs = [ cmake wrapQtAppsHook ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; - buildInputs = [ qtsvg qtwebsockets mosquitto libdwarf protobuf zeromq zstd ] - ++ lib.optionals stdenv.isLinux [ qtx11extras ]; + buildInputs = [ + qtsvg + qtwebsockets + mosquitto + libdwarf + protobuf + zeromq + zstd + ] ++ lib.optionals stdenv.isLinux [ qtx11extras ]; meta = with lib; { description = "The Time Series Visualization Tool"; diff --git a/pkgs/misc/pnoise/default.nix b/pkgs/misc/pnoise/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonApplication rec { pname = "pnoise"; diff --git a/pkgs/misc/ptunnel/default.nix b/pkgs/misc/ptunnel/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, libpcap }: +{ + lib, + stdenv, + fetchurl, + libpcap, +}: stdenv.mkDerivation (finalAttrs: { pname = "ptunnel"; diff --git a/pkgs/misc/pvs-studio/default.nix b/pkgs/misc/pvs-studio/default.nix @@ -1,12 +1,18 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - suffix = { - x86_64-linux = "x86_64"; - x86_64-darwin = "macos"; - }.${system} or throwSystem; + suffix = + { + x86_64-linux = "x86_64"; + x86_64-darwin = "macos"; + } + .${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "pvs-studio"; @@ -14,10 +20,12 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://cdn.pvs-studio.com/pvs-studio-${finalAttrs.version}-${suffix}.tgz"; - hash = { - x86_64-linux = "sha256-lUmNWB3dckCKV7EFZDPGZJseqfXksYtRwCXuIE3Jt64="; - x86_64-darwin = "sha256-4ws+3ya+vvRWJwZw7sfygIe7d/h80ynoe2EMeCBdtks="; - }.${system} or throwSystem; + hash = + { + x86_64-linux = "sha256-lUmNWB3dckCKV7EFZDPGZJseqfXksYtRwCXuIE3Jt64="; + x86_64-darwin = "sha256-4ws+3ya+vvRWJwZw7sfygIe7d/h80ynoe2EMeCBdtks="; + } + .${system} or throwSystem; }; installPhase = "sh ./install.sh $out"; @@ -27,7 +35,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.viva64.com/en/pvs-studio/"; license = licenses.unfree; maintainers = [ maintainers.sikmir ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + ]; skip.ci = true; }; }) diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, +}: stdenv.mkDerivation (finalAttrs: { pname = "how-to-use-pvs-studio-free"; diff --git a/pkgs/misc/qasync/default.nix b/pkgs/misc/qasync/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "qasync"; diff --git a/pkgs/misc/qoiview/default.nix b/pkgs/misc/qoiview/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, xorg, libglvnd }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + xorg, + libglvnd, +}: stdenv.mkDerivation (finalAttrs: { pname = "qoiview"; @@ -13,22 +20,28 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isLinux (with xorg; [ - "-I${libX11.dev}/include" - "-I${xorgproto}/include" - "-I${libXi.dev}/include" - "-I${libXext.dev}/include" - "-I${libXfixes.dev}/include" - "-I${libXcursor.dev}/include" - "-I${libglvnd.dev}/include" - ]); + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isLinux ( + with xorg; + [ + "-I${libX11.dev}/include" + "-I${xorgproto}/include" + "-I${libXi.dev}/include" + "-I${libXext.dev}/include" + "-I${libXfixes.dev}/include" + "-I${libXcursor.dev}/include" + "-I${libglvnd.dev}/include" + ] + ); - NIX_LDFLAGS = lib.optionals stdenv.isLinux (with xorg; [ - "-L${libX11}/lib" - "-L${libXi}/lib" - "-L${libXcursor}/lib" - "-L${libglvnd}/lib" - ]); + NIX_LDFLAGS = lib.optionals stdenv.isLinux ( + with xorg; + [ + "-L${libX11}/lib" + "-L${libXi}/lib" + "-L${libXcursor}/lib" + "-L${libglvnd}/lib" + ] + ); installPhase = '' install -Dm755 qoiview -t $out/bin diff --git a/pkgs/misc/repolocli/default.nix b/pkgs/misc/repolocli/default.nix @@ -1,4 +1,14 @@ -{ stdenv, lib, rustPlatform, fetchFromSourcehut, curl, libiconv, openssl, pkg-config, makeWrapper }: +{ + stdenv, + lib, + rustPlatform, + fetchFromSourcehut, + curl, + libiconv, + openssl, + pkg-config, + makeWrapper, +}: rustPlatform.buildRustPackage rec { pname = "repolocli"; @@ -14,10 +24,17 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./cargo-lock.patch ]; cargoHash = "sha256-TeOxfD6mqihBalx9lwP7qH2/LaXnPVCkTP/f16rpjJM="; - nativeBuildInputs = [ pkg-config makeWrapper ]; - - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ curl libiconv ]; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = + lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + curl + libiconv + ]; postInstall = '' install -Dm644 repolocli.toml -t $out/etc/xdg diff --git a/pkgs/misc/rhttp/default.nix b/pkgs/misc/rhttp/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "rhttp"; diff --git a/pkgs/misc/riffraff/default.nix b/pkgs/misc/riffraff/default.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: buildGoModule rec { pname = "riffraff"; diff --git a/pkgs/misc/rst2txt/default.nix b/pkgs/misc/rst2txt/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "rst2txt"; diff --git a/pkgs/misc/sdorfehs/default.nix b/pkgs/misc/sdorfehs/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + xorg, +}: stdenv.mkDerivation (finalAttrs: { pname = "sdorfehs"; @@ -13,7 +19,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = with xorg; [ libX11 libXft libXrandr libXtst libXi ]; + buildInputs = with xorg; [ + libX11 + libXft + libXrandr + libXtst + libXi + ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/misc/serial-studio/bin.nix b/pkgs/misc/serial-studio/bin.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchfromgh, unzip, makeWrapper }: +{ + lib, + stdenv, + fetchfromgh, + unzip, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "serial-studio-bin"; @@ -14,7 +20,10 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "."; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ + unzip + makeWrapper + ]; installPhase = '' runHook preInstall @@ -30,7 +39,10 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; maintainers = [ maintainers.sikmir ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; skip.ci = true; }; }) diff --git a/pkgs/misc/serverpp/default.nix b/pkgs/misc/serverpp/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gsl-lite }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + gsl-lite, +}: stdenv.mkDerivation (finalAttrs: { pname = "serverpp"; @@ -13,7 +20,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost gsl-lite ]; + buildInputs = [ + boost + gsl-lite + ]; meta = with lib; { description = "A C++ library for basic network server handling"; diff --git a/pkgs/misc/shellprof/default.nix b/pkgs/misc/shellprof/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "shellprof"; diff --git a/pkgs/misc/socketcand/default.nix b/pkgs/misc/socketcand/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, libconfig }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + installShellFiles, + libconfig, +}: stdenv.mkDerivation rec { pname = "socketcand"; @@ -11,7 +18,10 @@ stdenv.mkDerivation rec { hash = "sha256-Fsx5eIbiIYctfRcEU5iyG2hKcSV/7R7EyR6WlVFDTCk="; }; - nativeBuildInputs = [ autoreconfHook installShellFiles ]; + nativeBuildInputs = [ + autoreconfHook + installShellFiles + ]; buildInputs = [ libconfig ]; @@ -25,7 +35,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Server to access CAN sockets over ASCII protocol"; inherit (src.meta) homepage; - license = with licenses; [ gpl2Only bsd3 ]; + license = with licenses; [ + gpl2Only + bsd3 + ]; platforms = platforms.linux; maintainers = [ maintainers.sikmir ]; skip.ci = stdenv.isDarwin; diff --git a/pkgs/misc/subprocess/default.nix b/pkgs/misc/subprocess/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cxxtest, python3 }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + cxxtest, + python3, +}: stdenv.mkDerivation rec { pname = "subprocess"; @@ -11,7 +18,10 @@ stdenv.mkDerivation rec { hash = "sha256-Tgmihv7SJfYpOYHvtuE8rgFzUHyl4bJh9W5CSqotVMg="; }; - nativeBuildInputs = [ cmake cxxtest ]; + nativeBuildInputs = [ + cmake + cxxtest + ]; buildInputs = [ python3 ]; diff --git a/pkgs/misc/tabiew/default.nix b/pkgs/misc/tabiew/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, +}: rustPlatform.buildRustPackage rec { pname = "tabiew"; diff --git a/pkgs/misc/tcvt/default.nix b/pkgs/misc/tcvt/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchgit, python3 }: +{ + lib, + stdenv, + fetchgit, + python3, +}: stdenv.mkDerivation { pname = "tcvt"; diff --git a/pkgs/misc/telegabber/default.nix b/pkgs/misc/telegabber/default.nix @@ -1,4 +1,13 @@ -{ lib, buildGoModule, fetchFromGitea, openssl, tdlib, zlib, testers, telegabber }: +{ + lib, + buildGoModule, + fetchFromGitea, + openssl, + tdlib, + zlib, + testers, + telegabber, +}: buildGoModule rec { pname = "telegabber"; @@ -14,15 +23,17 @@ buildGoModule rec { vendorHash = "sha256-3qSa6yJXSjrmTIBrulCnZMZzqNtpkzpzWeYAzHl8uUM="; - buildInputs = [ openssl tdlib zlib ]; + buildInputs = [ + openssl + tdlib + zlib + ]; postInstall = '' install -Dm644 config_schema.json config.yml.example -t $out/share/telegabber ''; - passthru.tests.version = testers.testVersion { - package = telegabber; - }; + passthru.tests.version = testers.testVersion { package = telegabber; }; meta = with lib; { description = "XMPP/Jabber transport to Telegram network"; diff --git a/pkgs/misc/telegram-send/default.nix b/pkgs/misc/telegram-send/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ + lib, + fetchFromGitHub, + fetchpatch, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "telegram-send"; @@ -18,7 +23,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ pip ]; - propagatedBuildInputs = with python3Packages; [ appdirs colorama python-telegram-bot ]; + propagatedBuildInputs = with python3Packages; [ + appdirs + colorama + python-telegram-bot + ]; doCheck = false; diff --git a/pkgs/misc/telnetpp/default.nix b/pkgs/misc/telnetpp/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, doxygen, boost, gsl-lite, gtest, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + doxygen, + boost, + gsl-lite, + gtest, + zlib, +}: stdenv.mkDerivation (finalAttrs: { pname = "telnetpp"; @@ -11,14 +21,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-BfRu0dv2d7qwz2jTdaQczOQQBO3qmO1E754hWqxT66g="; }; - nativeBuildInputs = [ cmake doxygen ]; - - buildInputs = [ boost gsl-lite gtest zlib ]; + nativeBuildInputs = [ + cmake + doxygen + ]; - cmakeFlags = [ - (lib.cmakeBool "TELNETPP_WITH_ZLIB" true) + buildInputs = [ + boost + gsl-lite + gtest + zlib ]; + cmakeFlags = [ (lib.cmakeBool "TELNETPP_WITH_ZLIB" true) ]; + meta = with lib; { description = "A C++ library for interacting with Telnet streams"; inherit (finalAttrs.src.meta) homepage; diff --git a/pkgs/misc/tinyflux/default.nix b/pkgs/misc/tinyflux/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "tinyflux"; diff --git a/pkgs/misc/tlstunnel/default.nix b/pkgs/misc/tlstunnel/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, ocamlPackages }: +{ + lib, + fetchFromGitHub, + ocamlPackages, +}: ocamlPackages.buildDunePackage rec { pname = "tlstunnel"; diff --git a/pkgs/misc/turbo/default.nix b/pkgs/misc/turbo/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, file, tvision }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + file, + tvision, +}: stdenv.mkDerivation rec { pname = "turbo"; @@ -18,9 +25,7 @@ stdenv.mkDerivation rec { tvision ]; - cmakeFlags = [ - (lib.cmakeBool "TURBO_USE_SYSTEM_TVISION" true) - ]; + cmakeFlags = [ (lib.cmakeBool "TURBO_USE_SYSTEM_TVISION" true) ]; meta = with lib; { description = "An experimental text editor based on Scintilla and Turbo Vision"; diff --git a/pkgs/misc/tvision/default.nix b/pkgs/misc/tvision/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ncurses }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ncurses, +}: stdenv.mkDerivation rec { pname = "tvision"; @@ -15,9 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - cmakeFlags = [ - (lib.cmakeBool "TV_BUILD_EXAMPLES" false) - ]; + cmakeFlags = [ (lib.cmakeBool "TV_BUILD_EXAMPLES" false) ]; meta = with lib; { description = "A modern port of Turbo Vision 2.0, the classical framework for text-based user interfaces"; diff --git a/pkgs/misc/wik/default.nix b/pkgs/misc/wik/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "wik"; @@ -14,7 +19,10 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ flit ]; - propagatedBuildInputs = with python3Packages; [ beautifulsoup4 requests ]; + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + requests + ]; meta = with lib; { description = "wik is use to get information about anything on the shell using Wikipedia"; diff --git a/pkgs/misc/worm/default.nix b/pkgs/misc/worm/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, nimPackages, fetchFromGitHub, pkg-config, xorg }: +{ + lib, + stdenv, + nimPackages, + fetchFromGitHub, + pkg-config, + xorg, +}: nimPackages.buildNimPackage rec { pname = "worm"; @@ -14,12 +21,19 @@ nimPackages.buildNimPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = with nimPackages; [ - pixie - regex - unicodedb - x11 - ] ++ (with xorg; [ libX11 libXft libXinerama ]); + buildInputs = + with nimPackages; + [ + pixie + regex + unicodedb + x11 + ] + ++ (with xorg; [ + libX11 + libXft + libXinerama + ]); postInstall = '' install -Dm644 assets/worm.desktop -t $out/share/applications diff --git a/pkgs/misc/wptools/default.nix b/pkgs/misc/wptools/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "wptools"; diff --git a/pkgs/misc/xfractint/default.nix b/pkgs/misc/xfractint/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, xorg }: +{ + lib, + stdenv, + fetchurl, + xorg, +}: stdenv.mkDerivation (finalAttrs: { pname = "xfractint"; @@ -9,7 +14,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TlQBz+wOb/odqzjjwXfhRFdyCWy+VUIAxRLt7qI8R60="; }; - buildInputs = [ xorg.libX11 xorg.libXft ]; + buildInputs = [ + xorg.libX11 + xorg.libXft + ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/misc/xtr/default.nix b/pkgs/misc/xtr/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Foundation }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + libiconv, + Foundation, +}: rustPlatform.buildRustPackage rec { pname = "xtr"; @@ -17,7 +24,10 @@ rustPlatform.buildRustPackage rec { ln -s ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Foundation + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-incompatible-function-pointer-types"; @@ -26,7 +36,10 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Translation tools for rust"; inherit (src.meta) homepage; - license = with licenses; [ agpl3Only mit ]; + license = with licenses; [ + agpl3Only + mit + ]; maintainers = [ maintainers.sikmir ]; mainProgram = "xtr"; }; diff --git a/pkgs/misc/youtimetrack/default.nix b/pkgs/misc/youtimetrack/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "youtimetrack"; diff --git a/pkgs/mqtt/emitter/default.nix b/pkgs/mqtt/emitter/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "emitter"; @@ -19,9 +23,7 @@ buildGoModule rec { doCheck = false; - checkFlags = [ - "-skip=TestStatsd_Configure" - ]; + checkFlags = [ "-skip=TestStatsd_Configure" ]; meta = with lib; { description = "High performance, distributed and low latency publish-subscribe platform"; diff --git a/pkgs/mqtt/go-mqtt-to-influxdb/default.nix b/pkgs/mqtt/go-mqtt-to-influxdb/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "go-mqtt-to-influxdb"; diff --git a/pkgs/mqtt/ioxy/default.nix b/pkgs/mqtt/ioxy/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "ioxy"; diff --git a/pkgs/mqtt/janus-mqtt-proxy/default.nix b/pkgs/mqtt/janus-mqtt-proxy/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ + lib, + fetchFromGitHub, + buildGoPackage, +}: buildGoPackage rec { pname = "janus-mqtt-proxy"; diff --git a/pkgs/mqtt/libumqtt/default.nix b/pkgs/mqtt/libumqtt/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libev, lua, openssl, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libev, + lua, + openssl, + zlib, +}: stdenv.mkDerivation (finalAttrs: { pname = "libumqtt"; @@ -19,7 +28,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ libev lua openssl zlib ]; + buildInputs = [ + libev + lua + openssl + zlib + ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=misleading-indentation"; diff --git a/pkgs/mqtt/mongoose/default.nix b/pkgs/mqtt/mongoose/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, mbedtls }: +{ + lib, + stdenv, + fetchFromGitHub, + mbedtls, +}: stdenv.mkDerivation (finalAttrs: { pname = "mongoose"; diff --git a/pkgs/mqtt/mproxy/default.nix b/pkgs/mqtt/mproxy/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "mproxy"; diff --git a/pkgs/mqtt/mqcontrol/default.nix b/pkgs/mqtt/mqcontrol/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "mqcontrol"; diff --git a/pkgs/mqtt/mqtt-benchmark/default.nix b/pkgs/mqtt/mqtt-benchmark/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "mqtt-benchmark"; diff --git a/pkgs/mqtt/mqtt-c/default.nix b/pkgs/mqtt/mqtt-c/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cmocka }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + cmocka, +}: stdenv.mkDerivation (finalAttrs: { pname = "MQTT-C"; diff --git a/pkgs/mqtt/mqtt-cli/default.nix b/pkgs/mqtt/mqtt-cli/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchfromgh, jre, makeWrapper }: +{ + lib, + stdenv, + fetchfromgh, + jre, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "mqtt-cli"; diff --git a/pkgs/mqtt/mqtt-explorer/default.nix b/pkgs/mqtt/mqtt-explorer/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, appimageTools, fetchfromgh, undmg, makeWrapper }: +{ + lib, + stdenv, + appimageTools, + fetchfromgh, + undmg, + makeWrapper, +}: let pname = "mqtt-explorer"; @@ -20,12 +27,18 @@ let hash = "sha256-Cf2qgoxaNGpcaW0oA605vd5zQiZX1m54ccW8Tbe8qvU="; }; }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = + srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); appimageContents = appimageTools.extract { inherit pname version src; }; linux = appimageTools.wrapType2 rec { - inherit pname version src meta; + inherit + pname + version + src + meta + ; extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} @@ -39,9 +52,17 @@ let }; darwin = stdenv.mkDerivation { - inherit pname version src meta; + inherit + pname + version + src + meta + ; - nativeBuildInputs = [ undmg makeWrapper ]; + nativeBuildInputs = [ + undmg + makeWrapper + ]; sourceRoot = "."; @@ -65,6 +86,4 @@ let skip.ci = true; }; in -if stdenv.isDarwin -then darwin -else linux +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/mqtt/mqtt-launcher/default.nix b/pkgs/mqtt/mqtt-launcher/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "mqtt-launcher"; diff --git a/pkgs/mqtt/mqtt-proxy/default.nix b/pkgs/mqtt/mqtt-proxy/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, cyrus_sasl }: +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, + cyrus_sasl, +}: buildGoModule rec { pname = "mqtt-proxy"; diff --git a/pkgs/mqtt/mqtt-shell/default.nix b/pkgs/mqtt/mqtt-shell/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ + stdenv, + lib, + fetchFromGitHub, + buildGoModule, +}: buildGoModule rec { pname = "mqtt-shell"; diff --git a/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix b/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "mqtt-to-influxdb-forwarder"; @@ -19,7 +24,10 @@ python3Packages.buildPythonApplication rec { dontUseSetuptoolsBuild = true; dontUseSetuptoolsCheck = true; - propagatedBuildInputs = with python3Packages; [ paho-mqtt influxdb ]; + propagatedBuildInputs = with python3Packages; [ + paho-mqtt + influxdb + ]; installPhase = '' install -Dm755 forwarder.py $out/bin/mqtt-to-influxdb-forwarder diff --git a/pkgs/mqtt/mqtt-to-influxdb/default.nix b/pkgs/mqtt/mqtt-to-influxdb/default.nix @@ -1,20 +1,21 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, spdlog -, libyamlcpp -, libcpr -, cxxopts -, nlohmann_json -, influxdb-cxx -, boost -, curl -, paho-mqtt-cpp -, paho-mqtt-c -, stduuid -, microsoft_gsl -, catch2 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + spdlog, + libyamlcpp, + libcpr, + cxxopts, + nlohmann_json, + influxdb-cxx, + boost, + curl, + paho-mqtt-cpp, + paho-mqtt-c, + stduuid, + microsoft_gsl, + catch2, }: stdenv.mkDerivation (finalAttrs: { @@ -29,18 +30,20 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - postPatch = '' - substituteInPlace src/app/CMakeLists.txt \ - --replace-fail "/usr" "$out" - sed -i '1i #include <iostream>' src/app-validate/main.cpp - substituteInPlace src/app-validate/main.cpp \ - --replace-fail "OptionParseException" "exceptions::parsing" - substituteInPlace src/app/main.cpp \ - --replace-fail "OptionParseException" "exceptions::parsing" - '' + lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/libmqtt-to-influxdb/CMakeLists.txt \ - --replace-fail "stdc++fs" "" - ''; + postPatch = + '' + substituteInPlace src/app/CMakeLists.txt \ + --replace-fail "/usr" "$out" + sed -i '1i #include <iostream>' src/app-validate/main.cpp + substituteInPlace src/app-validate/main.cpp \ + --replace-fail "OptionParseException" "exceptions::parsing" + substituteInPlace src/app/main.cpp \ + --replace-fail "OptionParseException" "exceptions::parsing" + '' + + lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/libmqtt-to-influxdb/CMakeLists.txt \ + --replace-fail "stdc++fs" "" + ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/mqtt/nanosdk/default.nix b/pkgs/mqtt/nanosdk/default.nix @@ -11,4 +11,3 @@ nng.overrideAttrs (super: rec { fetchSubmodules = true; }; }) - diff --git a/pkgs/mqtt/rumqtt/default.nix b/pkgs/mqtt/rumqtt/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, cmake, Security }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + cmake, + Security, +}: rustPlatform.buildRustPackage rec { pname = "rumqtt"; diff --git a/pkgs/nakarte/elevation_server/default.nix b/pkgs/nakarte/elevation_server/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, lz4 }: +{ + lib, + stdenv, + fetchFromGitHub, + buildGoPackage, + lz4, +}: buildGoPackage rec { pname = "elevation_server"; @@ -13,7 +19,10 @@ buildGoPackage rec { goPackagePath = "github.com/wladich/elevation_server"; - subPackages = [ "cmd/elevation_server" "cmd/make_data" ]; + subPackages = [ + "cmd/elevation_server" + "cmd/make_data" + ]; buildInputs = [ lz4 ]; diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, python3Packages -, fetchFromGitHub -, gobject-introspection -, pango -, thinplatespline -, maprec -, ozi_map -, pyimagequant -, wrapGAppsHook +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + gobject-introspection, + pango, + thinplatespline, + maprec, + ozi_map, + pyimagequant, + wrapGAppsHook, }: python3Packages.buildPythonApplication rec { @@ -30,9 +31,15 @@ python3Packages.buildPythonApplication rec { --replace-fail " @ git+https://github.com/wladich/pyimagequant.git" "" ''; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; - buildInputs = [ gobject-introspection pango ]; + buildInputs = [ + gobject-introspection + pango + ]; propagatedBuildInputs = with python3Packages; [ pyyaml diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, thinplatespline }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + thinplatespline, +}: python3Packages.buildPythonPackage rec { pname = "maprec"; @@ -16,7 +22,11 @@ python3Packages.buildPythonPackage rec { --replace-fail " @ git+https://github.com/wladich/thinplatespline.git" "" ''; - propagatedBuildInputs = with python3Packages; [ pyyaml pyproj thinplatespline ]; + propagatedBuildInputs = with python3Packages; [ + pyyaml + pyproj + thinplatespline + ]; doCheck = false; diff --git a/pkgs/nakarte/nakarte/default.nix b/pkgs/nakarte/nakarte/default.nix @@ -1,4 +1,9 @@ -{ lib, mkYarnPackage, fetchFromGitHub, secretsConfig ? null }: +{ + lib, + mkYarnPackage, + fetchFromGitHub, + secretsConfig ? null, +}: let pname = "nakarte"; version = "2022-12-28"; diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, maprec }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + maprec, +}: python3Packages.buildPythonPackage rec { pname = "ozi_map"; @@ -16,7 +22,10 @@ python3Packages.buildPythonPackage rec { --replace-fail " @ git+https://github.com/wladich/maprec.git" "" ''; - propagatedBuildInputs = with python3Packages; [ maprec pyproj ]; + propagatedBuildInputs = with python3Packages; [ + maprec + pyproj + ]; doCheck = false; diff --git a/pkgs/nakarte/pyimagequant/default.nix b/pkgs/nakarte/pyimagequant/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "pyimagequant"; diff --git a/pkgs/nakarte/thinplatespline/default.nix b/pkgs/nakarte/thinplatespline/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "thinplatespline"; diff --git a/pkgs/nakarte/tracks_storage_server/default.nix b/pkgs/nakarte/tracks_storage_server/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, python2Packages -, postgresql -, openssl +{ + lib, + stdenv, + fetchFromGitHub, + python2Packages, + postgresql, + openssl, }: let psycopg2 = python2Packages.buildPythonPackage rec { @@ -22,7 +23,10 @@ let meta = with lib; { description = "PostgreSQL database adapter for the Python programming language"; - license = with licenses; [ gpl2 zpl20 ]; + license = with licenses; [ + gpl2 + zpl20 + ]; }; }; in @@ -42,13 +46,15 @@ python2Packages.buildPythonApplication rec { installPhase = let - pythonEnv = python2Packages.python.withPackages (p: with p; [ - msgpack - (protobuf.overrideAttrs (old: { - dontUsePythonImportsCheck = true; - })) - psycopg2 - ]); + pythonEnv = python2Packages.python.withPackages ( + p: with p; [ + msgpack + (protobuf.overrideAttrs (old: { + dontUsePythonImportsCheck = true; + })) + psycopg2 + ] + ); in '' site_packages=$out/lib/${python2Packages.python.libPrefix}/site-packages diff --git a/pkgs/osm/cykhash/default.nix b/pkgs/osm/cykhash/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "cykhash"; @@ -13,7 +17,10 @@ python3Packages.buildPythonPackage rec { nativeBuildInputs = with python3Packages; [ cython ]; - nativeCheckInputs = with python3Packages; [ numpy pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ + numpy + pytestCheckHook + ]; doCheck = false; diff --git a/pkgs/osm/gcgn-converter/default.nix b/pkgs/osm/gcgn-converter/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ + lib, + stdenv, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "gcgn-converter"; @@ -17,13 +22,15 @@ python3Packages.buildPythonApplication rec { installPhase = let - pythonEnv = python3Packages.python.withPackages (p: with p; [ - camelot - pypdf - geojson - beautifulsoup4 - tqdm - ]); + pythonEnv = python3Packages.python.withPackages ( + p: with p; [ + camelot + pypdf + geojson + beautifulsoup4 + tqdm + ] + ); in '' site_packages=$out/lib/${python3Packages.python.libPrefix}/site-packages diff --git a/pkgs/osm/level0/default.nix b/pkgs/osm/level0/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenvNoCC, fetchFromGitHub, conf ? null }: +{ + lib, + stdenvNoCC, + fetchFromGitHub, + conf ? null, +}: stdenvNoCC.mkDerivation rec { pname = "level0"; diff --git a/pkgs/osm/map-machine/default.nix b/pkgs/osm/map-machine/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, portolan }: +{ + lib, + fetchFromGitHub, + python3Packages, + portolan, +}: python3Packages.buildPythonApplication rec { pname = "map-machine"; @@ -27,9 +32,7 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; preCheck = "export PATH=$PATH:$out/bin"; - disabledTests = [ - "test_tile" - ]; + disabledTests = [ "test_tile" ]; meta = with lib; { description = "A simple renderer for OpenStreetMap with custom icons"; diff --git a/pkgs/osm/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, qt5 }: +{ + lib, + fetchFromGitHub, + python3Packages, + qt5, +}: python3Packages.buildPythonApplication rec { pname = "map-stylizer"; @@ -28,7 +33,9 @@ python3Packages.buildPythonApplication rec { substituteInPlace $site_packages/src/core/constants.py \ --replace-fail "src/resources" "$site_packages/src/resources" - makeWrapper ${(python3Packages.python.withPackages (ps: [ ps.pyqt5 ])).interpreter} $out/bin/map-stylizer \ + makeWrapper ${ + (python3Packages.python.withPackages (ps: [ ps.pyqt5 ])).interpreter + } $out/bin/map-stylizer \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ --add-flags "$site_packages/main.py" ''; diff --git a/pkgs/osm/maperitive/default.nix b/pkgs/osm/maperitive/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }: +{ + lib, + stdenv, + fetchurl, + unzip, + mono, + gtk2, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "maperitive"; @@ -9,7 +17,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yhslRj4CjUY0kviQTI7z8LvSiWvjf7K8+tDMeA9zNEk="; }; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ + unzip + makeWrapper + ]; installPhase = '' mkdir -p $out/opt/maperitive diff --git a/pkgs/osm/memphis/default.nix b/pkgs/osm/memphis/default.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, gtk-doc -, pkg-config -, cairo -, expat -, glib +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + gtk-doc, + pkg-config, + cairo, + expat, + glib, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, expat, lz4, zlib }: +{ + lib, + stdenv, + fetchurl, + expat, + lz4, + zlib, +}: stdenv.mkDerivation (finalAttrs: { pname = "osm-3s"; @@ -9,12 +16,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-kvNKEI+n0hCil3/84VI8eGD7kvxEJsYoBCtcxj6wtIk="; }; - buildInputs = [ expat lz4 zlib ]; - - configureFlags = [ - (lib.enableFeature true "lz4") + buildInputs = [ + expat + lz4 + zlib ]; + configureFlags = [ (lib.enableFeature true "lz4") ]; + meta = with lib; { description = "A database engine to query the OpenStreetMap data"; homepage = "http://overpass-api.de/"; diff --git a/pkgs/osm/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, boost -, bzip2 -, expat -, gdal -, libosmium -, protozero -, sqlite -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + bzip2, + expat, + gdal, + libosmium, + protozero, + sqlite, + zlib, }: stdenv.mkDerivation { diff --git a/pkgs/osm/osm-python-tools/default.nix b/pkgs/osm/osm-python-tools/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "osm-python-tools"; diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, bzip2 -, expat -, libosmium -, lua -, protozero -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + bzip2, + expat, + libosmium, + lua, + protozero, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -32,9 +33,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - cmakeFlags = [ - (lib.cmakeBool "BUILD_TESTS" true) - ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_TESTS" true) ]; doCheck = true; diff --git a/pkgs/osm/osm2geojson/default.nix b/pkgs/osm/osm2geojson/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "osm2geojson"; diff --git a/pkgs/osm/osmcoastline/default.nix b/pkgs/osm/osmcoastline/default.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, bzip2 -, expat -, gdal -, geos -, libosmium -, protozero -, sqlite -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + bzip2, + expat, + gdal, + geos, + libosmium, + protozero, + sqlite, + zlib, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/osm/osmdbt/default.nix b/pkgs/osm/osmdbt/default.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pandoc -, boost -, bzip2 -, expat -, libosmium -, libpqxx -, libyamlcpp -, protozero -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pandoc, + boost, + bzip2, + expat, + libosmium, + libpqxx, + libyamlcpp, + protozero, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -24,7 +25,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hXwWOOfvBrJqjMXsG/59J83PHwZqIKm+2B00QYoJD80="; }; - nativeBuildInputs = [ cmake pandoc ]; + nativeBuildInputs = [ + cmake + pandoc + ]; buildInputs = [ boost @@ -37,9 +41,7 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; - cmakeFlags = [ - (lib.cmakeBool "BUILD_PLUGIN" false) - ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_PLUGIN" false) ]; meta = with lib; { description = "OSM Database Replication Tools"; diff --git a/pkgs/osm/osmium-surplus/default.nix b/pkgs/osm/osmium-surplus/default.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, boost -, bzip2 -, expat -, fmt -, gdal -, libosmium -, protozero -, sqlite -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + bzip2, + expat, + fmt, + gdal, + libosmium, + protozero, + sqlite, + zlib, }: stdenv.mkDerivation { @@ -41,7 +42,10 @@ stdenv.mkDerivation { meta = with lib; { description = "Collection of assorted small programs based on the Osmium framework"; homepage = "https://github.com/osmcode/osmium-surplus"; - license = [ licenses.gpl3Plus licenses.boost ]; + license = [ + licenses.gpl3Plus + licenses.boost + ]; maintainers = [ maintainers.sikmir ]; platforms = platforms.unix; }; diff --git a/pkgs/osm/osmosis/default.nix b/pkgs/osm/osmosis/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchfromgh, jre }: +{ + lib, + stdenv, + fetchfromgh, + jre, +}: stdenv.mkDerivation (finalAttrs: { pname = "osmosis"; diff --git a/pkgs/osm/osmwalkthrough/default.nix b/pkgs/osm/osmwalkthrough/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "osmwalkthrough"; @@ -17,11 +21,13 @@ python3Packages.buildPythonApplication rec { installPhase = let - pythonEnv = python3Packages.python.withPackages (p: with p; [ - geographiclib - geopy - networkx - ]); + pythonEnv = python3Packages.python.withPackages ( + p: with p; [ + geographiclib + geopy + networkx + ] + ); in '' site_packages=$out/lib/${python3Packages.python.libPrefix}/site-packages diff --git a/pkgs/osm/overpassforge/default.nix b/pkgs/osm/overpassforge/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "overpassforge"; diff --git a/pkgs/osm/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, python3Packages, fetchurl, installShellFiles }: +{ + lib, + stdenv, + python3Packages, + fetchurl, + installShellFiles, +}: python3Packages.buildPythonApplication rec { pname = "phyghtmap"; @@ -15,7 +21,12 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = with python3Packages; [ beautifulsoup4 lxml matplotlib numpy ]; + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + lxml + matplotlib + numpy + ]; postInstall = "installManPage docs/phyghtmap.1"; diff --git a/pkgs/osm/planetiler/default.nix b/pkgs/osm/planetiler/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }: +{ + lib, + stdenv, + fetchfromgh, + unzip, + jre, + makeWrapper, +}: stdenv.mkDerivation (finalAttrs: { pname = "planetiler"; diff --git a/pkgs/osm/polytiles/default.nix b/pkgs/osm/polytiles/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, python3Packages, sqlite }: +{ + lib, + fetchFromGitHub, + python3Packages, + sqlite, +}: python3Packages.buildPythonApplication rec { pname = "polytiles"; diff --git a/pkgs/osm/prettymapp/default.nix b/pkgs/osm/prettymapp/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "prettymapp"; @@ -15,7 +20,10 @@ python3Packages.buildPythonPackage rec { propagatedBuildInputs = with python3Packages; [ osmnx ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook mock ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + mock + ]; disabledTests = [ "test_get_aoi_from_user_input_address" diff --git a/pkgs/osm/pyrobuf/default.nix b/pkgs/osm/pyrobuf/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "pyrobuf"; @@ -11,7 +15,10 @@ python3Packages.buildPythonPackage rec { hash = "sha256-7NEzRM9B/9f5ODNzDKws7t/9gqbJK7T9AuET+pT26P0="; }; - nativeBuildInputs = with python3Packages; [ cython pytest-runner ]; + nativeBuildInputs = with python3Packages; [ + cython + pytest-runner + ]; propagatedBuildInputs = with python3Packages; [ jinja2 ]; diff --git a/pkgs/osm/pyrosm/default.nix b/pkgs/osm/pyrosm/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, cykhash, pyrobuf }: +{ + lib, + stdenv, + python3Packages, + fetchFromGitHub, + cykhash, + pyrobuf, +}: python3Packages.buildPythonPackage rec { pname = "pyrosm"; diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, curl, SDL2, SDL2_image }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + curl, + SDL2, + SDL2_image, +}: stdenv.mkDerivation (finalAttrs: { pname = "sdlmap"; @@ -11,11 +19,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-W09WzCKmuMjV1L2c1bvlBCmNvXxYgGNU/MLtu6TTsIg="; }; - patches = [ ./tile.patch ./Makefile.patch ]; + patches = [ + ./tile.patch + ./Makefile.patch + ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl SDL2 SDL2_image ]; + buildInputs = [ + curl + SDL2 + SDL2_image + ]; installPhase = "install -Dm755 sdlmap -t $out/bin"; diff --git a/pkgs/osm/smopy/default.nix b/pkgs/osm/smopy/default.nix @@ -1,4 +1,8 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: python3Packages.buildPythonPackage rec { pname = "smopy"; diff --git a/pkgs/osm/smrender/default.nix b/pkgs/osm/smrender/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, cairo -, librsvg -, Foundation -, memstreamHook -, testers +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + cairo, + librsvg, + Foundation, + memstreamHook, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -21,10 +22,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-b9xuOPLxA9zZzIwWl+FTSW5XHgJ2sFoC578ZH6iwjaM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - buildInputs = [ cairo librsvg ] - ++ lib.optionals stdenv.isDarwin [ Foundation memstreamHook ]; + buildInputs = + [ + cairo + librsvg + ] + ++ lib.optionals stdenv.isDarwin [ + Foundation + memstreamHook + ]; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/osm/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + bzip2, + expat, + gd, + icu, + libosmium, + protozero, + sqlite, + zlib, +}: stdenv.mkDerivation { pname = "taginfo-tools"; @@ -13,7 +26,16 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ bzip2 expat gd icu libosmium protozero sqlite zlib ]; + buildInputs = [ + bzip2 + expat + gd + icu + libosmium + protozero + sqlite + zlib + ]; postInstall = '' install -Dm755 src/{osmstats,taginfo-sizes} -t $out/bin diff --git a/pkgs/osm/tilelog/default.nix b/pkgs/osm/tilelog/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonApplication rec { pname = "tilelog"; @@ -13,7 +17,12 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ flake8 ]; - propagatedBuildInputs = with python3Packages; [ click publicsuffixlist pyathena pyarrow ]; + propagatedBuildInputs = with python3Packages; [ + click + publicsuffixlist + pyathena + pyarrow + ]; doCheck = false; diff --git a/pkgs/osm/tirex/default.nix b/pkgs/osm/tirex/default.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, makeWrapper -, boost -, cairo -, harfbuzz -, icu -, libtiff -, libwebp -, mapnik -, perl -, perlPackages -, proj -, sqlite +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + makeWrapper, + boost, + cairo, + harfbuzz, + icu, + libtiff, + libwebp, + mapnik, + perl, + perlPackages, + proj, + sqlite, }: stdenv.mkDerivation (finalAttrs: { @@ -59,7 +60,10 @@ stdenv.mkDerivation (finalAttrs: { sqlite ]; - installFlags = [ "DESTDIR=$(out)" "INSTALLOPTS:=" ]; + installFlags = [ + "DESTDIR=$(out)" + "INSTALLOPTS:=" + ]; installTargets = [ "install-all" ]; @@ -77,7 +81,13 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' for cmd in `ls $out/bin`; do wrapProgram $out/bin/$cmd \ - --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSON IpcShareLite ]}:"$out/lib/perl5 + --prefix PERL5LIB : "${ + with perlPackages; + makeFullPerlPath [ + JSON + IpcShareLite + ] + }:"$out/lib/perl5 done ''; @@ -89,4 +99,3 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.unix; }; }) - diff --git a/pkgs/osm/vectiler/default.nix b/pkgs/osm/vectiler/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, +}: stdenv.mkDerivation { pname = "vectiler"; diff --git a/pkgs/perl-packages.nix b/pkgs/perl-packages.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ + lib, + stdenv, + fetchurl, + perlPackages, +}: with perlPackages; rec { MatchSimple = buildPerlPackage rec { @@ -9,7 +14,11 @@ rec { hash = "sha256-itYBTU5AJA3DNY+9yQf9OZJlUcGAs6Qnn42hgfF/dss="; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ ExporterTiny ScalarListUtils SubInfix ]; + propagatedBuildInputs = [ + ExporterTiny + ScalarListUtils + SubInfix + ]; meta = with lib; { homepage = "https://metacpan.org/pod/match::smart"; description = "match::smart - clone of smartmatch operator"; @@ -53,7 +62,10 @@ rec { url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz"; hash = "sha256-nJDRHywc/80cD/OxOCXyxWt/rywwdNbau7LckIHVYow="; }; - propagatedBuildInputs = [ ListMoreUtils MathGeometryPlanarGPCPolygonXS ]; + propagatedBuildInputs = [ + ListMoreUtils + MathGeometryPlanarGPCPolygonXS + ]; meta = with lib; { homepage = "https://metacpan.org/pod/Math::Polygon::Tree"; description = "Math::Polygon::Tree - fast check if point is inside polygon"; @@ -96,7 +108,10 @@ rec { url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz"; hash = "sha256-iygsM5Ha+hy4MN8Q4aLoRfpScYzYSSe73bDnyqofRpM="; }; - propagatedBuildInputs = [ ListMoreUtils XMLParser ]; + propagatedBuildInputs = [ + ListMoreUtils + XMLParser + ]; meta = with lib; { homepage = "https://metacpan.org/pod/Geo::Openstreetmap::Parser"; description = "Geo::Openstreetmap::Parser - Openstreetmap XML dump parser"; @@ -111,7 +126,10 @@ rec { url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz"; hash = "sha256-muwoy5iLY2UsU89XaohMDVvaTKzpOu8ui4vx11H4mco="; }; - propagatedBuildInputs = [ ListMoreUtils EncodeLocale ]; + propagatedBuildInputs = [ + ListMoreUtils + EncodeLocale + ]; meta = with lib; { homepage = "https://metacpan.org/pod/Geo::Names::Russian"; description = "Geo::Names::Russian - parse and split russian geographical names"; diff --git a/pkgs/radio/acarsdec/default.nix b/pkgs/radio/acarsdec/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libacars, libsndfile, paho-mqtt-c, rtl-sdr }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + libacars, + libsndfile, + paho-mqtt-c, + rtl-sdr, +}: stdenv.mkDerivation (finalAttrs: { pname = "acarsdec"; @@ -11,9 +21,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-MBy9Xq5ufusqSKGe40JxgnFeo4wnabThbDpGEE6u1so="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ libacars libsndfile paho-mqtt-c rtl-sdr ]; + buildInputs = [ + libacars + libsndfile + paho-mqtt-c + rtl-sdr + ]; cmakeFlags = [ (lib.cmakeBool "rtl" true) diff --git a/pkgs/radio/adsb_deku/default.nix b/pkgs/radio/adsb_deku/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, +}: rustPlatform.buildRustPackage rec { pname = "adsb_deku"; diff --git a/pkgs/radio/ais-catcher/default.nix b/pkgs/radio/ais-catcher/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, airspy -, airspyhf -, hackrf -, libsamplerate -, openssl -, rtl-sdr -, soxr -, zeromq -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + airspy, + airspyhf, + hackrf, + libsamplerate, + openssl, + rtl-sdr, + soxr, + zeromq, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -25,7 +26,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7kN3EVyjlktnU7mhQa3emD8zqf9OSlzoh4xW8LLpvL8="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ airspy diff --git a/pkgs/radio/aprsc/default.nix b/pkgs/radio/aprsc/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, libevent, openssl, testers }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + perl, + libevent, + openssl, + testers, +}: stdenv.mkDerivation (finalAttrs: { pname = "aprsc"; @@ -23,7 +32,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ perl ]; - buildInputs = [ libevent openssl ]; + buildInputs = [ + libevent + openssl + ]; preConfigure = "LD=$CC"; configureFlags = [ diff --git a/pkgs/radio/dumphfdl/default.nix b/pkgs/radio/dumphfdl/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fftwFloat, glib, libacars, libconfig, liquid-dsp, soapysdr, sqlite, zeromq }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + fftwFloat, + glib, + libacars, + libconfig, + liquid-dsp, + soapysdr, + sqlite, + zeromq, +}: stdenv.mkDerivation (finalAttrs: { pname = "dumphfdl"; @@ -11,9 +25,21 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-M4WjcGA15Kp+Hpp+I2Ndcx+oBqaGxEeQLTPcSlugLwQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ fftwFloat glib libacars libconfig liquid-dsp soapysdr sqlite zeromq ]; + buildInputs = [ + fftwFloat + glib + libacars + libconfig + liquid-dsp + soapysdr + sqlite + zeromq + ]; meta = with lib; { description = "Multichannel HFDL decoder"; diff --git a/pkgs/radio/dumpvdl2/default.nix b/pkgs/radio/dumpvdl2/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, libacars, protobufc, rtl-sdr, soapysdr, sqlite, zeromq, AppKit, Foundation }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + glib, + libacars, + protobufc, + rtl-sdr, + soapysdr, + sqlite, + zeromq, + AppKit, + Foundation, +}: stdenv.mkDerivation (finalAttrs: { pname = "dumpvdl2"; @@ -11,10 +26,25 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lmjVLHFLa819sgZ0NfSyKywEwS6pQxzdOj4y8RwRu/8="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ glib libacars protobufc rtl-sdr soapysdr sqlite zeromq ] - ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ]; + buildInputs = + [ + glib + libacars + protobufc + rtl-sdr + soapysdr + sqlite + zeromq + ] + ++ lib.optionals stdenv.isDarwin [ + AppKit + Foundation + ]; meta = with lib; { description = "VDL Mode 2 message decoder and protocol analyzer"; diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, fftwFloat -, libsamplerate -, libsndfile -, libusb1 -, portaudio -, rtl-sdr -, qmake -, qwt -, wrapQtAppsHook +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + fftwFloat, + libsamplerate, + libsndfile, + libusb1, + portaudio, + rtl-sdr, + qmake, + qwt, + wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -32,34 +33,51 @@ stdenv.mkDerivation rec { }) ]; - postPatch = '' - substituteInPlace fmreceiver.pro \ - --replace-fail "-lqwt-qt5" "-lqwt" \ - --replace-fail "CONFIG" "#CONFIG" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace fmreceiver.pro --replace-fail "-lrt " "" - substituteInPlace includes/fm-constants.h --replace-fail "<malloc.h>" "<stdlib.h>" - substituteInPlace devices/rtlsdr-handler/rtlsdr-handler.cpp --replace-fail ".so" ".dylib" - ''; + postPatch = + '' + substituteInPlace fmreceiver.pro \ + --replace-fail "-lqwt-qt5" "-lqwt" \ + --replace-fail "CONFIG" "#CONFIG" + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace fmreceiver.pro --replace-fail "-lrt " "" + substituteInPlace includes/fm-constants.h --replace-fail "<malloc.h>" "<stdlib.h>" + substituteInPlace devices/rtlsdr-handler/rtlsdr-handler.cpp --replace-fail ".so" ".dylib" + ''; - nativeBuildInputs = [ qmake wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; - buildInputs = [ fftwFloat libsamplerate libsndfile libusb1 portaudio qwt ]; + buildInputs = [ + fftwFloat + libsamplerate + libsndfile + libusb1 + portaudio + qwt + ]; qmakeFlags = [ "CONFIG+=dabstick" ]; qtWrapperArgs = [ - "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ rtl-sdr ]}" + "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ rtl-sdr ] + }" ]; installPhase = - if stdenv.isDarwin then '' - mkdir -p $out/Applications - mv linux-bin/fmreceiver-2.0.app $out/Applications/fmreceiver.app - install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/fmreceiver.app/Contents/MacOS/fmreceiver-2.0" - '' else '' - install -Dm755 linux-bin/fmreceiver-2.0 $out/bin/fmreceiver - ''; + if stdenv.isDarwin then + '' + mkdir -p $out/Applications + mv linux-bin/fmreceiver-2.0.app $out/Applications/fmreceiver.app + install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/fmreceiver.app/Contents/MacOS/fmreceiver-2.0" + '' + else + '' + install -Dm755 linux-bin/fmreceiver-2.0 $out/bin/fmreceiver + ''; meta = with lib; { description = "A simple FM receiver"; diff --git a/pkgs/radio/goestools/default.nix b/pkgs/radio/goestools/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, opencv4, rtl-sdr, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + opencv4, + rtl-sdr, + zlib, +}: stdenv.mkDerivation rec { pname = "goestools"; @@ -12,9 +21,16 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ opencv4 rtl-sdr zlib ]; + buildInputs = [ + opencv4 + rtl-sdr + zlib + ]; meta = with lib; { description = "Tools to work with signals and files from GOES satellites"; diff --git a/pkgs/radio/gqrx-scanner/default.nix b/pkgs/radio/gqrx-scanner/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation (finalAttrs: { pname = "gqrx-scanner"; diff --git a/pkgs/radio/libacars/default.nix b/pkgs/radio/libacars/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libxml2, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libxml2, + zlib, +}: stdenv.mkDerivation (finalAttrs: { pname = "libacars"; @@ -13,12 +20,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 zlib ]; - - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + buildInputs = [ + libxml2 + zlib ]; + cmakeFlags = [ (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; + meta = with lib; { description = "A library for decoding various ACARS message payloads"; inherit (finalAttrs.src.meta) homepage; diff --git a/pkgs/radio/linrad/default.nix b/pkgs/radio/linrad/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, fetchsvn, cmake, nasm, libX11 }: +{ + stdenv, + lib, + fetchsvn, + cmake, + nasm, + libX11, +}: stdenv.mkDerivation { pname = "linrad"; @@ -10,7 +17,10 @@ stdenv.mkDerivation { sha256 = "sha256-zOGpLX5OTSFhbme6hENN+Z1gwcxkHoeDDDg6LZQvcM0="; }; - nativeBuildInputs = [ cmake nasm ]; + nativeBuildInputs = [ + cmake + nasm + ]; buildInputs = [ libX11 ]; diff --git a/pkgs/radio/radiolib/default.nix b/pkgs/radio/radiolib/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: stdenv.mkDerivation (finalAttrs: { pname = "radiolib"; diff --git a/pkgs/radio/rtlsdr-airband/default.nix b/pkgs/radio/rtlsdr-airband/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, fftwFloat -, lame -, libconfig -, libshout -, pulseaudio -, rtl-sdr -, soapysdr +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + fftwFloat, + lame, + libconfig, + libshout, + pulseaudio, + rtl-sdr, + soapysdr, }: stdenv.mkDerivation (finalAttrs: { @@ -23,14 +24,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Rgsxim7FESVt1ZnVJFvVfMqJMgzVCfP1yBDBBO4zEsE="; }; - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ fftwFloat lame libconfig libshout pulseaudio rtl-sdr soapysdr ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - cmakeFlags = [ - (lib.cmakeBool "NFM" true) + buildInputs = [ + fftwFloat + lame + libconfig + libshout + pulseaudio + rtl-sdr + soapysdr ]; + cmakeFlags = [ (lib.cmakeBool "NFM" true) ]; + meta = with lib; { description = "Multichannel AM/NFM demodulator"; inherit (finalAttrs.src.meta) homepage; diff --git a/pkgs/radio/rtltcp/default.nix b/pkgs/radio/rtltcp/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, rtl-sdr, systemd }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + rtl-sdr, + systemd, +}: rustPlatform.buildRustPackage rec { pname = "rtltcp"; @@ -16,12 +24,18 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rtl-sdr systemd ]; + buildInputs = [ + rtl-sdr + systemd + ]; meta = with lib; { description = "A rust implementation of rtl-tcp"; inherit (src.meta) homepage; - license = with licenses; [ asl20 mit ]; + license = with licenses; [ + asl20 + mit + ]; maintainers = [ maintainers.sikmir ]; platforms = platforms.linux; skip.ci = stdenv.isDarwin; diff --git a/pkgs/radio/sdr-modem/default.nix b/pkgs/radio/sdr-modem/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, check, libconfig, libiio, volk, protobufc }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + check, + libconfig, + libiio, + volk, + protobufc, +}: stdenv.mkDerivation (finalAttrs: { pname = "sdr-modem"; @@ -11,9 +22,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-j3T8LJq7B4GL41tAr6RfDla9hu2+BQTVTi96LnEo0iw="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ check libconfig libiio volk protobufc ]; + buildInputs = [ + check + libconfig + libiio + volk + protobufc + ]; installPhase = '' install -Dm755 sdr_modem -t $out/bin diff --git a/pkgs/radio/sdr-server/default.nix b/pkgs/radio/sdr-server/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, check, libconfig, librtlsdr, volk, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + check, + libconfig, + librtlsdr, + volk, + zlib, +}: stdenv.mkDerivation (finalAttrs: { pname = "sdr-server"; @@ -11,9 +22,18 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7X8woFT0PoIfnwcBwhPRJ4ZijtlZDBsCrTUhxbozrjI="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ check libconfig librtlsdr volk zlib ]; + buildInputs = [ + check + libconfig + librtlsdr + volk + zlib + ]; installPhase = '' install -Dm755 sdr_server -t $out/bin diff --git a/pkgs/radio/smallrx/default.nix b/pkgs/radio/smallrx/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "smallrx"; diff --git a/pkgs/suckless/amused/default.nix b/pkgs/suckless/amused/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, bmake, pkg-config, libbsd, imsg-compat, sndio, flac, mpg123, libvorbis, opusfile }: +{ + lib, + stdenv, + fetchFromGitHub, + bmake, + pkg-config, + libbsd, + imsg-compat, + sndio, + flac, + mpg123, + libvorbis, + opusfile, +}: stdenv.mkDerivation (finalAttrs: { pname = "amused"; @@ -11,9 +24,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iVBJENiepBnqExMXQezd3Ja4RUNarLOAcA0JQUIfg5o="; }; - nativeBuildInputs = [ bmake pkg-config ]; + nativeBuildInputs = [ + bmake + pkg-config + ]; - buildInputs = [ libbsd imsg-compat sndio flac mpg123 libvorbis opusfile ]; + buildInputs = [ + libbsd + imsg-compat + sndio + flac + mpg123 + libvorbis + opusfile + ]; meta = with lib; { description = "music player daemon NIH"; diff --git a/pkgs/suckless/blind/default.nix b/pkgs/suckless/blind/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: stdenv.mkDerivation (finalAttrs: { pname = "blind"; diff --git a/pkgs/suckless/chibicc/default.nix b/pkgs/suckless/chibicc/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, memstreamHook }: +{ + lib, + stdenv, + fetchFromGitHub, + memstreamHook, +}: stdenv.mkDerivation (finalAttrs: { pname = "chibicc"; diff --git a/pkgs/suckless/cproc/default.nix b/pkgs/suckless/cproc/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromSourcehut, qbe }: +{ + lib, + stdenv, + fetchFromSourcehut, + qbe, +}: stdenv.mkDerivation (finalAttrs: { pname = "cproc"; diff --git a/pkgs/suckless/dragon/default.nix b/pkgs/suckless/dragon/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk3 }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + gtk3, +}: stdenv.mkDerivation (finalAttrs: { pname = "dragon"; diff --git a/pkgs/suckless/dtree/default.nix b/pkgs/suckless/dtree/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromSourcehut }: +{ + lib, + stdenv, + fetchFromSourcehut, +}: stdenv.mkDerivation (finalAttrs: { pname = "dtree"; diff --git a/pkgs/suckless/edit/default.nix b/pkgs/suckless/edit/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "edit"; @@ -11,7 +15,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-woFX3nGSOY4RSNPGRAt40xHDNOPlO2t1kgzb8U2v5+U="; }; - makeFlags = [ "CC:=$(CC)" "LDFLAGS=" "PREFIX=$(out)" ]; + makeFlags = [ + "CC:=$(CC)" + "LDFLAGS=" + "PREFIX=$(out)" + ]; meta = with lib; { description = "A suckless, simple, featured text editor"; diff --git a/pkgs/suckless/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchfossil, libGL, libX11, SDL, ghostscript, sqlite, memstreamHook }: +{ + lib, + stdenv, + fetchfossil, + libGL, + libX11, + SDL, + ghostscript, + sqlite, + memstreamHook, +}: stdenv.mkDerivation { pname = "farbfeld-utils"; @@ -14,9 +24,12 @@ stdenv.mkDerivation { rm ff-vccapture.c ff-xcapture.c ff-xdraw.c ff-xwin.c ''; - buildInputs = [ libGL SDL ghostscript sqlite ] - ++ lib.optional stdenv.isLinux libX11 - ++ lib.optional stdenv.isDarwin memstreamHook; + buildInputs = [ + libGL + SDL + ghostscript + sqlite + ] ++ lib.optional stdenv.isLinux libX11 ++ lib.optional stdenv.isDarwin memstreamHook; buildPhase = '' runHook preBuild diff --git a/pkgs/suckless/ff-tools/default.nix b/pkgs/suckless/ff-tools/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "ff-tools"; diff --git a/pkgs/suckless/ffshot/default.nix b/pkgs/suckless/ffshot/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, xorg }: +{ + lib, + stdenv, + fetchFromGitHub, + xorg, +}: stdenv.mkDerivation (finalAttrs: { pname = "ffshot"; @@ -11,7 +16,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lPHPwieotSgA6qF3EGDZk+lME0rqglOnEreYLk0/oUY="; }; - buildInputs = with xorg; [ libxcb xcbutilimage ]; + buildInputs = with xorg; [ + libxcb + xcbutilimage + ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/suckless/hurl/default.nix b/pkgs/suckless/hurl/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchgit, libressl, libbsd }: +{ + lib, + stdenv, + fetchgit, + libressl, + libbsd, +}: stdenv.mkDerivation (finalAttrs: { pname = "hurl"; @@ -10,7 +16,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/aalBz4HbR8GZYt+gI4o1tfN5PfpSLG1gADcbo0Mp94="; }; - buildInputs = [ libressl libbsd ]; + buildInputs = [ + libressl + libbsd + ]; NIX_LDFLAGS = "-lbsd"; diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromSourcehut -, installShellFiles -, libpng -, libjpeg -, libtiff -, libwebp -, fftwFloat -, libX11 -, gsl +{ + lib, + stdenv, + fetchFromSourcehut, + installShellFiles, + libpng, + libjpeg, + libtiff, + libwebp, + fftwFloat, + libX11, + gsl, }: stdenv.mkDerivation (finalAttrs: { @@ -24,9 +25,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ libpng libjpeg libtiff libwebp fftwFloat libX11 gsl ]; - - makeFlags = [ "DISABLE_HDF5=1" "full" ]; + buildInputs = [ + libpng + libjpeg + libtiff + libwebp + fftwFloat + libX11 + gsl + ]; + + makeFlags = [ + "DISABLE_HDF5=1" + "full" + ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; diff --git a/pkgs/suckless/imsg-compat/default.nix b/pkgs/suckless/imsg-compat/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, validatePkgConfig }: +{ + lib, + stdenv, + fetchFromGitHub, + validatePkgConfig, +}: stdenv.mkDerivation (finalAttrs: { pname = "imsg-compat"; diff --git a/pkgs/suckless/kilo/default.nix b/pkgs/suckless/kilo/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "kilo"; diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "lacc"; diff --git a/pkgs/suckless/lbm/default.nix b/pkgs/suckless/lbm/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, dbus, xorg }: +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + dbus, + xorg, +}: stdenv.mkDerivation (finalAttrs: { pname = "lbm"; @@ -15,7 +22,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus xorg.libX11 xorg.libXft xorg.libXinerama ]; + buildInputs = [ + dbus + xorg.libX11 + xorg.libXft + xorg.libXinerama + ]; makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/suckless/lchat/default.nix b/pkgs/suckless/lchat/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, libgrapheme }: +{ + lib, + stdenv, + fetchFromGitHub, + libgrapheme, +}: stdenv.mkDerivation (finalAttrs: { pname = "lchat"; diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchgit, libX11, farbfeld, farbfeld-utils }: +{ + lib, + stdenv, + fetchgit, + libX11, + farbfeld, + farbfeld-utils, +}: stdenv.mkDerivation (finalAttrs: { pname = "lel"; diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: +{ + lib, + stdenv, + fetchFromGitHub, + ncurses, +}: stdenv.mkDerivation (finalAttrs: { pname = "libst"; diff --git a/pkgs/suckless/libutf/default.nix b/pkgs/suckless/libutf/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, libutf, ncurses }: +{ + lib, + stdenv, + fetchFromGitHub, + libutf, + ncurses, +}: stdenv.mkDerivation (finalAttrs: { pname = "libutf"; diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, fontconfig, imlib2, libXft, conf ? null }: +{ + lib, + stdenv, + fetchFromGitHub, + fontconfig, + imlib2, + libXft, + conf ? null, +}: stdenv.mkDerivation (finalAttrs: { pname = "mage"; @@ -14,7 +22,11 @@ stdenv.mkDerivation (finalAttrs: { configFile = lib.optionalString (conf != null) (builtins.toFile "config.h" conf); preBuild = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.h"; - buildInputs = [ fontconfig imlib2 libXft ]; + buildInputs = [ + fontconfig + imlib2 + libXft + ]; makeFlags = [ "CC:=$(CC)" ]; diff --git a/pkgs/suckless/makel/default.nix b/pkgs/suckless/makel/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, libgrapheme }: +{ + lib, + stdenv, + fetchFromGitHub, + libgrapheme, +}: stdenv.mkDerivation (finalAttrs: { pname = "makel"; diff --git a/pkgs/suckless/nextvi/default.nix b/pkgs/suckless/nextvi/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; diff --git a/pkgs/suckless/pista/default.nix b/pkgs/suckless/pista/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, libX11 }: +{ + lib, + stdenv, + fetchFromGitHub, + libX11, +}: stdenv.mkDerivation (finalAttrs: { pname = "pista"; diff --git a/pkgs/suckless/poe/default.nix b/pkgs/suckless/poe/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromSourcehut }: +{ + lib, + stdenv, + fetchFromSourcehut, +}: stdenv.mkDerivation (finalAttrs: { pname = "poe"; diff --git a/pkgs/suckless/saait/default.nix b/pkgs/suckless/saait/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchgit }: +{ + lib, + stdenv, + fetchgit, +}: stdenv.mkDerivation rec { pname = "saait"; diff --git a/pkgs/suckless/sbase/default.nix b/pkgs/suckless/sbase/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchgit }: +{ + lib, + stdenv, + fetchgit, +}: stdenv.mkDerivation { pname = "sbase"; @@ -10,7 +14,11 @@ stdenv.mkDerivation { hash = "sha256-CkfrtL4yV/HtLnJsMODjArRMzoT4FSgJqDYPHl0MtUU="; }; - makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" ]; + makeFlags = [ + "AR:=$(AR)" + "CC:=$(CC)" + "RANLIB:=$(RANLIB)" + ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/suckless/scc/default.nix b/pkgs/suckless/scc/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchgit, qbe }: +{ + lib, + stdenv, + fetchgit, + qbe, +}: stdenv.mkDerivation { pname = "scc"; @@ -18,7 +23,14 @@ stdenv.mkDerivation { #buildInputs = [ qbe ]; - makeFlags = [ "PREFIX=$(out)" "AR:=$(AR)" "AS:=$(AS)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" "HOSTCC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ + "PREFIX=$(out)" + "AR:=$(AR)" + "AS:=$(AS)" + "CC:=$(CC)" + "RANLIB:=$(RANLIB)" + "HOSTCC=${stdenv.cc.targetPrefix}cc" + ]; #doCheck = true; checkTarget = "tests"; diff --git a/pkgs/suckless/scroll/default.nix b/pkgs/suckless/scroll/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchgit }: +{ + lib, + stdenv, + fetchgit, +}: stdenv.mkDerivation (finalAttrs: { pname = "scroll"; diff --git a/pkgs/suckless/sdhcp/default.nix b/pkgs/suckless/sdhcp/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchgit }: +{ + lib, + stdenv, + fetchgit, +}: stdenv.mkDerivation (finalAttrs: { pname = "sdhcp"; @@ -14,7 +18,12 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Makefile --replace-fail "ranlib" "\$(RANLIB)" ''; - makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "PREFIX=$(out)" "RANLIB:=$(RANLIB)" ]; + makeFlags = [ + "AR:=$(AR)" + "CC:=$(CC)" + "PREFIX=$(out)" + "RANLIB:=$(RANLIB)" + ]; meta = with lib; { description = "Simple dhcp client"; diff --git a/pkgs/suckless/se/default.nix b/pkgs/suckless/se/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + ncurses, +}: stdenv.mkDerivation (finalAttrs: { pname = "se"; diff --git a/pkgs/suckless/sled/default.nix b/pkgs/suckless/sled/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromSourcehut }: +{ + lib, + stdenv, + fetchFromSourcehut, +}: stdenv.mkDerivation (finalAttrs: { pname = "sled"; diff --git a/pkgs/suckless/ste/default.nix b/pkgs/suckless/ste/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromSourcehut }: +{ + lib, + stdenv, + fetchFromSourcehut, +}: stdenv.mkDerivation (finalAttrs: { pname = "ste"; diff --git a/pkgs/suckless/sthkd/default.nix b/pkgs/suckless/sthkd/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation (finalAttrs: { pname = "sthkd"; diff --git a/pkgs/suckless/svtm/default.nix b/pkgs/suckless/svtm/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, abduco, sthkd, libst }: +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + abduco, + sthkd, + libst, +}: stdenv.mkDerivation (finalAttrs: { pname = "svtm"; @@ -23,7 +31,13 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' wrapProgram $out/bin/svtm \ - --prefix PATH : ${lib.makeBinPath [ abduco sthkd libst ]}:$out/bin + --prefix PATH : ${ + lib.makeBinPath [ + abduco + sthkd + libst + ] + }:$out/bin ''; meta = with lib; { diff --git a/pkgs/suckless/table/default.nix b/pkgs/suckless/table/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromSourcehut }: +{ + lib, + stdenv, + fetchFromSourcehut, +}: stdenv.mkDerivation (finalAttrs: { pname = "table";