Author: simons Date: Thu Oct 6 13:15:09 2011 New Revision: 29695 URL: https://nixos.org/websvn/nix/?rev=29695&sc=1
Log: strip trailing whitespace Modified: nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Modified: nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix Thu Oct 6 13:15:05 2011 (r29694) +++ nixpkgs/trunk/pkgs/os-specific/linux/mdadm/default.nix Thu Oct 6 13:15:09 2011 (r29695) @@ -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"; Modified: nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Thu Oct 6 13:15:05 2011 (r29694) +++ nixpkgs/trunk/pkgs/tools/filesystems/btrfsprogs/default.nix Thu Oct 6 13:15:09 2011 (r29695) @@ -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 @@ 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"]; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits