Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""

This reverts commit 741bf840da. This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
parent e4feccce81
commit 6602f49495
42 changed files with 579 additions and 140 deletions
@@ -245,7 +245,7 @@ rec {

  /* =============== simple script files ==================== */

-  # also have a look at enblendenfuse in all-packages.nix
+  # also have a look at enblend-enfuse in all-packages.nix
  exposureBlend = scriptDerivation {
    name = "exposure-blend";
    src = fetchurl {