about summary refs log tree commit diff
path: root/blog
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-02-23T22·29+0000
committerWilliam Carroll <wpcarro@gmail.com>2020-03-01T22·32+0000
commit9e0fdd397382da10a8486d25cfa9d889fdd17f86 (patch)
treec1d097f0ecb1a5366dd22989c2beda9c853dd482 /blog
parentfd720fbe4d284d0562ab32e7bb6a3f7171992c21 (diff)
Remove default values for Nix expression parameters
I'm not sure if this commit breaks everything in my monorepo. I think it
will.

Why am I doing this? Perhaps it's a bad idea. I don't fully understand how
readTree works. My ignorance is costing me hours of time spent debugging. In an
effort to better understand readTree, I'm removing the default values for my Nix
expression parameters, which I believe have preventing errors from surfacing.
Diffstat (limited to 'blog')
-rw-r--r--blog/default.nix11
-rw-r--r--blog/deploy.nix6
2 files changed, 4 insertions, 13 deletions
diff --git a/blog/default.nix b/blog/default.nix
index aaece3366876..fd35570a322a 100644
--- a/blog/default.nix
+++ b/blog/default.nix
@@ -1,15 +1,10 @@
-{
-  nixpkgs ? import <nixpkgs> {},
-  depot ? import <depot> {},
-  briefcase ? import <briefcase> {},
-  ...
-}:
+{ pkgs, depot, briefcase, ... }:
 
 let
-  injections = nixpkgs.writeText "injections.lisp" ''
+  injections = pkgs.writeText "injections.lisp" ''
     (in-package #:server)
     (setq *path-to-posts* "${./posts}")
-    (setq *pandoc-bin* "${nixpkgs.pandoc}/bin/pandoc")
+    (setq *pandoc-bin* "${pkgs.pandoc}/bin/pandoc")
     (setq *html-template* "${./src/index.html}")
   '';
 in depot.nix.buildLisp.program {
diff --git a/blog/deploy.nix b/blog/deploy.nix
index 734e91e41b0b..5add7f7c6ecb 100644
--- a/blog/deploy.nix
+++ b/blog/deploy.nix
@@ -1,8 +1,4 @@
-{
-  pkgs ? import <nixpkgs> {},
-  briefcase ? import <briefcase> {},
-  ...
-}:
+{ pkgs, briefcase, ... }:
 
 pkgs.dockerTools.buildLayeredImage {
   name = "blog";