Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

2 files changed, 4 insertions, 34 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/1/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/1/default.nix
deleted file mode 100644
index c34d6948d89e..000000000000
--- a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/1/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchPypi, buildPythonPackage
-, numpy
-, absl-py
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "tensorflow-estimator";
-  # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before
-  # actually updating the version in setup.py, which is why this tag is called
-  # 1.15.1.
-  version = "1.15.1";
-  format = "wheel";
-
-  src = fetchPypi {
-    pname = "tensorflow_estimator";
-    inherit version format;
-    sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8";
-  };
-
-  propagatedBuildInputs = [ mock numpy absl-py ];
-
-  meta = with stdenv.lib; {
-    description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting.";
-    homepage = "http://tensorflow.org";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jyp ];
-  };
-}
-
diff --git a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix
index 750ef6e8a907..bca75224fa3e 100644
--- a/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/2/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage
+{ lib, stdenv, fetchPypi, buildPythonPackage
 , numpy
 , absl-py
 , mock
@@ -6,18 +6,18 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  version = "2.3.0";
+  version = "2.4.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    sha256 = "11n4sl9wfr00fv1i837b7a36ink86ggmlsgj7i06kcfc011h6pmp";
+    sha256 = "1w0pkcslm6934qqd6m5gxyjdlnb4pbl47k6s99wsh6dyvvr7nysv";
   };
 
   propagatedBuildInputs = [ mock numpy absl-py ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting.";
     homepage = "http://tensorflow.org";
     license = licenses.asl20;