* Delete some obsolete packages.

* Make sure that every package in all-packages.nix has a unique name.
  Not all of them do, but there are now a few helper functions that
  modify the name of a package for display purposes in nix-env (e.g.,
  you get "zlib-1.2.3" and "zlib-1.2.3-static" in "nix-env -qa").

svn path=/nixpkgs/trunk/; revision=8607
This commit is contained in:
Eelco Dolstra
2007-04-26 13:02:30 +00:00
parent c182d49c51
commit 168a93adc5
12 changed files with 53 additions and 142 deletions
@@ -1,12 +0,0 @@
source $stdenv/setup
ensureDir "$(dirname $out/dev/MAKEDEV)"
ensureDir "$(dirname $out/sbin/MAKEDEV)"
cat > $out/dev/MAKEDEV << END
#! $SHELL -e
exec $MAKEDEV/dev/MAKEDEV -c $MAKEDEV/etc/makedev.d/ "\$@"
END
chmod +x $out/dev/MAKEDEV
ln -s $out/dev/MAKEDEV $out/sbin/MAKEDEV
@@ -1,9 +0,0 @@
{stdenv, MAKEDEV}:
stdenv.mkDerivation {
name = MAKEDEV.name;
builder = ./builder.sh;
inherit MAKEDEV;
}
@@ -1,22 +0,0 @@
diff -rc MAKEDEV-3.23/Makefile MAKEDEV-3.23.new/Makefile
*** MAKEDEV-3.23/Makefile 2006-01-27 02:56:12.000000000 +0100
--- MAKEDEV-3.23.new/Makefile 2006-08-06 21:50:06.000000000 +0200
***************
*** 19,26 ****
CONF_WITH_SUBDIR=$(patsubst %,makedev.d/%,$(CONF))
! DESTDIR=
! DESTDIRS=$(DESTDIR)${DESTDIR:+/}
devdir=/dev
makedevdir=/dev
sbindir=/usr/sbin
--- 19,26 ----
CONF_WITH_SUBDIR=$(patsubst %,makedev.d/%,$(CONF))
! DESTDIR=${out}
! DESTDIRS=${out}
devdir=/dev
makedevdir=/dev
sbindir=/usr/sbin
@@ -1,5 +0,0 @@
source $stdenv/setup
export DESTDIR=$out
genericBuild
@@ -1,10 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "MAKEDEV-3.23.1";
src = fetchurl {
url = http://losser.labs.cs.uu.nl/~armijn/.nix/MAKEDEV-3.23-1.tar.gz;
md5 = "554faf6cbc9a84e4bd58ccfa32d74e2f";
};
patches = [./MAKEDEV-install.patch];
}
@@ -12,14 +12,20 @@
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let lib = import ../../../lib; in
let
lib = import ../../../lib;
version = "2.6.20.7";
in
stdenv.mkDerivation {
name = "linux-2.6.20.7";
name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
builder = ./builder.sh;
src = fetchurl {
url = http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.7.tar.bz2;
url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1a6flnnaaj11c7cgsr63ix5ln67wih3ffbv473dvsqb0c2rmwvw5";
};