debootstrap: 1.0.80 -> 1.0.87

This commit is contained in:
Michael Raskin 2016-11-24 22:51:58 +01:00
parent 27f1def068
commit e29e246720

View File

@ -1,38 +1,16 @@
{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
let
# USAGE like this: debootstrap sid /tmp/target-chroot-directory # USAGE like this: debootstrap sid /tmp/target-chroot-directory
# There is also cdebootstrap now. Is that easier to maintain? # There is also cdebootstrap now. Is that easier to maintain?
makedev = stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "makedev-for-debootstrap";
src = fetchurl {
url = mirror://debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz;
sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5";
};
patches = [
(fetchurl {
url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz";
sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw";
})
];
# TODO install man
installPhase = ''
mkdir -p $out/sbin
ls -l
t=$out/sbin/MAKEDEV
cp MAKEDEV $t
chmod +x $t
'';
};
in stdenv.mkDerivation rec {
name = "debootstrap-${version}"; name = "debootstrap-${version}";
version = "1.0.80"; version = "1.0.87";
src = fetchurl { src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git # git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?) # I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6"; sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374";
}; };
buildInputs = [ dpkg gettext gawk perl ]; buildInputs = [ dpkg gettext gawk perl ];
@ -72,8 +50,6 @@ in stdenv.mkDerivation rec {
d=$out/share/debootstrap d=$out/share/debootstrap
mkdir -p $out/{share/debootstrap,bin} mkdir -p $out/{share/debootstrap,bin}
${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV
cp -r . $d cp -r . $d
cat >> $out/bin/debootstrap << EOF cat >> $out/bin/debootstrap << EOF
@ -90,10 +66,6 @@ in stdenv.mkDerivation rec {
mv debootstrap.8 $out/man/man8 mv debootstrap.8 $out/man/man8
''; '';
passthru = {
inherit makedev;
};
meta = { meta = {
description = "Tool to create a Debian system in a chroot"; description = "Tool to create a Debian system in a chroot";
homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap