Merge master into staging-next

2021-02-26 10:25:13 +01:00
parent babf9d6100 6d7128414c
commit c456a2512f
579 changed files with 9802 additions and 3062 deletions
@@ -15,13 +15,13 @@

 buildGoModule rec {
  pname = "cri-o";
-  version = "1.20.0";
+  version = "1.20.1";

  src = fetchFromGitHub {
    owner = "cri-o";
    repo = "cri-o";
    rev = "v${version}";
-    sha256 = "sha256-3rougAl0vVH01ulbnfIO2x8OCyofWlvVsvlKjoAD2NE=";
+    sha256 = "sha256-cli/ipWxZgAeDMBUMuOU3l2mKv4POvOhi7ctbVdU6jc=";
  };
  vendorSha256 = null;

@@ -8,12 +8,12 @@
 }:

 buildPythonApplication rec {
-  version = "1.28.2";
+  version = "1.28.3";
  pname = "docker-compose";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "2f148b590414915d029dad7551f4cdf0b03a774dc9baa674480217236d260cc1";
+    sha256 = "78a48ef8ff4fed092261ecb1a60d9b28b7776e72ed6df591a900008039308b0f";
  };

  # lots of networking and other fails