Merge pull request #216 from henrik-ch/pill10

Pill10
NixOS · Jul 10, 2023 · ea8ef42 · ea8ef42
2 parents 7dcefde + 171fc1a
commit ea8ef42
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pills/10/autotools-nix.txt b/pills/10/autotools-nix.txt
@@ -1,12 +1,12 @@
 pkgs: attrs:
-  with pkgs;
   let defaultAttrs = {
-    builder = "${bash}/bin/bash";
+    builder = "${pkgs.bash}/bin/bash";
     args = [ ./builder.sh ];
     setup = ./setup.sh;
-    baseInputs = [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep binutils.bintools patchelf findutils ];
+    baseInputs = with pkgs; [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep binutils.bintools patchelf findutils ];
     buildInputs = [];
     system = builtins.currentSystem;
   };
   in
-derivation (defaultAttrs // attrs)
+  derivation (defaultAttrs // attrs)
+
diff --git a/pills/10/hello-nix.txt b/pills/10/hello-nix.txt
@@ -2,6 +2,6 @@ let
   pkgs = import <nixpkgs> {};
   mkDerivation = import ./autotools.nix pkgs;
 in mkDerivation {
-  name = "hello";
-  src = ./hello-2.10.tar.gz;
-}
+    name = "hello";
+    src = ./hello-2.12.1.tar.gz;
+  }