changing to using builtins derivation and rename

renaming to mkDerivation
NixOS · Jun 5, 2023 · 04337a7 · 04337a7
1 parent f316006
commit 04337a7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/pills/08/hello-nix-darwin.txt b/pills/08/hello-nix-darwin.txt
@@ -1,7 +1,7 @@
 let
   pkgs = import <nixpkgs> {};
 in
-  pkgs.stdenv.mkDerivation {
+  derivation {
     name = "hello";
     builder = "${pkgs.bash}/bin/bash";
     args = [ ./hello_builder.sh ];

diff --git a/pills/08/hello-nix-rev-1.txt b/pills/08/hello-nix-rev-1.txt
@@ -1,9 +1,11 @@
-with (import <nixpkgs> {});
-derivation {
-  name = "hello";
-  builder = "${bash}/bin/bash";
-  args = [ ./builder.sh ];
-  buildInputs = [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep binutils.bintools ];
-  src = ./hello-2.10.tar.gz;
-  system = builtins.currentSystem;
-}
+let
+  pkgs = import <nixpkgs> {};
+in
+  derivation {
+    name = "hello";
+    builder = "${pkgs.bash}/bin/bash";
+    args = [ ./builder.sh ];
+    buildInputs = with pkgs; [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep binutils.bintools ];
+    src = ./hello-2.12.1.tar.gz;
+    system = builtins.currentSystem;
+  }
diff --git a/pills/08/hello-nix-rev-2.txt b/pills/08/hello-nix-rev-2.txt
@@ -1,8 +1,8 @@
 let
   pkgs = import <nixpkgs> {};
-  mymkDerivation = import ./autotools.nix pkgs;
+  mkDerivation = import ./autotools.nix pkgs;
 in 
-  mymkDerivation {
+  mkDerivation {
     name = "hello";
     src = ./hello-2.12.1.tar.gz;
   }
diff --git a/pills/08/hello-nix.txt b/pills/08/hello-nix.txt
@@ -1,7 +1,7 @@
 let
   pkgs = import <nixpkgs> {};
 in
-  pkgs.stdenv.mkDerivation {
+  derivation {
     name = "hello";
     builder = "${pkgs.bash}/bin/bash";
     args = [ ./hello_builder.sh ];