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-pills
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0fd8c234bd21
Choose a base ref
...
head repository: NixOS/nix-pills
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e67037cb81f
Choose a head ref
  • 5 commits
  • 2 files changed
  • 5 contributors

Commits on Oct 10, 2019

  1. 17: Use imperative voice 

    Tell the reader to recall, not that the author recalls...

Signed-off-by: Kenny Ballou <kballou@devnulllabs.io>
    @kennyballou
    kennyballou committed Oct 10, 2019
    Copy the full SHA
    f546d7e View commit details

Commits on Oct 15, 2019

  1. Merge pull request #118 from kennyballou/nix-pill-smfix 

    17: Use imperative voice
    @globin
    globin authored Oct 15, 2019
    Copy the full SHA
    9f08bbf View commit details

Commits on Oct 17, 2019

  1. Improve grammar/choice of word

    @adamse
    adamse authored Oct 17, 2019
    Copy the full SHA
    7e35b3a View commit details

  2. Improve grammar/choice of word (#119) 

    Improve grammar/choice of word
    @Mic92
    Mic92 authored Oct 17, 2019
    Copy the full SHA
    afebea8 View commit details

  3. Merge branch 'fix-pill-7-inherit-url'

    @ryantm
    ryantm committed Oct 17, 2019
    Copy the full SHA
    6e67037 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pills/05-functions-and-imports.xml
  2. +1 −1 pills/17-nixpkgs-overriding-packages.xml
2 changes: 1 addition & 1 deletion pills/05-functions-and-imports.xml
View file
Original file line number Diff line number Diff line change
@@ -264,7 +264,7 @@ xml:id="functions-and-imports">
<screen><xi:include href="./05/import.txt" parse="text" /></screen>

<para>
Yes it's really that straight. You import a file, and it gets parsed as
Yes it's really that simple. You import a file, and it gets parsed as
expression. Note that the scope of the imported file does not inherit the
scope of the importer.
</para>
2 changes: 1 addition & 1 deletion pills/17-nixpkgs-overriding-packages.xml
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
<section>
<title>Overriding a package</title>
<para>
I recall the override design pattern from the <link linkend="override-design-pattern">nix pill 14</link>. Instead of calling a function with parameters directly, we make the call (function + parameters) overridable.
Recall the override design pattern from the <link linkend="override-design-pattern">nix pill 14</link>. Instead of calling a function with parameters directly, we make the call (function + parameters) overridable.
</para>
<para>
We put the override function in the returned attribute set of the original function call.