Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

2 files changed, 0 insertions, 60 deletions

diff --git a/pkgs/os-specific/darwin/htop/default.nix b/pkgs/os-specific/darwin/htop/default.nix
deleted file mode 100644
index 3f076b838d4..00000000000
--- a/pkgs/os-specific/darwin/htop/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, stdenv, ncurses, autoconf, automake, IOKit }:
-
-stdenv.mkDerivation rec {
-  name = "htop-0.8.2.2";
-
-  src = fetchurl {
-    url = "https://github.com/max-horvath/htop-osx/archive/0.8.2.2.tar.gz";
-    sha256 = "0qxibadn2lfqn10a5jmkv8r5ljfs0vaaa4j6psd7ppxa2w6bx5li";
-  };
-
-  buildInputs = [ autoconf automake ncurses IOKit ];
-
-  preConfigure = "./autogen.sh";
-
-  meta = {
-    description = "An interactive process viewer for Mac OS X";
-    homepage = "https://github.com/max-horvath/htop-osx";
-    platforms = stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ joelteon ];
-  };
-}
diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix
deleted file mode 100644
index 671e51542d0..00000000000
--- a/pkgs/os-specific/darwin/otool/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv }:
-
-assert stdenv.isDarwin;
-/*  this tool only exists on darwin
-    NOTE: it might make sense to compile this from source (maybe it even works for non-darwin)
-    I see cctools source is under GPL2+ as well as APSL 2.0
-    http://opensource.apple.com/release/developer-tools-46/
-*/
-
-stdenv.mkDerivation {
-  name = "otool";
-
-  src = "/usr/bin/otool";
-
-  unpackPhase = "true";
-  configurePhase = "true";
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out/bin"
-    ln -s $src "$out/bin"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Object file displaying tool";
-    homepage    = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
-    license     = with licenses; [ apsl20 gpl2Plus ];
-    maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.darwin;
-
-    longDescription = ''
-      The otool command displays specified parts of object files or libraries.
-      If the, -m option is not used, the file arguments may be of the form
-      libx.a(foo.o), to request information about only that object file and not
-      the entire library.
-    '';
-  };
-}
-