From 28a11ab3ded6f8051b9601795280ab55dfa815e8 Mon Sep 17 00:00:00 2001 From: Tim Head Date: Fri, 9 Nov 2018 08:10:34 +0100 Subject: [PATCH] Fix comment typos --- repo2docker/buildpacks/nix/__init__.py | 3 ++- tests/nix/binder-dir/README.rst | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/repo2docker/buildpacks/nix/__init__.py b/repo2docker/buildpacks/nix/__init__.py index 707f6d8a..29e9dd50 100644 --- a/repo2docker/buildpacks/nix/__init__.py +++ b/repo2docker/buildpacks/nix/__init__.py @@ -64,7 +64,8 @@ class NixBuildPack(BaseImage): def get_start_script(self): """The path to a script to be executed as ENTRYPOINT""" # the shell wrapper script duplicates the behaviour of other buildpacks - # when it coems to the `start` script + # when it comes to the `start` script as well as handling a binder/ + # sub-directory when it exists return "/usr/local/bin/nix-shell-wrapper" def detect(self): diff --git a/tests/nix/binder-dir/README.rst b/tests/nix/binder-dir/README.rst index 8c6ad2a7..8a645629 100644 --- a/tests/nix/binder-dir/README.rst +++ b/tests/nix/binder-dir/README.rst @@ -1,13 +1,4 @@ -<<<<<<< HEAD default.nix in a binder/ directory ---------------------------------- -Check we find and use `default.nix` when it is in a `binder/` sub-directory. -======= -Nix environment - default.nix ------------------------------ - -You can install a nix shell environment using the traditional default.nix. - -Documentation on the syntax and typical setup of a ``nix-shell`` environment can be found `here `_. ->>>>>>> 983b7f5... Add test and support for binder sub-directory +Check we find and use ``default.nix`` when it is in a ``binder/`` sub-directory.