diff options
author | Vincent Ambo <tazjin@google.com> | 2020-02-21T12·47+0000 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-02-21T13·54+0000 |
commit | 4bbbb58cb537014dd8b0b3c3c560c039ac57ad89 (patch) | |
tree | ffd6c2c6758f655801ea6497b3dd9d2f2d04ebc9 /nix | |
parent | 5d9d84f4cfdbed049e71ce6f15bb1ad8650f7acf (diff) |
chore: Rename pkgs->depot in all Nix file headers r/559
Diffstat (limited to 'nix')
-rw-r--r-- | nix/buildLisp/default.nix | 5 | ||||
-rw-r--r-- | nix/buildLisp/example/default.nix | 4 | ||||
-rw-r--r-- | nix/tailscale/default.nix | 4 | ||||
-rw-r--r-- | nix/yants/tests/default.nix | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index 3203206fbe7e..0e94ed6223b7 100644 --- a/nix/buildLisp/default.nix +++ b/nix/buildLisp/default.nix @@ -4,12 +4,11 @@ # buildLisp is designed to enforce conventions and do away with the # free-for-all of existing Lisp build systems. -{ pkgs ? { third_party = import <nixpkgs> {}; } -, ... }: +{ pkgs ? import <nixpkgs> {}, ... }: let inherit (builtins) map elemAt match filter; - inherit (pkgs.third_party) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl; + inherit (pkgs) lib runCommandNoCC makeWrapper writeText writeShellScriptBin sbcl; # # Internal helper definitions diff --git a/nix/buildLisp/example/default.nix b/nix/buildLisp/example/default.nix index 4a8cba60023a..6a518e4964a1 100644 --- a/nix/buildLisp/example/default.nix +++ b/nix/buildLisp/example/default.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: +{ depot, ... }: let - inherit (pkgs.nix) buildLisp; + inherit (depot.nix) buildLisp; # Example Lisp library. # diff --git a/nix/tailscale/default.nix b/nix/tailscale/default.nix index d836850aa112..a21af7d115dc 100644 --- a/nix/tailscale/default.nix +++ b/nix/tailscale/default.nix @@ -2,9 +2,9 @@ # # https://tailscale.com/kb/1018/install-acls -{ pkgs, ... }: +{ depot, ... }: -with pkgs.nix.yants; +with depot.nix.yants; let inherit (builtins) toFile toJSON; diff --git a/nix/yants/tests/default.nix b/nix/yants/tests/default.nix index ae144db45a6e..b006f8b832d0 100644 --- a/nix/yants/tests/default.nix +++ b/nix/yants/tests/default.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: +{ depot, pkgs, ... }: with builtins; -with pkgs.nix.yants; +with depot.nix.yants; # Note: Derivations are not included in the tests below as they cause # issues with deepSeq. |