From e29e2467201be02de2ae67bf1916b2114ffada23 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 24 Nov 2016 22:51:58 +0100
Subject: debootstrap: 1.0.80 -> 1.0.87

---
 pkgs/tools/misc/debootstrap/default.nix | 34 +++------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

(limited to 'pkgs/tools/misc/debootstrap')

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index d60b47ca0116..e70efe6c4f11 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,38 +1,16 @@
 { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
 
-let
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
 # There is also cdebootstrap now. Is that easier to maintain?
-  makedev = stdenv.mkDerivation {
-    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 {
+stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.80";
+  version = "1.0.87";
 
   src = fetchurl {
     # 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?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6";
+    sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
@@ -72,8 +50,6 @@ in stdenv.mkDerivation rec {
     d=$out/share/debootstrap
     mkdir -p $out/{share/debootstrap,bin}
 
-    ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV
-
     cp -r . $d
 
     cat >> $out/bin/debootstrap << EOF
@@ -90,10 +66,6 @@ in stdenv.mkDerivation rec {
     mv debootstrap.8 $out/man/man8
   '';
 
-  passthru = {
-    inherit makedev;
-  };
-
   meta = {
     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
-- 
cgit 1.4.1