Merge staging-next into staging

2020-06-24 19:04:26 +02:00
parent fa54dd346f 16287a8cb8
commit 6f72f0b0df
154 changed files with 1609 additions and 808 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "bashmount";
-  version = "3.2.0";
+  version = "4.2.5";

  src = fetchFromGitHub {
    owner = "jamielinux";
    repo = "bashmount";
    rev = version;
-    sha256 = "0rki4s0jgz6vkywc6hcx9qa551r5bnjs7sw0rdh93k64l32kh644";
+    sha256 = "1gvi2562vng887ba33s774lhhkacl8yl7d8b0yaxylzx0ap2y7l0";
  };

  installPhase = ''