commit 3e7bdba7c70cec527a4aaed77f27f5302ba5a5e0 · pyrox.dev/nixpkgs

+39 -46

pkgs/development/python-modules/ale-py/default.nix

···

       1
       1
       -
       { buildPythonPackage

     

       2
       2
       -
       , SDL2

     

       3
       3
       -
       , cmake

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , pythonOlder

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
       -
       , fetchpatch

     

       6
       6
       -
       , gym

     

       7
       7
       -
       , importlib-metadata

     

       8
       8
       -
       , importlib-resources

     

       9
       9
       -
       , lib

     

       5
       5
       +
       , cmake

     

       10
       6
        
       , ninja

     

       11
       11
       -
       , numpy

     

       12
       7
        
       , pybind11

     

       13
       13
       -
       , pytestCheckHook

     

       14
       14
       -
       , pythonOlder

     

       15
       8
        
       , setuptools

     

       16
       16
       -
       , stdenv

     

       17
       17
       -
       , typing-extensions

     

       18
       9
        
       , wheel

     

       10
       10
       +
       , SDL2

     

       19
       11
        
       , zlib

     

       12
       12
       +
       , importlib-resources

     

       13
       13
       +
       , numpy

     

       14
       14
       +
       , typing-extensions

     

       15
       15
       +
       , importlib-metadata

     

       16
       16
       +
       , gymnasium

     

       17
       17
       +
       , pytestCheckHook

     

       18
       18
       +
       , stdenv

     

       20
       19
        
       }:

     

       21
       20
        
       

     

       22
       21
        
       buildPythonPackage rec {

     

       23
       22
        
         pname = "ale-py";

     

       24
       24
       -
         version = "0.8.1";

     

       23
       23
       +
         version = "0.9.0";

     

       25
       24
        
         pyproject = true;

     

       26
       25
        
       

     

       26
       26
       +
         disabled = pythonOlder "3.8";

     

       27
       27
       +
       

     

       27
       28
        
         src = fetchFromGitHub {

     

       28
       29
        
           owner = "Farama-Foundation";

     

       29
       30
        
           repo = "Arcade-Learning-Environment";

     

       30
       31
        
           rev = "refs/tags/v${version}";

     

       31
       31
       -
           hash = "sha256-B2AxhlzvBy1lJ3JttJjImgTjMtEUyZBv+xHU2IC7BVE=";

     

       32
       32
       +
           hash = "sha256-obZfNQ0+ppnq/BD4IFeMFAqJnCVV3X/2HeRwbdSKRFk=";

     

       32
       33
        
         };

     

       33
       34
        
       

     

       34
       35
        
         patches = [

     

       35
       36
        
           # don't download pybind11, use local pybind11

     

       36
       37
        
           ./cmake-pybind11.patch

     

       37
       37
       -
           ./patch-sha-check-in-setup.patch

     

       38
       38
       -
       

     

       39
       39
       -
           # The following two patches add the required `include <cstdint>` for compilation to work with GCC 13.

     

       40
       40
       -
           # See https://github.com/Farama-Foundation/Arcade-Learning-Environment/pull/503

     

       41
       41
       -
           (fetchpatch {

     

       42
       42
       -
             name = "fix-gcc13-compilation-1";

     

       43
       43
       -
             url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/ebd64c03cdaa3d8df7da7c62ec3ae5795105e27a.patch";

     

       44
       44
       -
             hash = "sha256-NMz0hw8USOj88WryHRkMQNWznnP6+5aWovEYNuocQ2c=";

     

       45
       45
       -
           })

     

       46
       46
       -
           (fetchpatch {

     

       47
       47
       -
             name = "fix-gcc13-compilation-2";

     

       48
       48
       -
             url = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/commit/4c99c7034f17810f3ff6c27436bfc3b40d08da21.patch";

     

       49
       49
       -
             hash = "sha256-66/bDCyMr1RsKk63T9GnFZGloLlkdr/bf5WHtWbX6VY=";

     

       50
       50
       -
           })

     

       51
       38
        
         ];

     

       52
       39
        
       

     

       53
       53
       -
         nativeBuildInputs = [

     

       40
       40
       +
         build-system = [

     

       54
       41
        
           cmake

     

       55
       42
        
           ninja

     

       43
       43
       +
           pybind11

     

       56
       44
        
           setuptools

     

       57
       45
        
           wheel

     

       58
       58
       -
           pybind11

     

       59
       46
        
         ];

     

       60
       47
        
       

     

       61
       48
        
         buildInputs = [

     

       62
       62
       -
           zlib

     

       63
       49
        
           SDL2

     

       50
       50
       +
           zlib

     

       64
       51
        
         ];

     

       65
       52
        
       

     

       66
       66
       -
         propagatedBuildInputs = [

     

       67
       67
       -
           typing-extensions

     

       53
       53
       +
         dependencies = [

     

       68
       54
        
           importlib-resources

     

       69
       55
        
           numpy

     

       56
       56
       +
           typing-extensions

     

       70
       57
        
         ] ++ lib.optionals (pythonOlder "3.10") [

     

       71
       58
        
           importlib-metadata

     

       72
       59
        
         ];

     

       73
       60
        
       

     

       74
       74
       -
         nativeCheckInputs = [

     

       75
       75
       -
           pytestCheckHook

     

       76
       76
       -
           gym

     

       77
       77
       -
         ];

     

       78
       78
       -
       

     

       79
       61
        
         postPatch = ''

     

       80
       62
        
           substituteInPlace pyproject.toml \

     

       81
       81
       -
             --replace 'dynamic = ["version"]' 'version = "${version}"'

     

       82
       82
       -
           substituteInPlace setup.py \

     

       83
       83
       -
             --replace '@sha@' '"${version}"'

     

       63
       63
       +
             --replace-fail 'dynamic = ["version"]' 'version = "${version}"'

     

       84
       64
        
         '';

     

       85
       65
        
       

     

       86
       66
        
         dontUseCmakeConfigure = true;

     

       87
       67
        
       

     

       88
       68
        
         pythonImportsCheck = [ "ale_py" ];

     

       89
       69
        
       

     

       90
       90
       -
         meta = with lib; {

     

       91
       91
       -
           description = "a simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games";

     

       70
       70
       +
         nativeCheckInputs = [

     

       71
       71
       +
           gymnasium

     

       72
       72
       +
           pytestCheckHook

     

       73
       73
       +
         ];

     

       74
       74
       +
       

     

       75
       75
       +
         # test_atari_env.py::test_check_env fails on the majority of the environments because the ROM are missing.

     

       76
       76
       +
         # The user is expected to manually download the roms:

     

       77
       77
       +
         # https://github.com/Farama-Foundation/Arcade-Learning-Environment/blob/v0.9.0/docs/faq.md#i-downloaded-ale-and-i-installed-it-successfully-but-i-cannot-find-any-rom-file-at-roms-do-i-have-to-get-them-somewhere-else

     

       78
       78
       +
         disabledTests = [

     

       79
       79
       +
           "test_check_env"

     

       80
       80
       +
         ];

     

       81
       81
       +
       

     

       82
       82
       +
         meta = {

     

       83
       83
       +
           description = "A simple framework that allows researchers and hobbyists to develop AI agents for Atari 2600 games";

     

       92
       84
        
           mainProgram = "ale-import-roms";

     

       93
       85
        
           homepage = "https://github.com/mgbellemare/Arcade-Learning-Environment";

     

       94
       94
       -
           license = licenses.gpl2;

     

       95
       95
       -
           maintainers = with maintainers; [ billhuang ];

     

       86
       86
       +
           changelog = "https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v${version}";

     

       87
       87
       +
           license = lib.licenses.gpl2;

     

       88
       88
       +
           maintainers = with lib.maintainers; [ billhuang ];

     

       96
       89
        
           broken = stdenv.isDarwin; # fails to link with missing library

     

       97
       90
        
         };

     

       98
       91
        
       }

-17

pkgs/development/python-modules/ale-py/patch-sha-check-in-setup.patch

···

       1
       1
       -
       diff --git a/setup.py b/setup.py

     

       2
       2
       -
       index ff1b1c5..ce40df0 100644

     

       3
       3
       -
       --- a/setup.py

     

       4
       4
       -
       +++ b/setup.py

     

       5
       5
       -
       @@ -141,11 +141,7 @@ def parse_version(version_file):

     

       6
       6
       -
        

     

       7
       7
       -
                version = ci_version

     

       8
       8
       -
            else:

     

       9
       9
       -
       -        sha = (

     

       10
       10
       -
       -            subprocess.check_output(["git", "rev-parse", "--short", "HEAD"], cwd=here)

     

       11
       11
       -
       -            .decode("ascii")

     

       12
       12
       -
       -            .strip()

     

       13
       13
       -
       -        )

     

       14
       14
       -
       +        sha = @sha@

     

       15
       15
       -
                version += f"+{sha}"

     

       16
       16
       -
        

     

       17
       17
       -
            return version

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

···

       54
       54
        
         disabledTestPaths = [

     

       55
       55
        
           # Requires unpackaged pyspiel

     

       56
       56
        
           "tests/test_openspiel.py"

     

       57
       57
       +
       

     

       58
       58
       +
           # Broken since ale-py v0.9.0 due to API change

     

       59
       59
       +
           # https://github.com/Farama-Foundation/Shimmy/issues/120

     

       60
       60
       +
           "tests/test_atari.py"

     

       57
       61
        
         ];

     

       58
       62
        
       

     

       59
       63
        
         preCheck = ''