diff --git a/blog/default.nix b/blog/default.nix index aaece3366..fd35570a3 100644 --- a/blog/default.nix +++ b/blog/default.nix @@ -1,15 +1,10 @@ -{ - nixpkgs ? import {}, - depot ? import {}, - briefcase ? import {}, - ... -}: +{ 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 734e91e41..5add7f7c6 100644 --- a/blog/deploy.nix +++ b/blog/deploy.nix @@ -1,8 +1,4 @@ -{ - pkgs ? import {}, - briefcase ? import {}, - ... -}: +{ pkgs, briefcase, ... }: pkgs.dockerTools.buildLayeredImage { name = "blog"; diff --git a/clojure/buildClojure.nix b/clojure/buildClojure.nix index 2c0275d3c..53188b06d 100644 --- a/clojure/buildClojure.nix +++ b/clojure/buildClojure.nix @@ -1,4 +1,4 @@ -{ briefcase ? import {}, ... }: +{ briefcase, ... }: briefcase.nix.buildClojure.program { name = "test"; diff --git a/default.nix b/default.nix index cf7e61e4a..8b973bd2d 100644 --- a/default.nix +++ b/default.nix @@ -9,11 +9,14 @@ let fix = f: let x = f x; in x; # Global configuration that all packages are called with. - config = pkgs: { - inherit pkgs; + config = self: { + inherit self; + pkgs = import {}; + depot = import {}; + briefcase = import {}; }; - readTree' = import ~/depot/nix/readTree {}; + readTree' = import {}; # TODO: Find a better way to expose entire monorepo without introducing # "infinite recursion". @@ -27,12 +30,6 @@ let }; in fix(self: { config = config self; - - # Expose readTree for downstream repo consumers. - readTree = { - __functor = x: (readTree' x.config); - config = self.config; - }; } # Add local packages as structured by readTree diff --git a/emacs/default.nix b/emacs/default.nix index a61d6fb70..094b1c3db 100644 --- a/emacs/default.nix +++ b/emacs/default.nix @@ -1,11 +1,7 @@ -{ - pkgs ? import {}, - depot ? import {}, - ... -}: +{ pkgs, depot, ... }: let - utils = import ~/briefcase/utils; + utils = import ; # NOTE: I'm trying to keep the list of dependencies herein constrained to a # list of generic dependencies (i.e. not project or language specific). For # language-specific tooling, I'm intending to use shell.nix alongside lorri diff --git a/fish/default.nix b/fish/default.nix index d5ec372a5..f55e24af1 100644 --- a/fish/default.nix +++ b/fish/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {} , ... }: +{ pkgs, ... }: # TODO: Is it appropriate to put programming language dependencies here? Should # I have a bin dependency for every fish `abbr` and `alias` that I use? What diff --git a/go/shell.nix b/go/shell.nix index 836718d85..e98da7d0f 100644 --- a/go/shell.nix +++ b/go/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {}, ... }: +{ pkgs, ... }: pkgs.mkShell { buildInputs = [ diff --git a/gopkgs/kv/default.nix b/gopkgs/kv/default.nix index 1d54ecc35..c89e00213 100644 --- a/gopkgs/kv/default.nix +++ b/gopkgs/kv/default.nix @@ -1,7 +1,4 @@ -{ - depot ? import {}, - ... -}: +{ depot, ... }: depot.buildGo.package { name = "kv"; diff --git a/gopkgs/utils/default.nix b/gopkgs/utils/default.nix index d92b82ca4..5955fa4cf 100644 --- a/gopkgs/utils/default.nix +++ b/gopkgs/utils/default.nix @@ -1,7 +1,4 @@ -{ - depot ? import {}, - ... -}: +{ depot, ... }: depot.buildGo.package { name = "utils"; diff --git a/lisp/f/default.nix b/lisp/f/default.nix index 0ca6898b6..f64bfcc5f 100644 --- a/lisp/f/default.nix +++ b/lisp/f/default.nix @@ -1,8 +1,4 @@ -{ - depot ? import {}, - briefcase ? import {}, - ... -}: +{ depot, briefcase, ... }: depot.nix.buildLisp.library { name = "f"; diff --git a/lisp/prelude.nix b/lisp/prelude.nix index 9051f8239..5fe5d628e 100644 --- a/lisp/prelude.nix +++ b/lisp/prelude.nix @@ -1,4 +1,4 @@ -{ depot ? import {}, ... }: +{ depot, ... }: depot.nix.buildLisp.library { name = "prelude"; diff --git a/mail/default.nix b/mail/default.nix index d1b67b965..a149ed812 100644 --- a/mail/default.nix +++ b/mail/default.nix @@ -1,4 +1,4 @@ -{ depot ? import {}, ... }: +{ depot, ... }: let inherit (builtins) fetchGit; diff --git a/monzo_ynab/job.nix b/monzo_ynab/job.nix index f6cb78789..1e1075101 100644 --- a/monzo_ynab/job.nix +++ b/monzo_ynab/job.nix @@ -1,8 +1,4 @@ -{ - depot ? import {}, - briefcase ? import {}, - ... -}: +{ depot, briefcase, ... }: depot.buildGo.program { name = "job"; diff --git a/monzo_ynab/shell.nix b/monzo_ynab/shell.nix index be185dd1d..efdc5d3e4 100644 --- a/monzo_ynab/shell.nix +++ b/monzo_ynab/shell.nix @@ -1,8 +1,4 @@ -{ - pkgs ? import {}, - briefcase ? import {}, - ... -}: +{ pkgs, briefcase, ... }: pkgs.mkShell { buildInputs = [ diff --git a/monzo_ynab/tokens.nix b/monzo_ynab/tokens.nix index a00191a20..97de09d74 100644 --- a/monzo_ynab/tokens.nix +++ b/monzo_ynab/tokens.nix @@ -1,8 +1,4 @@ -{ - depot ? import {}, - briefcase ? import {}, - ... -}: +{ depot, briefcase, ... }: let auth = depot.buildGo.package { diff --git a/scratch/deepmind/part_two/shell.nix b/scratch/deepmind/part_two/shell.nix index 606dd7167..f1b02c4d2 100644 --- a/scratch/deepmind/part_two/shell.nix +++ b/scratch/deepmind/part_two/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {}, ... }: +{ pkgs, ... }: pkgs.mkShell { buildInputs = with pkgs; [ diff --git a/shell.nix b/shell.nix index ef8960b82..f3978bd69 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {}, ... }: +{ pkgs, ... }: pkgs.mkShell rec { buildInputs = []; diff --git a/third_party/lisp/anaphora.nix b/third_party/lisp/anaphora.nix index 04a1dd847..bf4bf663f 100644 --- a/third_party/lisp/anaphora.nix +++ b/third_party/lisp/anaphora.nix @@ -1,4 +1,4 @@ -{ depot ? import {}, ... }: +{ depot, ... }: let src = builtins.fetchGit { diff --git a/third_party/lisp/cl-arrows.nix b/third_party/lisp/cl-arrows.nix index 60cd8a375..4c09d688f 100644 --- a/third_party/lisp/cl-arrows.nix +++ b/third_party/lisp/cl-arrows.nix @@ -1,4 +1,4 @@ -{ depot ? import {}, ... }: +{ depot, ... }: let src = builtins.fetchGit { diff --git a/third_party/lisp/cl-colors.nix b/third_party/lisp/cl-colors.nix index 6d49dd7aa..fa35b755d 100644 --- a/third_party/lisp/cl-colors.nix +++ b/third_party/lisp/cl-colors.nix @@ -1,8 +1,4 @@ -{ - depot ? import {}, - briefcase ? import {}, - ... -}: +{ depot, briefcase, ... }: let src = builtins.fetchGit { diff --git a/third_party/lisp/let-plus.nix b/third_party/lisp/let-plus.nix index 6e74b9622..a750443fd 100644 --- a/third_party/lisp/let-plus.nix +++ b/third_party/lisp/let-plus.nix @@ -1,8 +1,4 @@ -{ - depot ? import {}, - briefcase ? import {}, - ... -}: +{ depot, briefcase, ... }: let src = builtins.fetchGit { diff --git a/third_party/lisp/linear-programming.nix b/third_party/lisp/linear-programming.nix index 432fedb8b..fc95787a1 100644 --- a/third_party/lisp/linear-programming.nix +++ b/third_party/lisp/linear-programming.nix @@ -1,4 +1,4 @@ -{ depot ? import {}, ... }: +{ depot, ... }: let src = builtins.fetchGit { diff --git a/third_party/lisp/prove.nix b/third_party/lisp/prove.nix index 2579d0392..7c5879b1f 100644 --- a/third_party/lisp/prove.nix +++ b/third_party/lisp/prove.nix @@ -1,8 +1,4 @@ -{ - depot ? import {}, - briefcase ? import {}, - ... -}: +{ depot, briefcase, ... }: let src = builtins.fetchGit { diff --git a/tools/rfcToKindle/default.nix b/tools/rfcToKindle/default.nix index 3bfa71f28..8fb93c3bb 100644 --- a/tools/rfcToKindle/default.nix +++ b/tools/rfcToKindle/default.nix @@ -1,6 +1,4 @@ -{ - depot ? import {}, ... -}: +{ depot, ... }: # TODO: This doesn't depend on `sendgmr` at the moment, but it should. As such, # it's an imcomplete packaging. diff --git a/tools/run/default.nix b/tools/run/default.nix index 113491536..7d772c3f9 100644 --- a/tools/run/default.nix +++ b/tools/run/default.nix @@ -1,9 +1,4 @@ -{ - pkgs ? import {}, - depot ? import {}, - briefcase ? import {}, - ... -}: +{ pkgs, depot, briefcase, ... }: depot.buildGo.program { name = "run"; diff --git a/tools/run/shell.nix b/tools/run/shell.nix index 8b97f04ca..de192ae15 100644 --- a/tools/run/shell.nix +++ b/tools/run/shell.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {}, ... }: +{ pkgs, ... }: pkgs.mkShell { buildInputs = with pkgs; [ diff --git a/tools/simple_vim/default.nix b/tools/simple_vim/default.nix index 7ea0b5ebc..7132a6492 100644 --- a/tools/simple_vim/default.nix +++ b/tools/simple_vim/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {}, ... }: +{ pkgs, ... }: let script = pkgs.writeShellScriptBin "simple_vim" '' diff --git a/tools/symlinkManager/default.nix b/tools/symlinkManager/default.nix index 6500991ba..16bb26bb3 100644 --- a/tools/symlinkManager/default.nix +++ b/tools/symlinkManager/default.nix @@ -1,8 +1,4 @@ -{ - depot ? import {}, - briefcase ? import {}, - ... -}: +{ depot, briefcase, ... }: depot.buildGo.program { name = "symlink-mgr";