Merge branch 'master' into staging-next

pkgs/development/tools/build-managers/bam/default.nix

@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ lua5_3 python ];
 
-  buildPhase = ''${stdenv.shell} make_unix.sh'';
+  buildPhase = "${stdenv.shell} make_unix.sh";
 
-  checkPhase = ''${python.interpreter} scripts/test.py'';
+  checkPhase = "${python.interpreter} scripts/test.py";
 
   installPhase = ''
     mkdir -p "$out/share/bam"

pkgs/development/tools/build-managers/doit/default.nix

@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchurl, python3Packages }:
-
-let
-
-  name = "doit";
-  version = "0.32.0";
-
-in python3Packages.buildPythonApplication {
-  name = "${name}-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz";
-    sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j";
-  };
-
-  buildInputs = with python3Packages; [ mock pytest ];
-
-  propagatedBuildInputs = with python3Packages; [ cloudpickle ]
-    ++ lib.optional stdenv.isLinux pyinotify
-    ++ lib.optional stdenv.isDarwin macfsevents;
-
-  # Tests fail due to mysterious gdbm.open() resource temporarily
-  # unavailable errors.
-  doCheck = false;
-  checkPhase = "py.test";
-
-  meta = with lib; {
-    homepage = "https://pydoit.org/";
-    description = "A task management & automation tool";
-    license = licenses.mit;
-    longDescription = ''
-      doit is a modern open-source build-tool written in python
-      designed to be simple to use and flexible to deal with complex
-      work-flows. It is specially suitable for building and managing
-      custom work-flows where there is no out-of-the-box solution
-      available.
-    '';
-    maintainers = with maintainers; [ pSub ];
-    platforms = platforms.all;
-  };
-}