From 3d2e573eff118b44dd45e10aac2860ab48e8477e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 20 Oct 2006 20:05:26 +0000 Subject: [PATCH] * GNU sed 4.1.5 compiled with dietlibc gives "Memory exhausted" errors on trivial patterns, so use an older sed instead (4.1.2). See http://linuxfromscratch.org/pipermail/hlfs-dev/2005-September/002447.html. svn path=/nixpkgs/trunk/; revision=6792 --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 ++- pkgs/tools/text/gnused/4.1.2.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/text/gnused/4.1.2.nix diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 7d4d2fb1960..4e0f2d40f25 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -14,7 +14,8 @@ let name = "bootstrap-tools-generator"; builder = ./make-bootstrap-tools.sh; - inherit (pkgsDiet) coreutils findutils gnused gnugrep gnutar gzip bzip2 bash patch; + inherit (pkgsDiet) coreutils findutils gnugrep gnutar gzip bzip2 bash patch; + gnused = pkgsDiet.gnused412; # 4.1.5 gives "Memory exhausted" errors binutils = pkgsDiet.binutils; gcc = import ../../development/compilers/gcc-static-4.1 { diff --git a/pkgs/tools/text/gnused/4.1.2.nix b/pkgs/tools/text/gnused/4.1.2.nix new file mode 100644 index 00000000000..a439a152114 --- /dev/null +++ b/pkgs/tools/text/gnused/4.1.2.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "gnused-4.1.2"; + src = fetchurl { + url = ftp://ftp.gnu.org/pub/gnu/sed/sed-4.1.2.tar.gz; + md5 = "928f0e06422f414091917401f1a834d0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f8be554b4d..9aab7302a7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -307,6 +307,10 @@ rec { inherit fetchurl stdenv; }); + gnused412 = import ../tools/text/gnused/4.1.2.nix { + inherit fetchurl stdenv; + }; + gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar (import ../tools/archivers/gnutar { inherit fetchurl stdenv;