From dffe1406a060a47ecfde734147786bed476fa277 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue, 30 Aug 2005 13:56:15 +0000
Subject: [PATCH] add cpio

svn path=/nixpkgs/trunk/; revision=3752
---
 pkgs/system/all-packages-generic.nix  | 8 ++++++++
 pkgs/tools/archivers/cpio/default.nix | 9 +++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/archivers/cpio/default.nix

diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 2d7863cd6ac..aacb0ca9484 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -124,6 +124,10 @@ rec {
     j2re = blackdown;
   };
 
+  cpio = (import ../tools/archivers/cpio) {
+    inherit fetchurl stdenv;
+  };
+
   gnutar = (import ../tools/archivers/gnutar) {
     inherit fetchurl stdenv;
   };
@@ -260,6 +264,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  bashDiet = (import ../shells/bash-diet) {
+    inherit fetchurl stdenv dietgcc;
+  };
+
 
   ### DEVELOPMENT
 
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
new file mode 100644
index 00000000000..bfe216978c0
--- /dev/null
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "cpio-2.6";
+  src = fetchurl {
+    url = ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.6.tar.bz2;
+    md5 = "25e0e8725bc60ed3460c9cde92752674";
+  };
+}