Merge branch 'master.upstream' into staging.upstream

2015-08-05 16:24:57 -07:00
parent e2c9270eb6 3944e4f980
commit 0ecc61b4d7
68 changed files with 1942 additions and 1078 deletions
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -36,7 +36,7 @@ in buildPythonPackage rec {
    six
  ];

-  # Tests are in <nixos/tests/blivet.nix>.
+  # Tests are in <nixpkgs/nixos/tests/blivet.nix>.
  doCheck = false;

  meta = with stdenv.lib; {