Skip to content

Commit

Permalink
Remove some stray usages of importNcl
Browse files Browse the repository at this point in the history
  • Loading branch information
Théophane Hufschmitt committed Jun 19, 2024
1 parent d39a3fd commit a7af8ed
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/bootstrap-no-flake.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let
organistSrc = builtins.fetchTarball "https://github.com/nickel-lang/organist/archive/main.tar.gz";
organist = pkgs.callPackage "${organistSrc}/lib/lib.nix" {inherit organistSrc;};
in
(organist.importNcl {baseDir = ./.;}).shells.default
(organist.importOrganist {baseDir = ./.;}).shells.default
```

And then use `nix develop -f shell.nix` as usual. Note that this will not use nixpkgs and Nickel from Organist's flake.lock.
Expand All @@ -22,5 +22,5 @@ let
organistSrc = builtins.fetchTarball "https://github.com/nickel-lang/organist/archive/main.tar.gz";
organist = ((import flake-compat) {src = organistSrc;}).defaultNix.lib.${builtins.currentSystem};
in
(organist.importNcl {baseDir = ./.;}).shells.default
(organist.importOrganist {baseDir = ./.;}).shells.default
```
2 changes: 1 addition & 1 deletion lib/lib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
else value;

# Call Nickel on a given Nickel expression with the inputs declared in it.
# See importNcl for details about the flakeInputs parameter.
# See importOrganist for details about the flakeInputs parameter.
callNickel = {
/*
: [String]
Expand Down
2 changes: 1 addition & 1 deletion lib/nix-interop/derivation.ncl
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ in
| optional
| Version,
system
| doc "The system to build the package on. Defaults to the system used by importNcl."
| doc "The system to build the package on. Defaults to the system used by importOrganist."
| NullOr System
| default
= null,
Expand Down

0 comments on commit a7af8ed

Please sign in to comment.