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/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 514f21a68d4d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a90d58a4491
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 15, 2019

  1. Fix typos in the Nixpkgs Manual. (#70775)

    @PyroLagus @c0bw3b
    PyroLagus authored and c0bw3b committed Oct 15, 2019
    Copy the full SHA
    3a90d58 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 doc/configuration.xml
  2. +2 −2 doc/stdenv.xml
2 changes: 1 addition & 1 deletion doc/configuration.xml
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
However, this does not allow unfree software for individual users. Their configurations are managed separately.
</para>
<para>
A user's of nixpkgs configuration is stored in a user-specific configuration file located at <filename>~/.config/nixpkgs/config.nix</filename>. For example:
A user's nixpkgs configuration is stored in a user-specific configuration file located at <filename>~/.config/nixpkgs/config.nix</filename>. For example:
<programlisting>
{
allowUnfree = true;
4 changes: 2 additions & 2 deletions doc/stdenv.xml
View file
Original file line number Diff line number Diff line change
@@ -1692,7 +1692,7 @@ someVar=$(stripHash $name)
</term>
<listitem>
<para>
Convenience function for <literal>makeWrapper</literal> that automatically creates a sane wrapper file It takes all the same arguments as <literal>makeWrapper</literal>, except for <literal>--argv0</literal>.
Convenience function for <literal>makeWrapper</literal> that automatically creates a sane wrapper file. It takes all the same arguments as <literal>makeWrapper</literal>, except for <literal>--argv0</literal>.
</para>
<para>
It cannot be applied multiple times, since it will overwrite the wrapper file.
@@ -1869,7 +1869,7 @@ addEnvHooks "$hostOffset" myBashFunction
</para>

<para>
Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list the mechanism is only to be used as a last resort, it might cover most uses.
Here are some more packages that provide a setup hook. Since the list of hooks is extensible, this is not an exhaustive list. The mechanism is only to be used as a last resort, so it might cover most uses.
<variablelist>
<varlistentry>
<term>