chore: Rename pkgs->depot in all Nix file headers

This commit is contained in:
Vincent Ambo 2020-02-21 12:47:29 +00:00
parent 5d9d84f4cf
commit 4bbbb58cb5
113 changed files with 318 additions and 349 deletions

View file

@ -1,28 +1,13 @@
# This file is used to move things from nested attribute sets to the
# top-level.
{ pkgs, ... }:
{ depot, ... }:
{
buildGo = pkgs.nix.buildGo;
# These packages must be exposed at the top-level for compatibility
# with Nixery.
inherit (pkgs.third_party)
bashInteractive
cacert
coreutils
iana-etc
jq
moreutils
nano
openssl
runCommand
symlinkJoin
writeText;
buildGo = depot.nix.buildGo; # TODO(tazjin): remove this
# These packages must be exposed for compatibility with buildGo.
#
# Despite buildGo being tracked in this tree, I want it to be possible
# for external users to import it with the default nixpkgs layout.
inherit (pkgs.third_party) go ripgrep;
inherit (depot.third_party) go ripgrep;
}

View file

@ -2,7 +2,7 @@
# the newer version is a lot of effort.
{ pkgs, ... }:
(import (pkgs.third_party.fetchFromGitHub {
(import (pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "nixpkgs";
rev = "14f9ee66e63077539252f8b4550049381a082518";

View file

@ -1,6 +1,6 @@
{ pkgs, ... }:
{ depot, ... }:
with pkgs;
with depot;
third_party.writeShellScriptBin "kontemplate" ''
export PATH="${ops.kms_pass}/bin:$PATH"

View file

@ -1,9 +1,9 @@
{ pkgs, ... }:
{ name, src, deps ? (_: []), emacs ? pkgs.third_party.emacs26-nox }:
{ name, src, deps ? (_: []), emacs ? pkgs.emacs26-nox }:
let
inherit (pkgs.third_party) emacsPackagesNg emacsPackagesNgGen writeTextFile;
inherit (pkgs) emacsPackagesNg emacsPackagesNgGen writeTextFile;
inherit (builtins) isString toFile;
finalEmacs = (emacsPackagesNgGen emacs).emacsWithPackages deps;