gistfile1.txt

commit 8ba6012dfdc1214f5df7dc90955973be3f7562e3
Merge: 264d6641ec cd6c452ade
Author: John Ericson <John.Ericson@Obsidian.Systems>
Date:   Thu Aug 3 17:25:30 2017 -0400

    Merge PR #27536

diff --cc pkgs/top-level/all-packages.nix
index eb59deba7e,a1d83e3145..103906a39d
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@@ -19253,5 -19224,8 +19259,10 @@@ with pkgs
  
    houdini = callPackage ../applications/misc/houdini {};
  
 +  xtermcontrol = callPackage ../applications/misc/xtermcontrol {};
++
+   # No `recurseIntoAttrs` because there's no need to nix-env these.
+   tests = {
+     macOSSierraShared = callPackage ../test/macos-sierra-shared {};
+   };
  }