From d973aa931ee63be9635c7c4bd40ca5bf3ad55817 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 28 Jun 2019 23:23:38 +0200
Subject: [PATCH] python.pkgs.baselines: 0.1.5 -> 0.1.6 (#63903)

---
 .../python-modules/baselines/default.nix      | 25 +++++++++++--------
 .../baselines/fix-dep-names.patch             | 18 -------------
 2 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/baselines/fix-dep-names.patch

diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix
index 2fd58010f5a..a210b5b44aa 100644
--- a/pkgs/development/python-modules/baselines/default.nix
+++ b/pkgs/development/python-modules/baselines/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , pytest
 , gym
 , scipy
@@ -17,18 +17,16 @@
 
 buildPythonPackage rec {
   pname = "baselines";
-  version = "0.1.5";
+  version = "0.1.6"; # remember to manually adjust the rev
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm";
+  src = fetchFromGitHub {
+    owner = "openai";
+    repo = "baselines";
+    # Unfortunately releases are not tagged. This commit bumps the version in setup.py
+    rev = "2bca7901f51c88cdef3ca0666c6a87c454a4dbe8";
+    sha256 = "0j2ck7rsrcyny9qbmrw9aqvzfhv70nbign8iva2dsisa2x24gbcl";
   };
 
-  patches = [
-    # already fixed upstream
-    ./fix-dep-names.patch
-  ];
-
   propagatedBuildInputs = [
     gym
     scipy
@@ -43,6 +41,13 @@ buildPythonPackage rec {
     click
   ];
 
+  postPatch = ''
+    # Needed for the atari wrapper, but the gym-atari package is not supported
+    # in nixos anyways. Since opencv-python is not currently packaged, we
+    # disable it.
+    sed -ie '/opencv-python/d' setup.py
+  '';
+
   # fails to create a daemon, probably because of sandboxing
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/baselines/fix-dep-names.patch b/pkgs/development/python-modules/baselines/fix-dep-names.patch
deleted file mode 100644
index 5b0de29247a..00000000000
--- a/pkgs/development/python-modules/baselines/fix-dep-names.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index bf8badc..570be20 100644
---- a/setup.py
-+++ b/setup.py
-@@ -10,11 +10,11 @@ setup(name='baselines',
-       packages=[package for package in find_packages()
-                 if package.startswith('baselines')],
-       install_requires=[
--          'gym[mujoco,atari,classic_control,robotics]',
-+          'gym',
-           'scipy',
-           'tqdm',
-           'joblib',
--          'zmq',
-+          'pyzmq',
-           'dill',
-           'progressbar2',
-           'mpi4py',