diff options
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | lib/lock_loader.ml | 20 |
2 files changed, 14 insertions, 10 deletions
@@ -193,7 +193,7 @@ See choices at the `maker’s website <https://toast.al/funding>`_. .. [1] :ac:`WIP` with upstream Nixpkgs - • Darcs: https://github.com/NixOS/nixpkgs/pull/467172 - • Pijul: https://github.com/NixOS/nixpkgs/pull/467890 + • :del:`Darcs: https://github.com/NixOS/nixpkgs/pull/467172` + • :del:`Pijul: https://github.com/NixOS/nixpkgs/pull/467890` .. vim: set textwidth=80 diff --git a/lib/lock_loader.ml b/lib/lock_loader.ml index b199342..98e86e3 100644 --- a/lib/lock_loader.ml +++ b/lib/lock_loader.ml @@ -98,7 +98,8 @@ let pp_nix_named_args fmt args = let pp_cfg (ppf : Format.formatter) = pp_nix_named_args ppf [ ("system", Some "builtins.currentSystem"); - ("bootstrap-nixpkgs-name", Some "null"); + ("nixpkgs", Some "null"); + ("bootstrap-nixpkgs-lock-name", Some "null"); ] (* TODO: consider *not* doing manually as this is ugly AF, but would probably @@ -201,14 +202,17 @@ let pp_body ~version (ppf : Format.formatter) () = pf ppf {| else@.|}; pf ppf {| throw "Unsupported input kind “${builtins.toString k}”.";@.|}; pf ppf {|@.|}; - pf ppf {| nixpkgs = builtin-to-input "nixpkgs-for-nixtamal" (@.|}; - pf ppf {| if builtins.isNull bootstrap-nixpkgs-name then@.|}; - pf ppf {| lock.i.nixpkgs-nixtamal or lock.i.nixpkgs@.|}; - pf ppf {| else@.|}; - pf ppf {| lock.i.${bootstrap-nixpkgs-name}@.|}; - pf ppf {| );@.|}; + pf ppf {| nixpkgs' = if builtins.isNull nixpkgs then@.|}; + pf ppf {| builtin-to-input "nixpkgs-for-nixtamal" (@.|}; + pf ppf {| if builtins.isString bootstrap-nixpkgs-lock-name then@.|}; + pf ppf {| lock.i.${bootstrap-nixpkgs-lock-name}@.|}; + pf ppf {| else@.|}; + pf ppf {| lock.i.nixpkgs-nixtamal or lock.i.nixpkgs@.|}; + pf ppf {| )@.|}; + pf ppf {| else@.|}; + pf ppf {| nixpkgs;@.|}; pf ppf {|@.|}; - pf ppf {| pkgs = import nixpkgs {inherit system;};@.|}; + pf ppf {| pkgs = import nixpkgs' {inherit system;};@.|}; pf ppf {|@.|}; pf ppf {| inherit (pkgs) lib;@.|}; pf ppf {|@.|}; |