From 4bbbb58cb537014dd8b0b3c3c560c039ac57ad89 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 21 Feb 2020 12:47:29 +0000 Subject: chore: Rename pkgs->depot in all Nix file headers --- nix/buildLisp/default.nix | 5 ++--- nix/buildLisp/example/default.nix | 4 ++-- nix/tailscale/default.nix | 4 ++-- nix/yants/tests/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'nix') diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index 3203206fbe..0e94ed6223 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 {}; } -, ... }: +{ pkgs ? import {}, ... }: 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 4a8cba6002..6a518e4964 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 d836850aa1..a21af7d115 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 ae144db45a..b006f8b832 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. -- cgit 1.4.1