From c564d1b66378f3b460775758b94c179411def0fa Mon Sep 17 00:00:00 2001 From: i97henka Date: Tue, 6 Jun 2023 17:18:43 +0100 Subject: [PATCH 1/3] updated autotools removed and reduced use of with. --- pills/10/autotools-nix.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pills/10/autotools-nix.txt b/pills/10/autotools-nix.txt index a91e254..4cae7e0 100644 --- 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 patchelf findutils binutils.bintools]; buildInputs = []; system = builtins.currentSystem; }; in -derivation (defaultAttrs // attrs) + derivation (defaultAttrs // attrs) + \ No newline at end of file From ff7c04d0376e3d101496fb2d0e6ba1ecc338e96a Mon Sep 17 00:00:00 2001 From: i97henka Date: Tue, 6 Jun 2023 17:23:31 +0100 Subject: [PATCH 2/3] hello.nix refresh updated tarball version and small change to indentation. --- pills/10/hello-nix.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pills/10/hello-nix.txt b/pills/10/hello-nix.txt index c216fb1..bf60ab6 100644 --- a/pills/10/hello-nix.txt +++ b/pills/10/hello-nix.txt @@ -2,6 +2,6 @@ let pkgs = import {}; mkDerivation = import ./autotools.nix pkgs; in mkDerivation { - name = "hello"; - src = ./hello-2.10.tar.gz; -} + name = "hello"; + src = ./hello-2.12.1.tar.gz; + } From 171fc1a4e041edc76f6ca0b42e27f6a484ae8698 Mon Sep 17 00:00:00 2001 From: Henrik Date: Tue, 6 Jun 2023 17:28:31 +0100 Subject: [PATCH 3/3] Update autotools-nix.txt --- pills/10/autotools-nix.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pills/10/autotools-nix.txt b/pills/10/autotools-nix.txt index 4cae7e0..25b9c07 100644 --- a/pills/10/autotools-nix.txt +++ b/pills/10/autotools-nix.txt @@ -3,10 +3,10 @@ pkgs: attrs: builder = "${pkgs.bash}/bin/bash"; args = [ ./builder.sh ]; setup = ./setup.sh; - baseInputs = with pkgs; [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep patchelf findutils binutils.bintools]; + baseInputs = with pkgs; [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep binutils.bintools patchelf findutils ]; buildInputs = []; system = builtins.currentSystem; }; in derivation (defaultAttrs // attrs) - \ No newline at end of file +