Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 939cf4ccebb1
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c7a6d07de1d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 1, 2018

  1. nix-channel grammar and punctuation 

    Minor changes to the nix-channel manpage for my first contribution
    @mfiano
    mfiano authored Mar 1, 2018
    Copy the full SHA
    ad97d1a View commit details

Commits on Mar 2, 2018

  1. Merge pull request #1932 from mfiano/patch-1 

    nix-channel grammar and punctuation
    @edolstra
    edolstra authored Mar 2, 2018
    Copy the full SHA
    5c7a6d0 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 doc/manual/command-ref/nix-channel.xml
8 changes: 4 additions & 4 deletions doc/manual/command-ref/nix-channel.xml
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@

<refsection><title>Description</title>

<para>A Nix channel is mechanism that allows you to automatically stay
<para>A Nix channel is a mechanism that allows you to automatically stay
up-to-date with a set of pre-built Nix expressions. A Nix channel is
just a URL that points to a place containing both a set of Nix
expressions and a pointer to a binary cache. <phrase
@@ -165,8 +165,8 @@ following files:</para>
<varlistentry><term><filename>nixexprs.tar.xz</filename></term>

<listitem><para>A tarball containing Nix expressions and files
referenced by them (such as build scripts and patches). At
top-level, the tarball should contain a single directory. That
referenced by them (such as build scripts and patches). At the
top level, the tarball should contain a single directory. That
directory must contain a file <filename>default.nix</filename>
that serves as the channel’s “entry point”.</para></listitem>

@@ -175,7 +175,7 @@ following files:</para>
<varlistentry><term><filename>binary-cache-url</filename></term>

<listitem><para>A file containing the URL to a binary cache (such
as <uri>https://cache.nixos.org</uri>. Nix will automatically
as <uri>https://cache.nixos.org</uri>). Nix will automatically
check this cache for pre-built binaries, if the user has
sufficient rights to add binary caches. For instance, in a
multi-user Nix setup, the binary caches provided by the channels