go: format with nixpkgs-fmt

(cherry picked from commit 3a365e0e506068ff30a261b486942a199312dc76)
This commit is contained in:
zowoq
2021-07-14 17:43:31 +02:00
committed by Maxine Aubrey
parent 43a526d41d
commit 46fc5b82ea
4 changed files with 99 additions and 32 deletions
+21 -5
View File
@@ -1,6 +1,20 @@
{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand { lib
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , stdenv
, mailcap, runtimeShell , fetchurl
, tzdata
, iana-etc
, runCommand
, perl
, which
, pkg-config
, patch
, procps
, pcre
, cacert
, Security
, Foundation
, mailcap
, runtimeShell
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, fetchpatch , fetchpatch
@@ -183,11 +197,13 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX # to be different from CC/CXX
CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CC_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}cc" "${targetCC}/bin/${targetCC.targetPrefix}cc"
else else
null; null;
CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CXX_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}c++" "${targetCC}/bin/${targetCC.targetPrefix}c++"
else else
null; null;
+21 -5
View File
@@ -1,6 +1,20 @@
{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand { lib
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , stdenv
, mailcap, runtimeShell , fetchurl
, tzdata
, iana-etc
, runCommand
, perl
, which
, pkg-config
, patch
, procps
, pcre
, cacert
, Security
, Foundation
, mailcap
, runtimeShell
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, fetchpatch , fetchpatch
@@ -186,11 +200,13 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX # to be different from CC/CXX
CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CC_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}cc" "${targetCC}/bin/${targetCC.targetPrefix}cc"
else else
null; null;
CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CXX_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}c++" "${targetCC}/bin/${targetCC.targetPrefix}c++"
else else
null; null;
+22 -5
View File
@@ -1,6 +1,21 @@
{ lib, stdenv, fetchurl, tzdata, iana-etc, runCommand { lib
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation, xcbuild , stdenv
, mailcap, runtimeShell , fetchurl
, tzdata
, iana-etc
, runCommand
, perl
, which
, pkg-config
, patch
, procps
, pcre
, cacert
, Security
, Foundation
, xcbuild
, mailcap
, runtimeShell
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, fetchpatch , fetchpatch
@@ -181,11 +196,13 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX # to be different from CC/CXX
CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CC_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}cc" "${targetCC}/bin/${targetCC.targetPrefix}cc"
else else
null; null;
CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CXX_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}c++" "${targetCC}/bin/${targetCC.targetPrefix}c++"
else else
null; null;
+23 -5
View File
@@ -1,6 +1,22 @@
{ pkgs, lib, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand { pkgs
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation , lib
, mailcap, runtimeShell , stdenv
, fetchurl
, fetchgit
, tzdata
, iana-etc
, runCommand
, perl
, which
, pkg-config
, patch
, procps
, pcre
, cacert
, Security
, Foundation
, mailcap
, runtimeShell
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, fetchpatch , fetchpatch
@@ -178,11 +194,13 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX # to be different from CC/CXX
CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CC_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}cc" "${targetCC}/bin/${targetCC.targetPrefix}cc"
else else
null; null;
CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then CXX_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then
"${targetCC}/bin/${targetCC.targetPrefix}c++" "${targetCC}/bin/${targetCC.targetPrefix}c++"
else else
null; null;