From f5914d93477172e80cabfc87fb758e7012572f91 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 14 Jan 2022 11:37:54 +0100 Subject: [PATCH] python.pkgs.roboschool: remove Currently broken [1]. Has been deprecated for a while [2]. [1] https://github.com/NixOS/nixpkgs/issues/151469 [2] https://github.com/openai/roboschool/blob/d32bcb2b35b94168b5ce27233ca62f3c8678886f/README.md --- .../python-modules/roboschool/default.nix | 79 ------------------- pkgs/top-level/python-packages.nix | 4 - 2 files changed, 83 deletions(-) delete mode 100644 pkgs/development/python-modules/roboschool/default.nix diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix deleted file mode 100644 index 97eee2155a5e..000000000000 --- a/pkgs/development/python-modules/roboschool/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, buildPythonPackage -, isPy3k -, python -, fetchFromGitHub -, fetchpatch -, qtbase -, boost -, assimp -, gym -, bullet-roboschool -, pkg-config -, which -}: - -buildPythonPackage rec { - pname = "roboschool"; - version = "1.0.39"; - - src = fetchFromGitHub { - owner = "openai"; - repo = "roboschool"; - rev = version; - sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh"; - }; - - # fails to find boost_python for some reason - disabled = !isPy3k; - - propagatedBuildInputs = [ - gym - ]; - - nativeBuildInputs = [ - pkg-config - qtbase # needs the `moc` tool - which - ]; - - buildInputs = [ - bullet-roboschool - assimp - qtbase - boost - ]; - - dontWrapQtApps = true; - - NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}"; - - patches = [ - # Remove kwarg that was removed in upstream gym - # https://github.com/openai/roboschool/pull/180 - (fetchpatch { - name = "remove-close-kwarg.patch"; - url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch"; - sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r"; - }) - ]; - - preBuild = '' - # First build the cpp dependencies - cd roboschool/cpp-household - make \ - MOC=moc \ - -j$NIX_BUILD_CORES - cd ../.. - ''; - - # Does a QT sanity check, but QT is not expected to work in isolation - doCheck = false; - - meta = with lib; { - description = "Open-source software for robot simulation, integrated with OpenAI Gym"; - homepage = "https://github.com/openai/roboschool"; - license = licenses.mit; - maintainers = with maintainers; [ timokau ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a82697055ab..f35eb1e7e045 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8571,10 +8571,6 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; - roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs.qt5) qtbase; - }; - robot-detection = callPackage ../development/python-modules/robot-detection { }; robotframework = callPackage ../development/python-modules/robotframework { };