Merge staging-next into staging

pkgs/development/python-modules/boto3/default.nix

@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.16.35"; # N.B: if you change this, change botocore too
+  version = "1.16.37"; # N.B: if you change this, change botocore too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ah1jhj68v6d8qm2mk64jjl6zi9qa3ssmj9jv3fmk9kyahahjpm3";
+    sha256 = "01d4mk1q37dc5l5jmsxm7fijmhq7678ka1bd4p8a8yj57mmw51pf";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

pkgs/development/python-modules/botocore/default.nix

@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "botocore";
-  version = "1.19.35"; # N.B: if you change this, change boto3 and awscli to a matching version
+  version = "1.19.37"; # N.B: if you change this, change boto3 and awscli to a matching version
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08vymgdv3d0394gqgmbzqk00248zhkigfc21vwbhf1lva08ajfk3";
+    sha256 = "14bl9sklilrz0fsch4zw1rx8zdq6h9va2786wxn36yax8n2i5gv7";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/pytorch/bin.nix

@@ -3,6 +3,7 @@
 , fetchurl
 , isPy37
 , isPy38
+, isPy39
 , python
 , nvidia_x11
 , addOpenGLRunpath
@@ -19,7 +20,7 @@ let
   platform = if stdenv.isDarwin then "darwin" else "linux";
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "1.7.0";
+  version = "1.7.1";
 in buildPythonPackage {
   inherit version;
 
@@ -28,7 +29,7 @@ in buildPythonPackage {
 
   format = "wheel";
 
-  disabled = !(isPy37 || isPy38);
+  disabled = !(isPy37 || isPy38 || isPy39);
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
@@ -45,16 +46,6 @@ in buildPythonPackage {
     typing-extensions
   ];
 
-  # PyTorch are broken: the dataclasses wheel is required, but ships with
-  # Python >= 3.7. Our dataclasses derivation is incompatible with >= 3.7.
-  #
-  # https://github.com/pytorch/pytorch/issues/46930
-  #
-  # Should be removed with the next PyTorch version.
-  pipInstallFlags = [
-    "--no-deps"
-  ];
-
   postInstall = ''
     # ONNX conversion
     rm -rf $out/bin

pkgs/development/python-modules/pytorch/binary-hashes.nix

@@ -1,10 +1,14 @@
 version: {
   x86_64-linux-37 = {
     url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
-    sha256 = "0cvafwzd44d7i2d0y01lyk75lhxffcf6c94cx0wla0cnhcg9mqlf";
+    hash = "sha256-XXbCVaQUhMHUGp/1cLnJ82y4XflCiqFaWK4WrHz8LqY=";
   };
   x86_64-linux-38 = {
     url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
-    sha256 = "1vxswkb2gzp87sbb5ycvyvs8aw1szp3v2mwdn4mp47yarlnbx8r6";
+    hash = "sha256-3S/GiAyV6DaWDYbvu8f2PTKH8uGJPFHTH5bb/gLw1z4=";
+  };
+  x86_64-linux-39 = {
+    url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl";
+    hash = "sha256-o3k9zOsSseIoEpDMoSd8XOht39W/BE9lQoWk1pBXrqc=";
   };
 }