From ddd571e25333257ad37dc2e109f5685fb1b5aaca Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Oct 2011 13:15:09 +0000
Subject: [PATCH] strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=29695
---
pkgs/os-specific/linux/mdadm/default.nix | 2 +-
pkgs/tools/filesystems/btrfsprogs/default.nix | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index f0c09ff8658b..a88107ae73d6 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
name = "mdadm-3.1.2";
-
+
src = fetchurl {
url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2";
sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz";
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 75c3644f2df0..22d7a1164c80 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,10 +1,10 @@
-a :
-let
+a :
+let
fetchurl = a.fetchurl;
- version = a.lib.attrByPath ["version"] "0.19" a;
+ version = a.lib.attrByPath ["version"] "0.19" a;
buildInputs = with a; [
- zlib libuuid acl
+ zlib libuuid acl
];
in
@@ -22,9 +22,9 @@ rec {
patches = [ ./glibc212.patch ];
phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
-
+
doEnsureBtrfsImage = a.fullDepEntry (''
- if ! grep 'progs = ' Makefile | grep btrfs-image; then
+ if ! grep 'progs = ' Makefile | grep btrfs-image; then
sed -e 's/progs = .*/& btrfs-image/' -i Makefile
fi
'') ["minInit" "doUnpack"];