about summary refs log tree commit diff
path: root/third_party/nix
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--third_party/nix/corepkgs/buildenv.nix12
-rw-r--r--third_party/nix/corepkgs/derivation.nix9
-rw-r--r--third_party/nix/corepkgs/fetchurl.nix19
-rw-r--r--third_party/nix/corepkgs/imported-drv-to-derivation.nix13
-rw-r--r--third_party/nix/default.nix58
-rw-r--r--third_party/nix/test-vm.nix3
-rw-r--r--third_party/nixery/default.nix3
-rw-r--r--third_party/nixpkgs/default.nix9
8 files changed, 73 insertions, 53 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
diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix
index e01fad12f034..bd448156f092 100644
--- a/third_party/nix/default.nix
+++ b/third_party/nix/default.nix
@@ -1,5 +1,4 @@
-args@{
-  depot ? (import ../.. {})
+args@{ depot ? (import ../.. { })
 , pkgs ? depot.third_party.nixpkgs
 , lib
 , buildType ? "release"
@@ -8,39 +7,43 @@ args@{
 
 let
   aws-s3-cpp = pkgs.aws-sdk-cpp.override {
-    apis = ["s3" "transfer"];
+    apis = [ "s3" "transfer" ];
     customMemoryManagement = false;
   };
 
-  src = let
-    srcDir = ./.;
-    # create relative paths for all the sources we are filtering
-    asRelative = path:
-      let
-        srcS = toString srcDir;
-        pathS = toString path;
-      in
+  src =
+    let
+      srcDir = ./.;
+      # create relative paths for all the sources we are filtering
+      asRelative = path:
+        let
+          srcS = toString srcDir;
+          pathS = toString path;
+        in
         if ! lib.hasPrefix srcS pathS then
           throw "Path is outside of the working directory."
         else
-        lib.removePrefix srcS pathS;
+          lib.removePrefix srcS pathS;
 
-  in builtins.filterSource (path: type:
-    # Strip out .nix files that are in the root of the repository.  Changing
-    # the expression of tvix shouldn't cause a rebuild of tvix unless really
-    # required.
-    !(dirOf (asRelative path) == "/" && lib.hasSuffix ".nix" path) &&
+    in
+    builtins.filterSource
+      (path: type:
+        # Strip out .nix files that are in the root of the repository.  Changing
+        # the expression of tvix shouldn't cause a rebuild of tvix unless really
+        # required.
+        !(dirOf (asRelative path) == "/" && lib.hasSuffix ".nix" path) &&
 
-    # remove the proto files from the repo as those are compiled separately
-    !(lib.hasPrefix "src/proto" (asRelative path)) &&
+        # remove the proto files from the repo as those are compiled separately
+        !(lib.hasPrefix "src/proto" (asRelative path)) &&
 
-    # ignore result symlinks
-    !(type == "symlink" && lib.hasPrefix "result" (baseNameOf path))
-  ) srcDir;
+        # ignore result symlinks
+        !(type == "symlink" && lib.hasPrefix "result" (baseNameOf path))
+      )
+      srcDir;
 
   # Proto generation in CMake is theoretically possible, but that is
   # very theoretical - this does it in Nix instead.
-  protoSrcs = pkgs.runCommand "nix-proto-srcs" {} ''
+  protoSrcs = pkgs.runCommand "nix-proto-srcs" { } ''
     export PROTO_SRCS=${./src/proto}
     mkdir -p $out/libproto
     ${depot.third_party.protobuf}/bin/protoc -I=$PROTO_SRCS \
@@ -52,12 +55,13 @@ let
 
   # Derivation for busybox that just has the `busybox` binary in bin/, not all
   # the symlinks, so cmake can find it
-  busybox = pkgs.runCommand "busybox" {} ''
+  busybox = pkgs.runCommand "busybox" { } ''
     mkdir -p $out/bin
     cp ${pkgs.busybox}/bin/busybox $out/bin
   '';
 
-in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
+in
+lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
   pname = "tvix";
   version = "2.3.4";
   inherit src;
@@ -141,7 +145,7 @@ in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
   # Work around broken system header include flags in the cxx toolchain.
   LIBCXX_INCLUDE = "${pkgs.llvmPackages_11.libcxx}/include/c++/v1";
 
-  SANDBOX_SHELL="${pkgs.busybox}/bin/busybox";
+  SANDBOX_SHELL = "${pkgs.busybox}/bin/busybox";
 
   # Install the various symlinks to the Nix binary which users expect
   # to exist.
@@ -190,7 +194,7 @@ in lib.fix (self: pkgs.fullLlvm11Stdenv.mkDerivation {
         ${pkgs.jq}/bin/jq < compile_commands.json -r 'map(.file)|.[]' | grep -v '/generated/' | ${pkgs.parallel}/bin/parallel ${pkgs.clang-tools}/bin/clang-tidy -p compile_commands.json $@
       '';
 
-      installCheckInputs = up.installCheckInputs ++ [run_clang_tidy];
+      installCheckInputs = up.installCheckInputs ++ [ run_clang_tidy ];
 
       shellHook = ''
         export NIX_DATA_DIR="${toString depot.path}/third_party"
diff --git a/third_party/nix/test-vm.nix b/third_party/nix/test-vm.nix
index e5f8690fcb2d..8b00e5515ba2 100644
--- a/third_party/nix/test-vm.nix
+++ b/third_party/nix/test-vm.nix
@@ -16,4 +16,5 @@ let
   };
 
   system = depot.third_party.nixos { inherit configuration; };
-in system.vm
+in
+system.vm
diff --git a/third_party/nixery/default.nix b/third_party/nixery/default.nix
index be3a9dfc1b7d..7a798ca0b074 100644
--- a/third_party/nixery/default.nix
+++ b/third_party/nixery/default.nix
@@ -12,7 +12,8 @@ let
     rev = commit;
     sha256 = "195rz25y3hfxcmniysajzjg7g69qhz7w06lql8fn0dbcdcxsq6g4";
   };
-in drvTargets (import src {
+in
+drvTargets (import src {
   inherit pkgs;
   commitHash = _: commit;
 })
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 5afed93e4c60..c5fa6a6781b0 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -6,7 +6,7 @@
 # in //default.nix passes this attribute as the `pkgs` argument to all
 # readTree derivations.
 
-{ depot ? {}, externalArgs ? {}, depotOverlays ? true, ... }:
+{ depot ? { }, externalArgs ? { }, depotOverlays ? true, ... }:
 
 let
   # This provides the sources of nixpkgs. We track both
@@ -42,7 +42,7 @@ let
 
   # Stable package set is imported, but not exposed, to overlay
   # required packages into the unstable set.
-  stableNixpkgs = import stableNixpkgsSrc {};
+  stableNixpkgs = import stableNixpkgsSrc { };
 
   # Overlay for packages that should come from the stable channel
   # instead (e.g. because something is broken in unstable).
@@ -58,7 +58,8 @@ let
     };
   };
 
-in import nixpkgsSrc {
+in
+import nixpkgsSrc {
   # allow users to inject their config into builds (e.g. to test CA derivations)
   config =
     (if externalArgs ? nixpkgsConfig then externalArgs.nixpkgsConfig else { })
@@ -75,5 +76,5 @@ in import nixpkgsSrc {
     depot.third_party.overlays.emacs
     depot.third_party.overlays.tvl
     depot.third_party.overlays.ecl-static
-  ] else []);
+  ] else [ ]);
 }
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-08-13T03ยท54+0000