about summary refs log tree commit diff
path: root/web
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-02-21T12·47+0000
committerVincent Ambo <tazjin@google.com>2020-02-21T13·54+0000
commit4bbbb58cb537014dd8b0b3c3c560c039ac57ad89 (patch)
treeffd6c2c6758f655801ea6497b3dd9d2f2d04ebc9 /web
parent5d9d84f4cfdbed049e71ce6f15bb1ad8650f7acf (diff)
chore: Rename pkgs->depot in all Nix file headers r/559
Diffstat (limited to 'web')
-rw-r--r--web/blog/default.nix6
-rw-r--r--web/blog/fragments.nix6
-rw-r--r--web/cgit-taz/default.nix8
-rw-r--r--web/homepage/default.nix4
-rw-r--r--web/tazblog_lisp/default.nix4
5 files changed, 14 insertions, 14 deletions
diff --git a/web/blog/default.nix b/web/blog/default.nix
index a8e48a9d6888..d2f04aaea574 100644
--- a/web/blog/default.nix
+++ b/web/blog/default.nix
@@ -2,9 +2,9 @@
 # files in this repository.
 #
 # All blog posts are rendered from Markdown by cheddar.
-{ pkgs, lib, ... }@args:
+{ depot, lib, ... }@args:
 
-with pkgs.nix.yants;
+with depot.nix.yants;
 
 let
   inherit (builtins) filter hasAttr map;
@@ -33,7 +33,7 @@ let
   posts = list post (import ./posts.nix);
   fragments = import ./fragments.nix args;
 
-  rendered = pkgs.third_party.runCommandNoCC "tazjins-blog" {} ''
+  rendered = depot.third_party.runCommandNoCC "tazjins-blog" {} ''
     mkdir -p $out
 
     ${lib.concatStringsSep "\n" (map (post:
diff --git a/web/blog/fragments.nix b/web/blog/fragments.nix
index b13ba20c6699..18416e4c4d29 100644
--- a/web/blog/fragments.nix
+++ b/web/blog/fragments.nix
@@ -6,11 +6,11 @@
 # fragments together in a runCommand execution.
 #
 # The post index is generated by //web/homepage, not by this code.
-{ pkgs, lib, ... }:
+{ depot, lib, ... }:
 
 let
   inherit (builtins) filter map hasAttr replaceStrings toFile;
-  inherit (pkgs.third_party) runCommandNoCC writeText;
+  inherit (depot.third_party) runCommandNoCC writeText;
 
   # Generate a post list for all listed, non-draft posts.
   isDraft = post: (hasAttr "draft" post) && post.draft;
@@ -86,7 +86,7 @@ let
     }
 
     # Write the actual post through cheddar's about-filter mechanism
-    cat ${post.content} | ${pkgs.tools.cheddar}/bin/cheddar --about-filter ${post.content} >> $out
+    cat ${post.content} | ${depot.tools.cheddar}/bin/cheddar --about-filter ${post.content} >> $out
     echo '</article>' >> $out
 
     cat ${toFile "footer.html" footer} >> $out
diff --git a/web/cgit-taz/default.nix b/web/cgit-taz/default.nix
index 21f19eaa7d19..d18c782907dc 100644
--- a/web/cgit-taz/default.nix
+++ b/web/cgit-taz/default.nix
@@ -4,13 +4,13 @@
 # In the first round this will just serve my GitHub repositories until
 # I'm happy with the display.
 
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs.third_party;
+with depot.third_party;
 
 let
   sourceFilter = writeShellScriptBin "cheddar-about" ''
-    exec ${pkgs.tools.cheddar}/bin/cheddar --about-filter $@
+    exec ${depot.tools.cheddar}/bin/cheddar --about-filter $@
   '';
   cgitConfig = writeText "cgitrc" ''
     # Global configuration
@@ -18,7 +18,7 @@ let
     enable-http-clone=1
     readme=:README.md
     about-filter=${sourceFilter}/bin/cheddar-about
-    source-filter=${pkgs.tools.cheddar}/bin/cheddar
+    source-filter=${depot.tools.cheddar}/bin/cheddar
     enable-log-filecount=1
     enable-log-linecount=1
     enable-follow-links=1
diff --git a/web/homepage/default.nix b/web/homepage/default.nix
index 3c1e75f8f32b..22380fdea700 100644
--- a/web/homepage/default.nix
+++ b/web/homepage/default.nix
@@ -5,9 +5,9 @@
 # elements for things such as blog posts and projects.
 #
 # Content for the blog is in //web/blog instead of here.
-{ pkgs, lib, ... }:
+{ depot, lib, ... }:
 
-with pkgs;
+with depot;
 with nix.yants;
 
 let
diff --git a/web/tazblog_lisp/default.nix b/web/tazblog_lisp/default.nix
index 178c731ccb75..b5527c196dbf 100644
--- a/web/tazblog_lisp/default.nix
+++ b/web/tazblog_lisp/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.nix.buildLisp.library {
+depot.nix.buildLisp.library {
   name = "tazblog";
 
   deps =