Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-05-02 22:58:02 +00:00
parent 0fdde5efd0 94520a25ad
commit c92bca56f8
867 changed files with 75282 additions and 27025 deletions
@@ -499,7 +499,7 @@ in
        }
      ] ++ flip map args.devices (device: {
        assertion = device == "nodev" || hasPrefix "/" device;
-        message = "GRUB devices must be absolute paths, not ${dev} in ${args.path}";
+        message = "GRUB devices must be absolute paths, not ${device} in ${args.path}";
      }));
    })

@@ -14,7 +14,7 @@ let

    inherit (pkgs) python gummiboot;

-    nix = config.nix.package;
+    nix = config.nix.package.out;

    timeout = if cfg.timeout != null then cfg.timeout else "";