From f6fceb321b567b1e5a710c084e6fca2a6b4d5b04 Mon Sep 17 00:00:00 2001 From: luc65r Date: Mon, 26 Oct 2020 15:19:52 +0100 Subject: [PATCH] Remove trailing whitespaces and fix indentation --- pkgs/development/compilers/gcc/common/configure-flags.nix | 6 +++--- pkgs/development/python-modules/jinja2/default.nix | 2 +- pkgs/tools/networking/dhcp/default.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index e6f3da0fd03..12d3f5d8987 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -73,7 +73,7 @@ let "--enable-libssp" "--disable-nls" # To keep ABI compatibility with upstream mingw-w64 - "--enable-fully-dynamic-string" + "--enable-fully-dynamic-string" ] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [ # See Note [Windows Exception Handling] "--enable-sjlj-exceptions" @@ -187,10 +187,10 @@ let "--disable-symvers" "libat_cv_have_ifunc=no" "--disable-gnu-indirect-function" - ] + ] ++ lib.optionals langJit [ "--enable-host-shared" - ] + ] ++ lib.optionals (langD) [ "--with-target-system-zlib=yes" ] diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 45178377026..33d6003cae7 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -4,7 +4,7 @@ , fetchPypi , pytest , markupsafe -, setuptools +, setuptools }: buildPythonPackage rec { diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index f0d465a40e9..4a6eca89624 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { '' substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" sed -i "includes/dhcpd.h" \ - -"es|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" + -e "s|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g" export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar' '';