Merge master into staging-next

2020-01-17 17:08:16 +01:00
parent e5fa0ab1c4 f0ce34634a
commit bcd8c6b8dc
167 changed files with 3702 additions and 1266 deletions
@@ -46,7 +46,7 @@ let
  gitFull = gitBase.override {
    svnSupport = true;
    guiSupport = true;
-    sendEmailSupport = !stdenv.isDarwin;
+    sendEmailSupport = true;
    withLibsecret = !stdenv.isDarwin;
  };

@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "git-subrepo";
-  version = "0.4.0";
+  version = "0.4.1";

  src = fetchFromGitHub {
    owner = "ingydotnet";
    repo = "git-subrepo";
    rev = version;
-    sha256 = "05m2dm9gq2nggwnxxdyq2kjj584sn2lxk66pr1qhjxnk81awj9l7";
+    sha256 = "0n10qnc8kyms6cv65k1n5xa9nnwpwbjn9h2cq47llxplawzqgrvp";
  };

  nativeBuildInputs = [