movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

* Add grep.

Browse source 
svn path=/nixpkgs/trunk/; revision=6783
This commit is contained in:
Eelco Dolstra 2006-10-19 22:47:51 +00:00
parent 1acd2157cc
commit 884e8571c3
6 changed files with 5 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/stdenv/linux/make-bootstrap-tools.nix
View file

@ -7,13 +7,13 @@ let
# stdenv-linux's dependencies, rather than building new ones with # stdenv-linux's dependencies, rather than building new ones with
# dietlibc. # dietlibc.
bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv) bootStdenv = removeAttrs (pkgs.useDietLibC pkgs.stdenv)
["coreutils" "gnused" "gnutar" "bzip2" "bash" "patch" "patchelf"]; ["coreutils" "gnused" "gnutar" "gnugrep" "bzip2" "bash" "patch" "patchelf"];
}; };
generator = pkgs.stdenv.mkDerivation { generator = pkgs.stdenv.mkDerivation {
name = "bootstrap-tools-generator"; name = "bootstrap-tools-generator";
builder = ./make-bootstrap-tools.sh; builder = ./make-bootstrap-tools.sh;
inherit (pkgsDiet) coreutils gnused gnutar bzip2 bash patch; inherit (pkgsDiet) coreutils gnused gnugrep gnutar bzip2 bash patch;
curl = pkgsDiet.realCurl; curl = pkgsDiet.realCurl;
# The result should not contain any references (store paths) so # The result should not contain any references (store paths) so

4
pkgs/stdenv/linux/make-bootstrap-tools.sh
View file

@ -35,12 +35,14 @@ rm tools/bin/groups # has references
rm tools/bin/printf # idem rm tools/bin/printf # idem
cp $gnused/bin/* tools/bin cp $gnused/bin/* tools/bin
cp $gnugrep/bin/* tools/bin
cp $gnutar/bin/* tools/bin cp $gnutar/bin/* tools/bin
cp $bzip2/bin/bunzip2 tools/bin cp $bzip2/bin/bunzip2 tools/bin
cp $patch/bin/* tools/bin cp $patch/bin/* tools/bin
nukeRefs tools/bin/sed nukeRefs tools/bin/sed
nukeRefs tools/bin/tar nukeRefs tools/bin/tar
nukeRefs tools/bin/grep
#cp $patchelf/bin/* tools/bin #cp $patchelf/bin/* tools/bin
@ -48,7 +50,7 @@ nukeRefs tools/bin/tar
for i in $out/in-nixpkgs/* tools/bin/*; do for i in $out/in-nixpkgs/* tools/bin/*; do
if test -x $i; then if test -x $i; then
chmod +w $i chmod +w $i
strip -s $i strip -s $i || true
fi fi
done done

3
pkgs/tools/text/diffutils-diet/builder.sh
View file

@ -1,3 +0,0 @@
source $stdenv/setup
if test -n "$coreutils"; then PATH=$coreutils/bin:$PATH; fi
genericBuild

13
pkgs/tools/text/diffutils-diet/default.nix
View file

@ -1,13 +0,0 @@
{stdenv, fetchurl, coreutils ? null, dietgcc}:
stdenv.mkDerivation {
name = "diffutils-2.8.1";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/diffutils-2.8.1.tar.gz;
md5 = "71f9c5ae19b60608f6c7f162da86a428";
};
/* If no explicit coreutils is given, use the one from stdenv. */
inherit coreutils;
NIX_GCC=dietgcc;
}

10
pkgs/tools/text/gnupatch-diet/default.nix
View file

@ -1,10 +0,0 @@
{stdenv, fetchurl, dietgcc}:
stdenv.mkDerivation {
name = "gnupatch-2.5.4";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/patch-2.5.4.tar.gz;
md5 = "ee5ae84d115f051d87fcaaef3b4ae782";
};
NIX_GCC=dietgcc;
}

12
pkgs/tools/text/gnused-diet/default.nix
View file

@ -1,12 +0,0 @@
{stdenv, fetchurl, dietgcc}:
stdenv.mkDerivation {
name = "gnused-4.1.4";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/sed-4.1.4.tar.gz;
md5 = "2a62ceadcb571d2dac006f81df5ddb48";
};
NIX_GCC=dietgcc;
NIX_GLIBC_FLAGS_SET=1;
NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1";
}