diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
| commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
| tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/tools/networking | |
| parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
| parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/gandi-cli/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/modem-manager/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/ofono/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index 913cba54ae88..9559c444059f 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -21,6 +21,6 @@ buildPythonApplication rec { description = "Command-line interface to the public Gandi.net API"; homepage = https://cli.gandi.net/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ckampka ]; + maintainers = with maintainers; [ kampka ]; }; } diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 6f0732b8cfdf..b2644d0c2a49 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-polkit" - "--with-udev-base-dir=${placeholder ''out''}/lib/udev" - "--with-dbus-sys-dir=${placeholder ''out''}/etc/dbus-1/system.d" - "--with-systemdsystemunitdir=${placeholder ''out''}/etc/systemd/system" + "--with-udev-base-dir=${placeholder "out"}/lib/udev" + "--with-dbus-sys-dir=${placeholder "out"}/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" "--with-systemd-suspend-resume" diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 21d1f9ee0675..27f4b9562b38 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-dbusconfdir=${placeholder ''out''}/share" - "--with-systemdunitdir=${placeholder ''out''}/lib/systemd/system" + "--with-dbusconfdir=${placeholder "out"}/share" + "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" "--enable-external-ell" ]; |