From a6ce00c50c36624fec06b2b756a766d4d0f4a888 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 25 Jan 2021 09:26:54 +0100 Subject: treewide: remove stdenv where not needed --- pkgs/servers/caddy/default.nix | 2 +- pkgs/servers/cayley/default.nix | 2 +- pkgs/servers/cloud-print-connector/default.nix | 2 +- pkgs/servers/consul/default.nix | 2 +- pkgs/servers/demoit/default.nix | 2 +- pkgs/servers/dns/coredns/default.nix | 2 +- pkgs/servers/foundationdb/default.nix | 2 +- pkgs/servers/gotty/default.nix | 2 +- pkgs/servers/headphones/default.nix | 2 +- pkgs/servers/holochain-go/default.nix | 2 +- pkgs/servers/http/hyp/default.nix | 2 +- pkgs/servers/hydron/default.nix | 2 +- pkgs/servers/icingaweb2/default.nix | 8 +++++--- pkgs/servers/icingaweb2/theme-april/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-lsd/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-particles/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-snow/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-spring/default.nix | 9 +++++++-- pkgs/servers/icingaweb2/theme-unicorn/default.nix | 10 ++++++++-- pkgs/servers/identd/nullidentdmod/default.nix | 4 +++- pkgs/servers/irc/robustirc-bridge/default.nix | 2 +- pkgs/servers/isso/default.nix | 2 +- pkgs/servers/kapowbang/default.nix | 2 +- pkgs/servers/livepeer/default.nix | 2 +- pkgs/servers/mail/mailhog/default.nix | 2 +- pkgs/servers/mail/mailman/default.nix | 2 +- pkgs/servers/mail/mailman/hyperkitty.nix | 2 +- pkgs/servers/mail/mailman/postorius.nix | 2 +- pkgs/servers/mail/postfix/pflogsumm.nix | 2 +- pkgs/servers/mail/postgrey/default.nix | 2 +- pkgs/servers/mail/spamassassin/default.nix | 2 +- pkgs/servers/matterbridge/default.nix | 2 +- pkgs/servers/mattermost/matterircd.nix | 2 +- pkgs/servers/mautrix-whatsapp/default.nix | 2 +- pkgs/servers/miniflux/default.nix | 2 +- pkgs/servers/minio/default.nix | 2 +- pkgs/servers/misc/client-ip-echo/client-ip-echo.nix | 2 +- pkgs/servers/monitoring/alertmanager-bot/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- pkgs/servers/monitoring/consul-alerts/default.nix | 2 +- pkgs/servers/monitoring/fusion-inventory/default.nix | 2 +- pkgs/servers/monitoring/grafana-reporter/default.nix | 2 +- pkgs/servers/monitoring/plugins/esxi.nix | 2 +- pkgs/servers/monitoring/prometheus/alertmanager.nix | 2 +- pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/bind-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/bird-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/collectd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/consul-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/dovecot-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix | 2 +- .../monitoring/prometheus/gitlab-ci-pipelines-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/haproxy-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/keylight-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/lnd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mail-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mesos-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/minio-exporter/default.nix | 2 +- pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/mysqld-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/node-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/openvpn-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/process-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/prom2json.nix | 2 +- pkgs/servers/monitoring/prometheus/promscale.nix | 2 +- pkgs/servers/monitoring/prometheus/pushgateway.nix | 2 +- pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/sql-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/statsd-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/surfboard-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix | 2 +- pkgs/servers/monitoring/thanos/default.nix | 2 +- pkgs/servers/monitoring/unifi-poller/default.nix | 2 +- pkgs/servers/nextcloud/news-updater.nix | 2 +- pkgs/servers/nginx-sso/default.nix | 2 +- pkgs/servers/nosql/mongodb/v3_4.nix | 2 +- pkgs/servers/openxpki/default.nix | 2 +- pkgs/servers/radicale/1.x.nix | 2 +- pkgs/servers/radicale/2.x.nix | 2 +- pkgs/servers/routinator/default.nix | 2 +- pkgs/servers/rtsp-simple-server/default.nix | 2 +- pkgs/servers/scylladb/default.nix | 2 +- pkgs/servers/serf/default.nix | 2 +- pkgs/servers/sickbeard/sickrage.nix | 2 +- pkgs/servers/simplehttp2server/default.nix | 2 +- pkgs/servers/skydns/default.nix | 2 +- pkgs/servers/slimserver/default.nix | 2 +- pkgs/servers/sql/dolt/default.nix | 2 +- pkgs/servers/tarssh/default.nix | 2 +- pkgs/servers/tegola/default.nix | 2 +- pkgs/servers/teleport/default.nix | 2 +- pkgs/servers/traefik/default.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- pkgs/servers/trickster/trickster.nix | 2 +- pkgs/servers/tt-rss/plugin-ff-instagram/default.nix | 4 +++- pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix | 4 +++- pkgs/servers/tt-rss/theme-feedly/default.nix | 4 +++- pkgs/servers/udpt/default.nix | 2 +- pkgs/servers/unpfs/default.nix | 2 +- pkgs/servers/web-apps/morty/default.nix | 2 +- pkgs/servers/web-apps/shiori/default.nix | 2 +- pkgs/servers/webmetro/default.nix | 2 +- pkgs/servers/x11/xorg/xwayland.nix | 2 +- pkgs/servers/xandikos/default.nix | 2 +- pkgs/servers/zigbee2mqtt/default.nix | 2 +- 114 files changed, 163 insertions(+), 122 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index d48bcad179466..3e6641b8d26f9 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "caddy"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 8ab171a2f4377..c9d06d4977147 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "cayley"; diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 8e1ef83126916..f6f6a0fbd7153 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: # TODO: Add a service for gcp-cups-connector and perhaps some other # kind of configuration for the same thing that gcp-connector-util diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 4c0ce8d511e8c..9dc723417d604 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "consul"; diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 0c6fe81877564..4a499e7f878cc 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index adb1a7f329bc3..cdfc78d622293 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "coredns"; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 0e608051a9ea8..10d517179c2f7 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,4 +1,4 @@ -{ gcc6Stdenv, stdenv, gccStdenv, llvmPackages +{ gcc6Stdenv, gccStdenv, llvmPackages , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index c4881baeac064..7bd09569248f0 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotty"; diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index 75d15d4f37863..67b328d661a9d 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "headphones"; diff --git a/pkgs/servers/holochain-go/default.nix b/pkgs/servers/holochain-go/default.nix index e6e35c35900ea..0d138e1f648ec 100644 --- a/pkgs/servers/holochain-go/default.nix +++ b/pkgs/servers/holochain-go/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "holochain-go${version}"; diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index 52f345d547719..1faa85cfc1415 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages }: +{ lib, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { pname = "hyp-server"; diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index 8b950ec12c54c..41c69bde28528 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, ffmpeg }: buildGoModule rec { pname = "hydron"; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index eaf16e3880483..e7d9b1a2847be 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: with lib; stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub, makeWrapper, php }: + +stdenv.mkDerivation rec { pname = "icingaweb2"; version = "2.8.2"; @@ -16,10 +18,10 @@ cp -ra application bin etc library modules public $out cp -ra doc $out/share - wrapProgram $out/bin/icingacli --prefix PATH : "${makeBinPath [ php ]}" + wrapProgram $out/bin/icingacli --prefix PATH : "${lib.makeBinPath [ php ]}" ''; - meta = { + meta = with lib; { description = "Webinterface for Icinga 2"; longDescription = '' A lightweight and extensible web interface to keep an eye on your environment. diff --git a/pkgs/servers/icingaweb2/theme-april/default.nix b/pkgs/servers/icingaweb2/theme-april/default.nix index 7c592fca33b63..0a152a7e157ec 100644 --- a/pkgs/servers/icingaweb2/theme-april/default.nix +++ b/pkgs/servers/icingaweb2/theme-april/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-april"; version = "1.0.4"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Icingaweb2 theme for april fools"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-april"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-lsd/default.nix b/pkgs/servers/icingaweb2/theme-lsd/default.nix index 273bcf6945d91..59b8df6b4d42b 100644 --- a/pkgs/servers/icingaweb2/theme-lsd/default.nix +++ b/pkgs/servers/icingaweb2/theme-lsd/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-lsd"; version = "1.0.3"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Psychadelic theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-lsd"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-particles/default.nix b/pkgs/servers/icingaweb2/theme-particles/default.nix index 3d28481cd84ee..ddd363701a7c0 100644 --- a/pkgs/servers/icingaweb2/theme-particles/default.nix +++ b/pkgs/servers/icingaweb2/theme-particles/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-particles"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "This theme adds a nice particle effect to the login screen of Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-particles"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-snow/default.nix b/pkgs/servers/icingaweb2/theme-snow/default.nix index 941138bb0a520..5650d1ccdba84 100644 --- a/pkgs/servers/icingaweb2/theme-snow/default.nix +++ b/pkgs/servers/icingaweb2/theme-snow/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-snow"; version = "1.0.0"; @@ -20,7 +25,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Snow theme for Icingaweb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-snow"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-spring/default.nix b/pkgs/servers/icingaweb2/theme-spring/default.nix index a21f6cc89a25f..dda26caf6a19e 100644 --- a/pkgs/servers/icingaweb2/theme-spring/default.nix +++ b/pkgs/servers/icingaweb2/theme-spring/default.nix @@ -1,4 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-spring"; version = "1.0.0"; @@ -14,7 +19,7 @@ cp -r * "$out" ''; - meta = { + meta = with lib; { description = "Theme with some soft colors and nice background images loaded from unsplash.com"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-spring"; license = licenses.publicDomain; diff --git a/pkgs/servers/icingaweb2/theme-unicorn/default.nix b/pkgs/servers/icingaweb2/theme-unicorn/default.nix index a43f7d7c09ade..a2bb3f9e4a2b8 100644 --- a/pkgs/servers/icingaweb2/theme-unicorn/default.nix +++ b/pkgs/servers/icingaweb2/theme-unicorn/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub }: with lib; stdenv.mkDerivation rec { +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { name = "icingaweb2-theme-unicorn"; version = "1.0.2"; @@ -35,7 +41,7 @@ cp unicorn.png "$out/public/img/unicorn.png" ''; - meta = { + meta = with lib; { description = "Unicorn theme for IcingaWeb 2"; homepage = "https://github.com/Mikesch-mp/icingaweb2-theme-unicorn"; license = licenses.publicDomain; diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index b383135f2eb52..ee759ac55ea1e 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "nullidentdmod"; version = "1.3"; diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index d0b192010c101..2530c72cbb9d6 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "robustirc-bridge"; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 4680c37c85e37..b9bce56d9fa07 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { diff --git a/pkgs/servers/kapowbang/default.nix b/pkgs/servers/kapowbang/default.nix index b52018b64f4ce..94a1832bd8d3f 100644 --- a/pkgs/servers/kapowbang/default.nix +++ b/pkgs/servers/kapowbang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kapowbang"; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index acfa1aa2c3fbd..a016c8e7f099d 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule +{ lib, fetchFromGitHub, buildGoModule , pkg-config, ffmpeg, gnutls }: diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index f1ba497720a9d..674fdbabb4eb9 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "MailHog"; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 57ceee948b50d..9a86cc31fdd89 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython +{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, alembic, aiosmtpd, dnspython , flufl_bounce, flufl_i18n, flufl_lock, lazr_config, lazr_delegates, passlib , requests, zope_configuration, click, falcon, importlib-resources , zope_component, lynx, postfix, authheaders, gunicorn diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 58ef52e9c26de..00cf2c1e83c0e 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock +{ lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 , django-haystack, flufl_lock, networkx, dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index ab8ad4440ab6e..9330de3a8f386 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, vcrpy, mock , django-mailman3, mailmanclient, readme_renderer }: diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index 1c92a4a76764d..800a69e950960 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages }: +{ lib, fetchurl, perlPackages }: perlPackages.buildPerlPackage rec { pname = "pflogsumm"; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index d0eaf40d06c70..07b351bfb2161 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, lib, runCommand, postfix }: +{ fetchurl, perlPackages, lib, runCommand, postfix }: let mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/${perlPackages.perl.libPrefix}") inputs); diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index c5980bc8889e6..ff96f0e7c8275 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, makeWrapper, gnupg }: +{ lib, fetchurl, perlPackages, makeWrapper, gnupg }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index df22aab1f9577..6d12ac84d901e 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchurl }: buildGoModule rec { pname = "matterbridge"; diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index 36edd851f36fe..3abb728bec1d3 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "matterircd"; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index eea8739292756..a17d8a55acc85 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, olm }: +{ lib, buildGoModule, fetchFromGitHub, olm }: buildGoModule rec { pname = "mautrix-whatsapp"; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 55dd3d8afc596..7781124259b6a 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: let pname = "miniflux"; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index d54232fd7f2e2..9477da8a3f808 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix index a696bc413515d..d6a25b3675ffb 100644 --- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix +++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib, stdenv }: +{ mkDerivation, fetchFromGitHub, base, bytestring, network, lib }: mkDerivation { pname = "client-ip-echo"; version = "0.1.0.5"; diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix index 7f4959e58ebee..1eaaf01578feb 100644 --- a/pkgs/servers/monitoring/alertmanager-bot/default.nix +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "alertmanager-bot"; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 6300066492120..8501aa5e02cd4 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cadvisor"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 896664658cf11..4cf5f6b80682b 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul-alerts"; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 5d825dbe7f268..0034c253c7745 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 43346e9353f3d..da60be64603e1 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: +{ lib, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: with lib; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 11183dcc2f29e..1ca9e702e7ade 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: let bName = "check_esxi_hardware"; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 19b98124e8e2b..bc3cf7539eceb 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 648bb59b0d2dd..64105c9c58f26 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "apcupsd-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index 2548e196837a6..af58a6ebe9475 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "aws-s3-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 1a86a0e38d9cc..5cfdf61583000 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "bind_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 5670233b05473..3cb04304e26d8 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "bird-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 3140056a26967..88ef3f02602cb 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "blackbox_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index f86c3a42773c8..b3b61567d481b 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "collectd-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index ab4b67402d395..c3cc7eff90aa3 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "consul_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e01417186960c..875db1777fba4 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "dnsmasq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index c0d96b08bb65a..ff7156360a9c5 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "dovecot_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index bc9058e36d97c..cefa4579069f5 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "fritzbox-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 718c8f2fcb136..18055f9b06a04 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitlab-ci-pipelines-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index e12c76e09f047..6a42297d502a7 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "haproxy_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix index e7ecffee9927a..a551e55b21682 100644 --- a/pkgs/servers/monitoring/prometheus/keylight-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/keylight-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "keylight-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 1f9c38922ebcc..34a9511d0b579 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "lndmon"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index daad5dc81cd88..2d995ba52932b 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: buildGoModule { pname = "mailexporter"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 0fb7ee4fce326..0fa2bced12559 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mesos_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 5044db4b1c148..37f9b0c4e06d7 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 78642821b9469..93e9bca3283d7 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: +{ lib, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { pname = "minio-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix index c23d44dca389e..e6178dd52a35e 100644 --- a/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/modemmanager-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "modemmanager-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index ec181d2e11074..ff32764fcde6d 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mysqld_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 259b4f752d37f..ee5bafbc7c9ff 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "nginx_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index b15a54c6529ce..fad49d2757513 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "nginxlog_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index e2b601f56c143..42ccb91017fc9 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "node_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 8e3daa931ee8f..021905ba9e002 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "openvpn_exporter-unstable"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index e3f8b2d44d4ed..a24edd2fbb0d4 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: with lib; diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index 5a3c232ac85cd..a147a3c290554 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "process-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index b333faf0bbdc9..a370bf1f24883 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "prom2json"; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index f4a9070fd84aa..a4ba3cee620d7 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0d47211005f27..aca2836e1a775 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, go, buildGoPackage, fetchFromGitHub }: +{ lib, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "pushgateway"; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index d9c08f8718dc6..b7832395f626b 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "rabbitmq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 945f403041c61..34c058d5d6cd6 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "redis_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index a71b03a2b41d6..ece22e496d12e 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: buildGoPackage rec { pname = "snmp_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 2784dae63aff0..553613a9c7e91 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "sql_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index a2b0f73904b9a..31bd583280ccd 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "statsd_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 50915bf65f871..39e475df19747 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "surfboard_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 669cf8ffaeaef..b9971ab722802 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "unifi-exporter"; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 9955b4a83330c..755dc1517751b 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; version = "0.17.2"; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 0343384a6795b..8297503b675e5 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "unifi-poller"; diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index f4dc2d33d1b0e..19147be3f5da8 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, php }: +{ lib, fetchurl, python3Packages, php }: python3Packages.buildPythonApplication rec { name = "nextcloud-news-updater-${version}"; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 0029d9ad55eea..572f4d94e72b6 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, lib, stdenv, nixosTests }: +{ buildGoPackage, fetchFromGitHub, lib, nixosTests }: buildGoPackage rec { pname = "nginx-sso"; diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix index 2a33b9744a2ad..666a92004b447 100644 --- a/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/pkgs/servers/nosql/mongodb/v3_4.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 511ea217328de..bdf12a1f923c7 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, perl, openssl, perlPackages, gettext, python3Packages +{ lib, fetchgit, perl, openssl, perlPackages, gettext, python3Packages # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere. , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 3bfab658af6df..fafeda88975c5 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pythonPackages }: +{ lib, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "radicale"; diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index 918dad537a532..b0902feeead4d 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3 }: +{ lib, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "Radicale"; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index e62ad97538063..4a19932f23e3c 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "routinator"; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index d3ec7dc75ee61..cfc35e8528f7a 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/servers/scylladb/default.nix b/pkgs/servers/scylladb/default.nix index ecc79acfbe73a..2ae3d9f486fb8 100644 --- a/pkgs/servers/scylladb/default.nix +++ b/pkgs/servers/scylladb/default.nix @@ -1,5 +1,5 @@ { - lib, stdenv, + lib, fetchgit, python3Packages, pkg-config, diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 04cd93c5306e6..8964796862ce6 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "serf"; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 7bd971e86e755..43ba82caf768a 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: +{ lib, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { pname = "sickrage"; diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index bc56053515bf3..d673a201646dc 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "simplehttp2server"; diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 587c5d4bda2c7..e6f35124a6fcc 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "skydns"; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index 5e1e8544818a7..3e28f5010499d 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper +{ lib, fetchurl, makeWrapper , perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: perlPackages.buildPerlPackage rec { diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index b0dc7a2275761..75d341e601e2f 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, buildGoModule }: +{ fetchFromGitHub, lib, buildGoModule }: buildGoModule rec { pname = "dolt"; diff --git a/pkgs/servers/tarssh/default.nix b/pkgs/servers/tarssh/default.nix index bb353dda92895..9240b9c51a283 100644 --- a/pkgs/servers/tarssh/default.nix +++ b/pkgs/servers/tarssh/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv }: +{ fetchFromGitHub, rustPlatform, lib }: with rustPlatform; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index c18bf17a7c7c7..f2161d5d47eac 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "tegola"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index f89c8f96fcf2a..0b55b82d39e7f 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, stdenv, buildGoPackage, zip, fetchFromGitHub }: +{ lib, buildGoPackage, zip, fetchFromGitHub }: buildGoPackage rec { pname = "teleport"; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 4ef454d6b5610..340bad6bdc8a7 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }: +{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }: buildGoModule rec { pname = "traefik"; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 03ff9f32fa510..cc0fb0d742175 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , buildGoModule , fetchFromGitHub , trezor-udev-rules diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index b99375dbb3d02..5cf08ee6c3cfd 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "trickster"; diff --git a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix index 375726a4692ef..1accac5bf6f8e 100644 --- a/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix +++ b/pkgs/servers/tt-rss/plugin-ff-instagram/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation { pname = "tt-rss-plugin-ff-instagram"; version = "git-2019-01-10"; # No release, see https://github.com/wltb/ff_instagram/issues/6 diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 987a6d8aaa671..7df8b71759365 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, ... }: + +stdenv.mkDerivation rec { pname = "tt-rss-plugin-tumblr-gdpr"; version = "2.1"; diff --git a/pkgs/servers/tt-rss/theme-feedly/default.nix b/pkgs/servers/tt-rss/theme-feedly/default.nix index 41f47ca4a4ec5..f6882611a25bc 100644 --- a/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; version = "2.5.0"; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index acdfb95272a79..b681727c08f9e 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "udpt"; diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix index 818e92f059656..07342c3edbefa 100644 --- a/pkgs/servers/unpfs/default.nix +++ b/pkgs/servers/unpfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "unpfs"; diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix index 6b17476623b9e..04f1e14d5ccfb 100644 --- a/pkgs/servers/web-apps/morty/default.nix +++ b/pkgs/servers/web-apps/morty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "morty"; diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index 7100c70c0ed8a..b39d7a00cedc8 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "shiori"; diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 316e3a524972d..6bda15a93e004 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "webmetro"; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 7fe0e5a9f97f6..e3d2698e8303f 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config +{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config , epoxy, libxslt, libunwind, makeWrapper, egl-wayland , defaultFontPath ? "" }: diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index b8eb29d87b2d7..5241139cfa39d 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib , fetchFromGitHub , python3Packages , installShellFiles diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 550e93fb5aa30..85465fd7d1452 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: +{ pkgs, system, dataDir ? "/opt/zigbee2mqtt/data", nixosTests }: let package = (import ./node.nix { inherit pkgs system; }).package; in -- cgit 1.4.1