Merge branch 'staging-next' into staging

2020-09-29 00:12:29 +02:00
parent a7218d6914 695fd81e02
commit 32b4375f10
306 changed files with 4799 additions and 1779 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "bashmount";
-  version = "4.3.1";
+  version = "4.3.2";

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

  installPhase = ''
@@ -121,10 +121,10 @@ let
  ]);
  sitePackages = ceph-python-env.python.sitePackages;

-  version = "15.2.4";
+  version = "15.2.5";
  src = fetchurl {
    url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-    sha256 = "0jy5dp4r1bqk1l7nrv8l8zpl984k61p3vkvf73ygcn03bxyjjlax";
+    sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d";
  };
 in rec {
  ceph = stdenv.mkDerivation {