diff options
author | Vincent Ambo <mail@tazj.in> | 2022-01-30T16·06+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2022-01-31T16·11+0000 |
commit | aa122cbae78ce97d60c0c98ba14df753d97e40b1 (patch) | |
tree | 12b98d85c4b18fe870feb26de70db9ba61837bd7 /third_party/nix/corepkgs | |
parent | 2d10d60fac0fd00a71b65cfdcb9fba0477b2086c (diff) |
style: format entire depot with nixpkgs-fmt r/3723
This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'third_party/nix/corepkgs')
-rw-r--r-- | third_party/nix/corepkgs/buildenv.nix | 12 | ||||
-rw-r--r-- | third_party/nix/corepkgs/derivation.nix | 9 | ||||
-rw-r--r-- | third_party/nix/corepkgs/fetchurl.nix | 19 | ||||
-rw-r--r-- | third_party/nix/corepkgs/imported-drv-to-derivation.nix | 13 |
4 files changed, 33 insertions, 20 deletions
diff --git a/third_party/nix/corepkgs/buildenv.nix b/third_party/nix/corepkgs/buildenv.nix index 0bac4c44b48a..4da0db2ae2ae 100644 --- a/third_party/nix/corepkgs/buildenv.nix +++ b/third_party/nix/corepkgs/buildenv.nix @@ -9,11 +9,13 @@ derivation { # !!! grmbl, need structured data for passing this in a clean way. derivations = - map (d: - [ (d.meta.active or "true") - (d.meta.priority or 5) - (builtins.length d.outputs) - ] ++ map (output: builtins.getAttr output d) d.outputs) + map + (d: + [ + (d.meta.active or "true") + (d.meta.priority or 5) + (builtins.length d.outputs) + ] ++ map (output: builtins.getAttr output d) d.outputs) derivations; # Building user environments remotely just causes huge amounts of diff --git a/third_party/nix/corepkgs/derivation.nix b/third_party/nix/corepkgs/derivation.nix index c0fbe8082cd3..1f95cf88ec44 100644 --- a/third_party/nix/corepkgs/derivation.nix +++ b/third_party/nix/corepkgs/derivation.nix @@ -8,12 +8,14 @@ let strict = derivationStrict drvAttrs; commonAttrs = drvAttrs // (builtins.listToAttrs outputsList) // - { all = map (x: x.value) outputsList; + { + all = map (x: x.value) outputsList; inherit drvAttrs; }; outputToAttrListElement = outputName: - { name = outputName; + { + name = outputName; value = commonAttrs // { outPath = builtins.getAttr outputName strict; drvPath = strict.drvPath; @@ -24,4 +26,5 @@ let outputsList = map outputToAttrListElement outputs; -in (builtins.head outputsList).value +in +(builtins.head outputsList).value diff --git a/third_party/nix/corepkgs/fetchurl.nix b/third_party/nix/corepkgs/fetchurl.nix index a84777f57448..9933b7cc120c 100644 --- a/third_party/nix/corepkgs/fetchurl.nix +++ b/third_party/nix/corepkgs/fetchurl.nix @@ -2,12 +2,13 @@ , url , hash ? "" # an SRI ash -# Legacy hash specification -, md5 ? "", sha1 ? "", sha256 ? "", sha512 ? "" -, outputHash ? - if hash != "" then hash else if sha512 != "" then sha512 else if sha1 != "" then sha1 else if md5 != "" then md5 else sha256 -, outputHashAlgo ? - if hash != "" then "" else if sha512 != "" then "sha512" else if sha1 != "" then "sha1" else if md5 != "" then "md5" else "sha256" + # Legacy hash specification +, md5 ? "" +, sha1 ? "" +, sha256 ? "" +, sha512 ? "" +, outputHash ? if hash != "" then hash else if sha512 != "" then sha512 else if sha1 != "" then sha1 else if md5 != "" then md5 else sha256 +, outputHashAlgo ? if hash != "" then "" else if sha512 != "" then "sha512" else if sha1 != "" then "sha1" else if md5 != "" then "md5" else "sha256" , executable ? false , unpack ? false @@ -33,7 +34,11 @@ derivation { # easy proxy configuration. This is impure, but a fixed-output # derivation like fetchurl is allowed to do so since its result is # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + "http_proxy" + "https_proxy" + "ftp_proxy" + "all_proxy" + "no_proxy" ]; # To make "nix-prefetch-url" work. diff --git a/third_party/nix/corepkgs/imported-drv-to-derivation.nix b/third_party/nix/corepkgs/imported-drv-to-derivation.nix index eab8b050e8ff..639f068332f2 100644 --- a/third_party/nix/corepkgs/imported-drv-to-derivation.nix +++ b/third_party/nix/corepkgs/imported-drv-to-derivation.nix @@ -3,19 +3,22 @@ attrs @ { drvPath, outputs, name, ... }: let commonAttrs = (builtins.listToAttrs outputsList) // - { all = map (x: x.value) outputsList; + { + all = map (x: x.value) outputsList; inherit drvPath name; type = "derivation"; }; outputToAttrListElement = outputName: - { name = outputName; + { + name = outputName; value = commonAttrs // { outPath = builtins.getAttr outputName attrs; inherit outputName; }; }; - + outputsList = map outputToAttrListElement outputs; - -in (builtins.head outputsList).value + +in +(builtins.head outputsList).value |