From 29e1e273b827db169359256f11bf801499c89e4a Mon Sep 17 00:00:00 2001
From: Henrik <i97henka@gmail.com>
Date: Fri, 2 Jun 2023 17:17:10 +0100
Subject: [PATCH] with removed from first line (#213)

* with removed from first line

example no longer starts with with (import <nixpkgs> {});

* added inherit example and comments.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
---
 pills/07-working-derivation.xml |  9 +++++++--
 pills/07/simple.txt             | 21 ++++++++++++---------
 pills/07/simple_inherit.txt     | 11 +++++++++++
 3 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 pills/07/simple_inherit.txt

diff --git a/pills/07-working-derivation.xml b/pills/07-working-derivation.xml
index d1f44e2..9be1faf 100644
--- a/pills/07-working-derivation.xml
+++ b/pills/07-working-derivation.xml
@@ -307,10 +307,15 @@
       <varname>coreutils</varname>.
     </para>
     <para>
-      Then we meet the
+      Below is a revised version of the <filename>simple.nix</filename> file, using the <code>inherit</code> keyword:
+
+      <programlisting><xi:include href="./07/simple_inherit.txt" parse="text" /></programlisting>
+
+      Here we also take the opportunity to introduce the
       <link xlink:href="https://nixos.org/manual/nix/stable/expressions/language-constructs.html#inheriting-attributes"><code>inherit</code> keyword</link>.
       <code>inherit foo;</code> is equivalent to <code>foo = foo;</code>.
-      Similarly, <code>inherit foo bar;</code> is equivalent to <code>foo = foo; bar = bar;</code>.
+      Similarly, <code>inherit gcc coreutils;</code> is equivalent to <code> gcc = gcc; coreutils = coreutils;</code>.
+      Lastly, <code>inherit (pkgs) gcc coreutils;</code> is equivalent to <code> gcc = pkgs.gcc; coreutils = pkgs.coreutils;</code>.
     </para>
     <para>
       This syntax only makes sense inside sets. There's no magic involved, it's
diff --git a/pills/07/simple.txt b/pills/07/simple.txt
index b975e95..aff3d15 100644
--- a/pills/07/simple.txt
+++ b/pills/07/simple.txt
@@ -1,9 +1,12 @@
-with (import <nixpkgs> {});
-derivation {
-  name = "simple";
-  builder = "${bash}/bin/bash";
-  args = [ ./simple_builder.sh ];
-  inherit gcc coreutils;
-  src = ./simple.c;
-  system = builtins.currentSystem;
-}
+let
+  pkgs = import <nixpkgs> {};
+in
+  pkgs.stdenv.mkDerivation {
+    name = "simple";
+    builder = "${pkgs.bash}/bin/bash";
+    args = [ ./simple_builder.sh ];
+    gcc = pkgs.gcc;
+    coreutils = pkgs.coreutils;
+    src = ./simple.c;
+    system = builtins.currentSystem;
+}
\ No newline at end of file
diff --git a/pills/07/simple_inherit.txt b/pills/07/simple_inherit.txt
new file mode 100644
index 0000000..7abbf03
--- /dev/null
+++ b/pills/07/simple_inherit.txt
@@ -0,0 +1,11 @@
+let
+  pkgs = import <nixpkgs> {};
+in
+  pkgs.stdenv.mkDerivation {
+    name = "simple";
+    builder = "${pkgs.bash}/bin/bash";
+    args = [ ./simple_builder.sh ];
+    inherit (pkgs) gcc coreutils;
+    src = ./simple.c;
+    system = builtins.currentSystem;
+}
\ No newline at end of file