Merge master into staging-next

2021-02-21 00:38:49 +00:00
parent 7a1ee9c317 fcaa370980
commit dc31fd042c
32 changed files with 342 additions and 63 deletions
@@ -8,13 +8,13 @@ let
  };
 in stdenv.mkDerivation rec {
  pname = "metasploit-framework";
-  version = "6.0.30";
+  version = "6.0.31";

  src = fetchFromGitHub {
    owner = "rapid7";
    repo = "metasploit-framework";
    rev = version;
-    sha256 = "sha256-DD/nFbSNs3nVNe+W+5zAmDlvMCseYuWWpKX9Dp+9Etc=";
+    sha256 = "sha256-wt7VeS8NnmJHMhry/68W1S1f9jUnsSHnhUSrCQN1qNM=";
  };

  nativeBuildInputs = [ makeWrapper ];