public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strip trailing whitespace

Browse Source 
svn path=/nixpkgs/trunk/; revision=29695
This commit is contained in:
Peter Simons 2011-10-06 13:15:09 +00:00
parent d95e485a86
commit ddd571e253
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/mdadm/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mdadm-3.1.2"; name = "mdadm-3.1.2";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2"; url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2";
sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz"; sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz";

12
pkgs/tools/filesystems/btrfsprogs/default.nix
View File

@ -1,10 +1,10 @@
a : a :
let let
fetchurl = a.fetchurl; fetchurl = a.fetchurl;
version = a.lib.attrByPath ["version"] "0.19" a; version = a.lib.attrByPath ["version"] "0.19" a;
buildInputs = with a; [ buildInputs = with a; [
zlib libuuid acl zlib libuuid acl
]; ];
in in
@ -22,9 +22,9 @@ rec {
patches = [ ./glibc212.patch ]; patches = [ ./glibc212.patch ];
phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"]; phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
doEnsureBtrfsImage = a.fullDepEntry ('' 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 sed -e 's/progs = .*/& btrfs-image/' -i Makefile
fi fi
'') ["minInit" "doUnpack"]; '') ["minInit" "doUnpack"];